aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeLines
* 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)
| * | | Add extra censor rule routesGareth Rees2014-11-19-0/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds specific routes for creating censor rules associated with an info request or user. Creates: POST /admin/info_requests/:info_request_id/censor_rules(.:format) GET /admin/info_requests/:info_request_id/censor_rules/new(.:format) POST /admin/users/:user_id/censor_rules(.:format) GET /admin/users/:user_id/censor_rules/new(.:format) Using these routes prevents the ID of the association object being lost when re-rendering the form on an unsuccessful persistence attempt.
| * | | Associate censor rule with something in #newGareth Rees2014-11-19-0/+14
| | | | | | | | | | | | | | | | | | | | 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/+7
| | | |
| * | | Specs for AdminCensorRuleController#updateGareth Rees2014-11-19-0/+126
| | | | | | | | | | | | | | | | | | | | Note that these specs describe what the system does – not what it _should_ do!
| * | | Specs for AdminCensorRuleController#createGareth Rees2014-11-19-0/+111
| | | | | | | | | | | | | | | | | | | | Note that these specs describe what the system does – not what it _should_ do!
| * | | Specs for AdminCensorRuleController#destroyGareth Rees2014-11-18-0/+65
| | | | | | | | | | | | | | | | Note that these specs describe what the system does – not what it _should_ do!
| * | | Specs for AdminCensorRuleController#editGareth Rees2014-11-18-0/+23
| | | |
| * | | Specs for AdminCensorRuleController#newGareth Rees2014-11-18-0/+48
| | | |
| * | | Add CensorRule factoriesGareth Rees2014-11-18-0/+32
| | | |
* | | | Merge branch 'clean-enRW' into rails-3-developGareth Rees2014-11-27-1186/+361
|\ \ \ \
| * | | | Manually correct spacing in en_RW msgidGareth Rees2014-11-27-2/+2
| | | | | | | | | | | | | | | | | | | | rake gettext:clean didn’t adjust the number of space characters in the msgid, so _() failed to use the translation.
| * | | | Clean en_RW/app.poGareth Rees2014-11-27-1186/+361
| | | | |
* | | | | Merge branch 'rails-3-develop' of ↵Louise Crow2014-11-27-38/+4738
|\| | | | | | | | | | | | | | | | | | | ssh://git.mysociety.org/data/git/public/alaveteli into rails-3-develop
| * | | | Merge branch 'add-en_RW' into rails-3-developGareth Rees2014-11-26-0/+4691
| |\ \ \ \
| | * | | | Add Rwandan English translation file.Louise Crow2014-11-26-0/+4691
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Substitutes Access to Information for Freedom of Information and ATI for FOI.
| * | | | | Don't comment out example configurationGareth Rees2014-11-25-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | Breaks the mySociety internal deployment tooling.
| * | | | | Merge branch '1975-destroy-pbc-heading-msg' into rails-3-developGareth Rees2014-11-20-37/+43
| |\ \ \ \ \
| | * | | | | Add JS confirmation for deleting heading/categoryGareth Rees2014-11-20-2/+4
| | | | | | |
| | * | | | | Fix incorrect count for heading childrenGareth Rees2014-11-20-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Was initially counting the number of headings rather than the number of categories inside each heading.
| | * | | | | Tidy public body category management UIGareth Rees2014-11-20-36/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make the forms for editing categories and category headings more uniform with other admin pages - Put the dangerous actions in a well - Remove large well for returning to the index page
generated by cgit v1.2.3 (git 2.25.1) at 2025-09-22 00:37:34 +0000