aboutsummaryrefslogtreecommitdiffstats
path: root/app/controllers
Commit message (Collapse)AuthorAgeLines
...
| * | | Use RESTful routing for destroy actionLouise Crow2014-12-12-1/+1
| | | |
| * | | Use RESTful routing for resend actionLouise Crow2014-12-12-31/+32
| | | |
| * | | Use RESTful routing for index and show actionsLouise Crow2014-12-12-23/+18
| | | |
* | | | Merge branch 'admin-public-holiday-interface' into rails-3-developLouise Crow2014-12-18-0/+95
|\ \ \ \
| * | | | Allow import of holidays from feed or built-in suggestionsLouise Crow2014-12-15-1/+29
| | | | |
| * | | | Add some inline editingLouise Crow2014-12-15-0/+10
| | | | |
| * | | | Add create actionLouise Crow2014-12-15-0/+9
| | | | |
| * | | | Add new actionLouise Crow2014-12-15-0/+4
| | | | |
| * | | | Add basic destroy action.Louise Crow2014-12-15-0/+7
| | | | |
| * | | | Add basic update action.Louise Crow2014-12-15-0/+18
| | | | |
| * | | | Add basic edit actionLouise Crow2014-12-15-0/+5
| | | | |
| * | | | Add index method for listing existing holidaysLouise Crow2014-12-15-0/+14
| |/ / /
* | | | Refactor the application of masks and censor rules to messages.Louise Crow2014-12-15-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Seems more logical to make this one method that figures out what to do based on file type. Plus, incoming message does so many things, it seemed like having these related methods be separate would make them easier to read and understand. Also, email, mobile and login substitution texts weren't being translated. Finally, I think passing the censor rules and masks as arguments is a first step in some more decoupling of models.
* | | | Enforce a lifetime on session cookiesLouise Crow2014-12-12-9/+26
| | | | | | | | | | | | | | | | | | | | | | | | Problem described in http://seclists.org/fulldisclosure/2013/Sep/145 Pattern taken from https://www.coffeepowered.net/2013/09/26/rails-session-cookies/
* | | | Remove obsolete 'require' statementLouise Crow2014-12-12-2/+1
|/ / /
* | | Merge branch 'owasp-fixes' into rails-3-developLouise Crow2014-12-09-0/+3
|\ \ \
| * | | Add secureheadersLouise Crow2014-12-05-0/+3
| |/ / | | | | | | | | | Issue some security-related headers by default.
* | | Merge branch '1666-related-requests-search' into rails-3-developGareth Rees2014-12-08-4/+12
|\ \ \ | |_|/ |/| |
| * | RequestController#search_typaahead limit resultsGareth Rees2014-11-11-1/+3
| | | | | | | | | | | | Use the per_page parameter to limit the results returned
| * | RequestController#search_typeahead filter by bodyGareth Rees2014-11-11-4/+10
| | | | | | | | | | | | | | | Action now supports the `request_from` param as per the Xapian filtering system to filter search typeaheads by public body
* | | 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
| | |
generated by cgit v1.2.3 (git 2.25.1) at 2025-07-23 01:07:30 +0000