aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeLines
* Remove obsolete 'require' statementLouise Crow2014-12-12-2/+1
|
* Only mark email_subject_request as HTML safe when used in email subject.Louise Crow2014-12-12-20/+26
| | | | It's also used in the web interface and needs to be escaped there.
* Merge branch 'rails-3-develop' of ↵Louise Crow2014-12-11-5/+13
|\ | | | | | | ssh://git.mysociety.org/data/git/public/alaveteli into rails-3-develop
| * Merge branch '2022-fragmented-translation' into rails-3-developGareth Rees2014-12-11-2/+7
| |\
| | * Improve translation on /details/request/:idGareth Rees2014-12-11-2/+7
| | | | | | | | | | | | Better to translate the full string
| * | Merge branch '2021-fragmented-translation' into rails-3-developGareth Rees2014-12-11-3/+6
| |\ \ | | |/ | |/|
| | * Unify add annotation <title> and <h1>Gareth Rees2014-12-11-3/+4
| | | | | | | | | | | | | | | Use the same msgids so that translators only have to translate one thing.
| | * Translate annotation ‘to’ headingGareth Rees2014-12-11-2/+4
| |/
* | Merge branch 'catch-openuri-timeout-errors' into rails-3-developLouise Crow2014-12-11-3/+18
|\ \ | |/ |/|
| * Use exception notification for third party url errorsLouise Crow2014-11-14-3/+18
| | | | | | | | Include URL and error in notification and log.
| * Catch timeouts in quietly_try_to_purgeIan Chard2014-11-03-1/+1
| | | | | | | | | | Although many times of errors are caught, the case where a connection is made but no reply is received resulted in an uncaught Timeout::Error.
* | Merge branch 'sanitize-non-utf8-request-uri' into rails-3-developLouise Crow2014-12-09-8/+16
|\ \
| * | fixup! Use rack-utf8_sanitizer gemLouise Crow2014-11-18-1/+1
| | |
| * | Use rack-utf8_sanitizer gemLouise Crow2014-11-18-8/+16
| | | | | | | | | | | | This sanitises non utf-8 params before they're processed by Rails.
* | | Merge branch 'owasp-fixes' into rails-3-developLouise Crow2014-12-09-11/+35
|\ \ \
| * | | Don't display specific error messages in production.Louise Crow2014-12-05-7/+1
| | | |
| * | | Add secureheadersLouise Crow2014-12-05-0/+30
| | | | | | | | | | | | | | | | Issue some security-related headers by default.
| * | | Don't allow autocomplete.Louise Crow2014-12-05-4/+4
| | | | | | | | | | | | | | | | This prevents browsers from storing and filling passwords.
* | | | Merge remote-tracking branch ↵Louise Crow2014-12-09-30/+74
|\ \ \ \ | | | | | | | | | | | | | | | 'openaustralia_github/remove-web-analytics-section' into rails-3-develop
| * | | | Remove unused "web analytics" section of admin pages - it's confusing!Henare Degan2014-12-09-5/+0
| | | | |
| * | | | Merge branch '1666-related-requests-search' into rails-3-developGareth Rees2014-12-08-25/+74
|/| | | |
| * | | | Add slideUp/slideDown to related requests resultsGareth Rees2014-11-11-8/+17
| | | | |
| * | | | Add close button to similar requests on /new/:bodyGareth Rees2014-11-11-3/+11
| | | | |
| * | | | Limit typeahead similar requests on /new/:bodyGareth Rees2014-11-11-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | Only return 3 similar requests to prevent the suggestions swamping the page
| * | | | RequestController#search_typaahead limit resultsGareth Rees2014-11-11-1/+14
| | | | | | | | | | | | | | | | | | | | Use the per_page parameter to limit the results returned
| * | | | Don’t render search ahead results if no resultsGareth Rees2014-11-11-6/+4
| | | | | | | | | | | | | | | | | | | | | | | | | Only render the request_search_ahead_results div when a search has been made.
| * | | | Don’t render “search their website” if no resultsGareth Rees2014-11-11-3/+6
| | | | |
| * | | | Only attempt to render results if there are anyGareth Rees2014-11-11-5/+5
| | | | | | | | | | | | | | | | | | | | No point trying to render the results if there aren’t any to render
| * | | | Refactor request/_search_ahead partialGareth Rees2014-11-11-4/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Each instead of for Unless instead of if ! .any? instead of size > 0 Line length
| * | | | Filter related requests by body on /new/:bodyGareth Rees2014-11-11-1/+1
| | | | |
| * | | | RequestController#search_typeahead filter by bodyGareth Rees2014-11-11-4/+16
| | | | | | | | | | | | | | | | | | | | | | | | | Action now supports the `request_from` param as per the Xapian filtering system to filter search typeaheads by public body
* | | | | Merge branch 'release/0.20' into rails-3-developLouise Crow2014-12-03-1056/+859
|\ \ \ \ \
| * | | | | Don't translate validation messages for models created/edited in admin interfacerelease/0.20Louise Crow2014-12-02-771/+96
| | | | | |
| * | | | | Restore translations lost in 3a412f2ec2c8f8c0a0eb5000791165ab82e7a550Louise Crow2014-12-02-289/+730
| | | | | |
| * | | | | Latest translations from TransifexLouise Crow2014-12-02-251/+228
| | | | | |
| * | | | | Fix for interpolation bug introduced in ↵Louise Crow2014-12-01-1/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7a3b462f41321034cbdd2c83707f739a442e83c6. The string with the unsubstituted variable pattern was being made available for translation, instead of the translatable version.
| * | | | | Bump Alaveteli versionLouise Crow2014-12-01-1/+1
| | | | | |
| * | | | | Merge branch 'rails-3-develop' into release/0.20Louise Crow2014-12-01-0/+7
| |\ \ \ \ \ | |/ / / / / |/| | | | |
* | | | | | Merge branch '2000-validate-category-description' into rails-3-developLouise Crow2014-12-01-0/+7
|\ \ \ \ \ \
| * | | | | | Validate the presence of the description.Louise Crow2014-12-01-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | It's required in [PublicBody#type_of_authority]( https://github.com/mysociety/alaveteli/blob/rails-3-develop/app/models/public_body.rb#L343-L347)
| | * | | | | Move up the config changes - they're important.Louise Crow2014-12-01-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | They'll result in changed behaviour if people don't act. Also, make clearer what the previous default for INCOMING_EMAIL_PREFIX.
| | * | | | | Merge branch 'rails-3-develop' into release/0.20Louise Crow2014-12-01-127/+4636
| | |\ \ \ \ \ | |_|/ / / / / |/| | | | | |
* | | | | | | Merge branch '1965-censor-rule-creation-failure' into rails-3-developLouise Crow2014-12-01-23/+575
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Remove redundant hidden fieldsGareth Rees2014-12-01-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now that the form submits to a URL containing the parent object’s id these are no longer required See: - 259a0fd588e198d2a826ef4ac09284c610005387 - d5c7e08d58dc5ad52f16eccd9c456543503e4360
| * | | | | | Use instance variable for CensorRule in #destroyGareth Rees2014-11-19-8/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | Use new routes for creating censor rulesGareth Rees2014-11-19-10/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Use resource-oriented form style, building against the censor rule instance created in the controller - Use the URL assigned by the controller based on what the censor rule is being created against - Use the new route for the buttons directing the admin to the form - Use consistent styling for button labelling - Use each instead of for
| * | | | | | 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/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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/+65
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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)