Commit message (Collapse) | Author | Age | Lines | |
---|---|---|---|---|
* | Merge branch 'spam_address_routing' into rails-3-develop | Gareth Rees | 2014-10-14 | -8/+8 |
|\ | ||||
| * | Add admin prefix to spam_addresses resources | Gareth Rees | 2014-10-10 | -8/+8 |
| | | ||||
* | | Merge branch 'issues/1830-batch-request-user-filter' into rails-3-develop | Gareth Rees | 2014-10-14 | -2/+36 |
|\ \ | ||||
| * | | User profile option to filter requests by status | Gareth Rees | 2014-10-14 | -2/+36 |
| |/ | | | | | | | | | Filters on `latest_status` because filtering by `status` searches all states a request has ever been in. | |||
* | | Merge branch 'issues/222-category-editing-add-order-interface' into ↵ | Louise Crow | 2014-10-14 | -148/+1869 |
|\ \ | |/ |/| | | | rails-3-develop | |||
| * | fixup! Use RESTful routing. | Louise Crow | 2014-10-09 | -31/+31 |
| | | ||||
| * | Require heading and category in PublicBodyCategoryLink. | Louise Crow | 2014-10-09 | -1/+18 |
| | | | | | | | | Update default factory accordingly. | |||
| * | fixup! Remove old PublicBodyCategories calls. | Louise Crow | 2014-10-09 | -1/+1 |
| | | ||||
| * | Remove default public_body_categories_[locale].rb files. | Louise Crow | 2014-10-09 | -39/+0 |
| | | ||||
| * | Add notes on removing public_body_category_[locale].rb files. | Louise Crow | 2014-10-09 | -1/+1 |
| | | | | | | | | Also note that calls to PublicBodyCategories are deprecated. | |||
| * | Remove old PublicBodyCategories calls. | Louise Crow | 2014-10-09 | -12/+20 |
| | | | | | | | | | | Add deprecation notice to draw attention to any place where PublicBodyCategories is called from themes. | |||
| * | fixup! Don't migrate categories automatically. | Louise Crow | 2014-10-09 | -6/+10 |
| | | ||||
| * | Don't migrate categories automatically. | Louise Crow | 2014-09-26 | -13/+5 |
| | | | | | | | | | | It becomes confusing in the test environment, better to have a clean script. | |||
| * | Find by translated name correctly. | Louise Crow | 2014-09-26 | -2/+4 |
| | | | | | | | | | | | | .where doesn't seem to use the translations with this version of Globalize, even in a locale block. As this is run-once code to migrate, I think we're fine with the old syntax. | |||
| * | fixup! Use translation tables for PublicBodyCategory and PublicBodyHeading | Louise Crow | 2014-09-26 | -2/+8 |
| | | ||||
| * | Don't require a category description | Louise Crow | 2014-09-26 | -1/+20 |
| | | | | | | | | | | Some existing themes don't use one for categories like 'misc' and that seems reasonable usage. Add some specs for the things we do validate. | |||
| * | Use double quotes to avoid backslash | Louise Crow | 2014-09-26 | -3/+3 |
| | | ||||
| * | Refactor for clarity of return/error conditions | Louise Crow | 2014-09-26 | -34/+53 |
| | | ||||
| * | Rename partials to be more descriptive | Louise Crow | 2014-09-26 | -3/+3 |
| | | ||||
| * | Use RESTful routing. | Louise Crow | 2014-09-26 | -147/+135 |
| | | ||||
| * | Create module to clarify what code is just for migrating from files. | Louise Crow | 2014-09-25 | -83/+101 |
| | | ||||
| * | fixup! Use translation tables for PublicBodyCategory and PublicBodyHeading | Louise Crow | 2014-09-25 | -1/+7 |
| | | ||||
| * | fixup! Basic category admin screen | Louise Crow | 2014-09-25 | -2/+2 |
| | | ||||
| * | fixup! Use translation tables for PublicBodyCategory and PublicBodyHeading | Louise Crow | 2014-09-25 | -55/+53 |
| | | ||||
| * | fixup! Basic category admin screen | Louise Crow | 2014-09-25 | -9/+0 |
| | | ||||
| * | fixup! Basic category admin screen | Louise Crow | 2014-09-24 | -3/+0 |
| | | ||||
| * | fixup! Add display order to public body categories and headings | Louise Crow | 2014-09-24 | -2/+0 |
| | | ||||
| * | fixup! Replace existing PublicBodyCategories functionality with db models ↵ | Louise Crow | 2014-09-24 | -1/+1 |
| | | | | | | | | PublicBodyCategory and PublicBodyHeading | |||
| * | fixup! Replace existing PublicBodyCategories functionality with db models ↵ | Louise Crow | 2014-09-24 | -138/+155 |
| | | | | | | | | PublicBodyCategory and PublicBodyHeading | |||
| * | fixup! Add display order to public body categories and headings | Louise Crow | 2014-09-24 | -1/+1 |
| | | ||||
| * | fixup! Replace existing PublicBodyCategories functionality with db models ↵ | Louise Crow | 2014-09-24 | -10/+10 |
| | | | | | | | | PublicBodyCategory and PublicBodyHeading | |||
| * | fixup! Basic category admin screen | Louise Crow | 2014-09-24 | -16/+17 |
| | | ||||
| * | fixup! New heading associations should be added on category create. | Louise Crow | 2014-09-24 | -7/+4 |
| | | ||||
| * | fixup! Add actions for reordering public body headings and categories. | Louise Crow | 2014-09-24 | -16/+38 |
| | | ||||
| * | fixup! Add actions for reordering public body headings and categories. | Louise Crow | 2014-09-24 | -20/+24 |
| | | ||||
| * | fixup! Remove dependence on default public bodies. | Louise Crow | 2014-09-24 | -88/+48 |
| | | ||||
| * | fixup! Validation of display order, default setting callbacks. | Louise Crow | 2014-09-24 | -47/+52 |
| | | ||||
| * | Allow reordering of categories and headings using javascript. | Louise Crow | 2014-09-22 | -43/+100 |
| | | ||||
| * | New heading associations should be added on category create. | Louise Crow | 2014-09-22 | -0/+21 |
| | | ||||
| * | Add actions for reordering public body headings and categories. | Louise Crow | 2014-09-22 | -1/+135 |
| | | ||||
| * | Remove dependence on default public bodies. | Louise Crow | 2014-09-22 | -16/+84 |
| | | | | | | | | Seems like this could trip us up later. Use factories instead, they're more clearly associated with tests. | |||
| * | Validation of display order, default setting callbacks. | Louise Crow | 2014-09-22 | -28/+108 |
| | | ||||
| * | Destroy link on destruction of heading or category. | Louise Crow | 2014-09-22 | -2/+2 |
| | | ||||
| * | Add display_order field to public_body_headings. | Louise Crow | 2014-09-22 | -1/+2 |
| | | | | | | | | # Please enter the commit message for your changes. Lines starting | |||
| * | Add upgrade notes for category editing feature | lizconlan | 2014-09-22 | -2/+4 |
| | | ||||
| * | Allow deletion of public body categories with associatied bodies | lizconlan | 2014-09-22 | -16/+1 |
| | | ||||
| * | Add display order to public body categories and headings | lizconlan | 2014-09-22 | -60/+208 |
| | | ||||
| * | Reinstate automatic loading of categories on get if no categories defined | lizconlan | 2014-09-22 | -1/+14 |
| | | ||||
| * | Set default font for admin navbar throughout site | lizconlan | 2014-09-22 | -0/+3 |
| | | ||||
| * | Enable admins to link public body categories to headings | lizconlan | 2014-09-22 | -6/+51 |
| | |