aboutsummaryrefslogtreecommitdiffstats
path: root/app/controllers
Commit message (Collapse)AuthorAgeLines
* Sanitize the contents of HTML attachments before displayLouise Crow2014-12-22-0/+4
|
* Fix unvalidated redirectsGareth Rees2014-12-22-3/+3
|
* Merge branch '1965-censor-rule-creation-failure' into rails-3-developLouise Crow2014-12-01-11/+44
|\
| * Use instance variable for CensorRule in #destroyGareth Rees2014-11-19-6/+9
| | | | | | | | | | | | Easier to check against the assigned variable, but the spec still fails because an internal error is raised if the rule is not associated with a User or InfoRequest
| * Tidy AdminCensorRuleController#updateGareth Rees2014-11-19-3/+7
| | | | | | | | | | | | - Add linebreaks to break up sections - Remove unused parentheses - Use unless instead of if !
| * Set the form URL to POST to in #createGareth Rees2014-11-19-0/+3
| | | | | | | | | | | | Direct the (re-rendered) form at the correct route for the association (or use the generic route if the rule is being created for some other reason)
| * Associate censor rule with something in #createGareth Rees2014-11-19-2/+17
| | | | | | | | | | Build the CensorRule against the object that is found by an additional parameter (either :info_request_id or :user_id)
| * Set the form URL to POST to in #newGareth Rees2014-11-19-0/+4
| | | | | | | | | | Direct the form at the correct route for the association (or use the generic route if the rule is being created for some other reason)
| * Associate censor rule with something in #newGareth Rees2014-11-19-0/+2
| | | | | | | | | | Build the CensorRule against the object that is found by an additional parameter (either :info_request_id or :user_id)
| * Initialize a new CensorRule in #newGareth Rees2014-11-19-0/+2
| |
* | Merge branch 'issues/1969-inconsistent-public-body-admin-interface' into ↵Gareth Rees2014-11-19-7/+0
|\ \ | |/ |/| | | rails-3-develop
| * Remove restricton on deleting PublicBodyHeadings with associated ↵lizconlan2014-11-19-7/+0
| | | | | | | | PublicBodyCategories
* | Use flash[:error] for error conditionGareth Rees2014-11-18-1/+1
| | | | | | Also use double quotes rather than string escaping
* | Redirect to #edit after updatingGareth Rees2014-11-17-4/+7
| | | | | | | | | | On an unsuccessful update AdminPublicBodyHeadingsController and AdminPublicBodyCategoriesController #update should render the #edit action.
* | Redirect to #edit after updatingGareth Rees2014-11-17-2/+3
|/ | | | | | | On a successful update AdminPublicBodyHeadingsController and AdminPublicBodyCategoriesController #update should redirect to the #edit action rather than simply rendering the ‘edit’ template. Fixes https://github.com/mysociety/alaveteli/issues/1977
* Redirect /help to /help/aboutGareth Rees2014-11-05-0/+4
| | | | Shouldn't really 404 on an important/accessible URL
* Merge branch 'issues/1457-close-change-request-without-email' into ↵Louise Crow2014-10-30-9/+6
|\ | | | | | | rails-3-develop
| * Remove redirect to trailing slash URL.Louise Crow2014-10-30-7/+0
| | | | | | | | | | Introduced in 4f501309ade230f65f4ba45e1d0161e89587d755 but no longer needed as we don't proxy the admin interface.
| * Allow closure of a change request without sending an email.Louise Crow2014-10-30-2/+6
| |
* | Merge branch 'issues/1778-send-message' into rails-3-developGareth Rees2014-10-17-4/+54
|\ \
| * | Extract resending a message from the modelGareth Rees2014-10-17-1/+24
| | |
| * | Extract initial and followup sending from modelGareth Rees2014-10-17-3/+30
| | |
* | | Merge branch 'spam_address_routing' into rails-3-developGareth Rees2014-10-14-2/+2
|\ \ \
| * | | Add admin prefix to spam_addresses resourcesGareth Rees2014-10-10-2/+2
| |/ /
* | | Merge branch 'issues/1830-batch-request-user-filter' into rails-3-developGareth Rees2014-10-14-0/+15
|\ \ \
| * | | User profile option to filter requests by statusGareth Rees2014-10-14-0/+15
| |/ / | | | | | | | | | | | | 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 Crow2014-10-14-4/+199
|\ \ \ | |/ / |/| | | | | rails-3-develop
| * | fixup! Use RESTful routing.Louise Crow2014-10-09-5/+5
| | |
| * | Remove old PublicBodyCategories calls.Louise Crow2014-10-09-2/+2
| | | | | | | | | | | | | | | Add deprecation notice to draw attention to any place where PublicBodyCategories is called from themes.
| * | Refactor for clarity of return/error conditionsLouise Crow2014-09-26-34/+53
| | |
| * | Use RESTful routing.Louise Crow2014-09-26-29/+29
| | |
| * | Create module to clarify what code is just for migrating from files.Louise Crow2014-09-25-2/+2
| | |
| * | fixup! Basic category admin screenLouise Crow2014-09-24-3/+0
| | |
| * | fixup! Add actions for reordering public body headings and categories.Louise Crow2014-09-24-4/+3
| | |
| * | New heading associations should be added on category create.Louise Crow2014-09-22-0/+5
| | |
| * | Add actions for reordering public body headings and categories.Louise Crow2014-09-22-0/+44
| | |
| * | Allow deletion of public body categories with associatied bodieslizconlan2014-09-22-7/+0
| | |
| * | Add display order to public body categories and headingslizconlan2014-09-22-1/+18
| | |
| * | Enable admins to link public body categories to headingslizconlan2014-09-22-4/+13
| | |
| * | List categories without headings on the admin screenlizconlan2014-09-22-0/+1
| | |
| * | Restrict category_tag edits to empty public body categorieslizconlan2014-09-22-1/+5
| | |
| * | Basic category admin screenlizconlan2014-09-22-0/+109
| | |
| * | Replace existing PublicBodyCategories functionality with db models ↵lizconlan2014-09-22-2/+0
| | | | | | | | | | | | PublicBodyCategory and PublicBodyHeading
* | | Add an action to run the checksGareth Rees2014-09-25-0/+16
|/ /
* | Merge branch 'empty_blog' into rails-3-developGareth Rees2014-09-15-1/+1
|\ \ | |/ |/|
| * Fix /blog breaking if the blog has no postsGareth Rees2014-09-12-1/+1
| |
* | Whitelist UserController#signup params0.19.0.3hotfix/0.19.0.3Gareth Rees2014-09-09-1/+5
|/ | | | Protects from mass-assignment exploit attempts
* Return a list of all cache directories for the requestLouise Crow2014-09-01-2/+1
|
* Move method to model to make it more testable, add spec.Louise Crow2014-09-01-8/+0
|
* Reword View Requests to Browse Requests in navGareth Rees2014-08-21-1/+1
| | | | | | | User testing highlighted that it was easy to mistake "View Requests" for a Facebook-style wall rather than the list of all requests. [1] [1] https://github.com/mysociety/alaveteli/issues/1505