Commit message (Collapse) | Author | Age | Lines | |
---|---|---|---|---|
* | Merge branch 'issues/337-attachment-title' into rails-3-develop | Gareth Rees | 2014-04-14 | -2/+1 |
|\ | ||||
| * | Use AttachmentToHTML to generate FoiAttachment#body_as_html | Gareth Rees | 2014-03-28 | -2/+1 |
| | | ||||
* | | Merge branch 'issues/1317-holding-pen-spam' into rails-3-develop | Gareth Rees | 2014-04-07 | -0/+91 |
|\ \ | ||||
| * | | Add AdminSpamAddressesController and UI | Gareth Rees | 2014-03-28 | -0/+91 |
| |/ | ||||
* | | Merge branch 'feature/1310-better-track-translation' into rails-3-develop | Louise Crow | 2014-04-04 | -3/+3 |
|\ \ | | | | | | | | | | | | | Conflicts: spec/factories.rb | |||
| * | | Add notices for subscribing to something. | Louise Crow | 2014-03-24 | -1/+1 |
| | | | | | | | | | | | | | | | These notices are complete sentences, not composed on the fly, so should be easier to translate. | |||
| * | | Make track factory name a bit more specific. | Louise Crow | 2014-03-24 | -2/+2 |
| | | | ||||
* | | | Add honeypot spam protection to contact form | Gareth Rees | 2014-03-31 | -0/+17 |
| | | | | | | | | | | | | | | | Intercepts the request and redirects to the homepage if the comment field is filled in on the contact form. | |||
* | | | Improve HelpControllerSpec | Gareth Rees | 2014-03-31 | -1/+5 |
| | | | | | | | | | | | | | | | - Actually assert something when getting the pages - Use named route | |||
* | | | Tidy HelpControllerSpec | Gareth Rees | 2014-03-31 | -29/+41 |
| |/ |/| | ||||
* | | Add specs for AdminUserController#modify_comment_visibility | Gareth Rees | 2014-03-25 | -0/+69 |
| | | ||||
* | | Use filter to reject if user is banned | Gareth Rees | 2014-03-13 | -0/+13 |
| | | | | | | | | | | | | | | | | | | Extract checking whether a user is banned from making Comments on an InfoRequest to a filter in CommentController. Removes responsibility from the #new method. Adds a missing spec. | |||
* | | Graceful failure of new_comment route | Gareth Rees | 2014-03-13 | -9/+10 |
|/ | | | | | | | | | | Fixes https://github.com/mysociety/alaveteli/issues/662 If /annotate/request/:url_title is accessed when comments are disabled an exception is incorrectly thrown. Conditionals should be used for control flow, so now the action redirects to the info_request path and displays a notice. | |||
* | Merge branch 'feature/batch-requests' into rails-3-develop | Louise Crow | 2014-01-29 | -35/+407 |
|\ | | | | | | | | | | | Conflicts: config/general.yml-example spec/factories.rb | |||
| * | Specify sort on results to return in consistent order. | Louise Crow | 2014-01-28 | -1/+1 |
| | | ||||
| * | Show public body list when batch has not been sent. | Louise Crow | 2013-12-04 | -8/+29 |
| | | ||||
| * | Update notices for offline sending. | Louise Crow | 2013-12-04 | -9/+1 |
| | | ||||
| * | Display batch requests for user on 'my requests' page | Louise Crow | 2013-12-04 | -2/+4 |
| | | | | | | | | This is the most rudimentary possible way to give them access to the batch request urls, pending #1239 | |||
| * | Refactor specs to make adding batch changes easier. | Louise Crow | 2013-12-04 | -30/+63 |
| | | ||||
| * | Javascript enhancements. | Louise Crow | 2013-12-04 | -27/+59 |
| | | | | | | | | Add or remove all buttons, ajax search as you type. | |||
| * | Add a rudimentary view for an info request batch. | Louise Crow | 2013-12-04 | -0/+32 |
| | | ||||
| * | Notices for success and errors. | Louise Crow | 2013-12-04 | -16/+34 |
| | | ||||
| * | Add check for double submission. | Louise Crow | 2013-12-04 | -0/+11 |
| | | ||||
| * | Make method names for finding existing objects clearer | Louise Crow | 2013-12-04 | -1/+1 |
| | | | | | | | | | | They're not finding by the existing object, they're finding an existing object. | |||
| * | Simple code for the happy path | Louise Crow | 2013-12-04 | -0/+8 |
| | | | | | | | | | | Create the batch and associate new requests with it, send the outgoing messages, and redirect to a page for the new batch. | |||
| * | Use two bodies in specs. | Louise Crow | 2013-12-04 | -3/+5 |
| | | ||||
| * | Handle a banned user making batch requests. | Louise Crow | 2013-12-04 | -0/+15 |
| | | ||||
| * | Factor out common params for clarity. | Louise Crow | 2013-12-04 | -18/+11 |
| | | ||||
| * | Require at least one public body in the params. | Louise Crow | 2013-12-04 | -2/+10 |
| | | ||||
| * | Create template and outgoing message | Louise Crow | 2013-12-04 | -0/+29 |
| | | | | | | | | | | Add validation, preview as in single request creation. Add comments noting further work to be done in this action. | |||
| * | Add new_batch action | Louise Crow | 2013-12-04 | -0/+66 |
| | | | | | | | | | | | | Give it basic access control, and add some conditionals to the 'new' template around bits that use @info_request.public_body so that they render something different if @batch is assigned. | |||
| * | Add template for select_authorities | Louise Crow | 2013-12-04 | -2/+32 |
| | | | | | | | | Should retain a list of selected public bodies across searches. | |||
| * | Handle not enabled, no user, unauthorised user. | Louise Crow | 2013-12-04 | -3/+55 |
| | | ||||
| * | Add a select_authorities action. | Louise Crow | 2013-12-04 | -0/+9 |
| | | ||||
| * | Add a can_make_batch_requests flag to user model | Louise Crow | 2013-12-04 | -2/+21 |
| | | | | | | | | Make it updatable via the user admin page. | |||
* | | Merge branch 'hotfix/0.16.0.6' into rails-3-develop | Louise Crow | 2014-01-28 | -0/+12 |
|\ \ | ||||
| * | | Handle a request with no user in the show request function0.16.0.5hotfix/0.16.0.5 | Louise Crow | 2014-01-28 | -0/+12 |
| | | | ||||
* | | | Merge branch 'feature/1176-automate-authority-contacts' into rails-3-develop | Louise Crow | 2014-01-28 | -166/+427 |
|\ \ \ | | | | | | | | | | | | | | | | | Conflicts: doc/CHANGES.md | |||
| * | | | Add admin urls to change request emails | Louise Crow | 2014-01-13 | -0/+4 |
| | | | | ||||
| * | | | Add form for closing change request without action | Louise Crow | 2014-01-13 | -0/+35 |
| | | | | | | | | | | | | | | | | | | | | | | | | For cases where we don't want to make the change suggested. There doesn't seem to be any obvious default text to use in the response to the person who requested the change. | |||
| * | | | Populate admin public body forms based on a change request. | Louise Crow | 2014-01-13 | -0/+106 |
| | | | | | | | | | | | | | | | | | | | | Also add editable text for an email to be sent to the person requesting the change. | |||
| * | | | Reorganise specs | Louise Crow | 2014-01-13 | -166/+187 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | In order to make it clearer where to add new specs, group specs by controller and action, merging specs relating to internationalisation with other specs as there seem to be no specific prerequisites in terms of set up for them, and removing some duplicate specs. | |||
| * | | | Form and models for asking for a public body change. | Louise Crow | 2014-01-13 | -0/+95 |
| | | | | ||||
* | | | | Merge branch 'feature/cache-request-lists' into rails-3-develop | Louise Crow | 2014-01-28 | -86/+0 |
|\ \ \ \ | ||||
| * | | | | Cache frequently accessed request lists. | Louise Crow | 2013-12-19 | -86/+0 |
| |/ / / | | | | | | | | | | | | | Make specs a bit more focused, remove view specs - they're not relevant to the new code in their current form and don't seem to merit updating. | |||
* | / / | Tighten up expectation, make expected files consistent. | Louise Crow | 2014-01-17 | -12/+0 |
| |/ / |/| | | | | | | | | | | | | | | | | | Just expecting the parsed file to include the expected one would mean success in the case where nothing has been folded. Tighten up the expectation, and add quoting placeholders to expected files that didn't have them. | |||
* | | | Merge branch 'feature/cleanup-popups' into release/0.16 | Louise Crow | 2014-01-14 | -1/+1 |
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | Conflicts: Gemfile.lock app/views/layouts/default.html.erb config/application.rb public/admin/stylesheets/admin.css | |||
| * | | Cleanup popup notices. | Louise Crow | 2014-01-14 | -1/+1 |
| |/ | | | | | | | | | | | | | | | Move HTML to view from controller, use same elements for other country popup and everypage - partly so they don't display on top of each other anymore. Don't position them over existing content, position them at the top of the page. Use consistent styling, and keep the javascript unobtrusive. | |||
* / | Only show the blog if a BLOG_FEED is configured. | Louise Crow | 2013-12-09 | -0/+11 |
|/ | ||||
* | Move getting recent requests into a helper method. | Louise Crow | 2013-11-25 | -42/+0 |
| |