aboutsummaryrefslogtreecommitdiffstats
path: root/app/controllers
Commit message (Expand)AuthorAgeLines
* Merge branch 'feature/batch-requests' into rails-3-developLouise Crow2014-01-29-93/+221
|\
| * Preserve whitespace in strings for translation.Louise Crow2014-01-28-1/+1
| * Update notices for offline sending.Louise Crow2013-12-04-16/+11
| * Display batch requests for user on 'my requests' pageLouise Crow2013-12-04-0/+3
| * Split the creation of a batch and the associated requests.Louise Crow2013-12-04-5/+6
| * Add list of bodies batch request will be sent to.Louise Crow2013-12-04-0/+6
| * Javascript enhancements.Louise Crow2013-12-04-6/+18
| * Raise limit on results to 1000.Louise Crow2013-12-04-3/+3
| * Move creation of batch to InfoRequestBatch.Louise Crow2013-12-04-21/+7
| * Add a rudimentary view for an info request batch.Louise Crow2013-12-04-2/+4
| * Notices for success and errors.Louise Crow2013-12-04-7/+28
| * Add check for double submission.Louise Crow2013-12-04-5/+8
| * Make method names for finding existing objects clearerLouise Crow2013-12-04-5/+5
| * Simple code for the happy pathLouise Crow2013-12-04-19/+28
| * Remove extra 'is invalid' error message.Louise Crow2013-12-04-2/+4
| * Handle a banned user making batch requests.Louise Crow2013-12-04-1/+5
| * Batch users don't have a daily limit.Louise Crow2013-12-04-2/+1
| * Pass public bodies list through forms.Louise Crow2013-12-04-1/+0
| * Require at least one public body in the params.Louise Crow2013-12-04-3/+3
| * Create template and outgoing messageLouise Crow2013-12-04-18/+60
| * Isolate code for preparing to display the compose interface.Louise Crow2013-12-04-51/+67
| * Add new_batch actionLouise Crow2013-12-04-15/+23
| * Add template for select_authoritiesLouise Crow2013-12-04-0/+11
| * Handle not enabled, no user, unauthorised user.Louise Crow2013-12-04-12/+17
| * Add a select_authorities action.Louise Crow2013-12-04-0/+3
| * Add a can_make_batch_requests flag to user modelLouise Crow2013-12-04-0/+1
* | Merge branch 'hotfix/0.16.0.6' into rails-3-developLouise Crow2014-01-28-1/+4
|\ \
| * | Handle a request with no user in the show request function0.16.0.5hotfix/0.16.0.5Louise Crow2014-01-28-1/+4
* | | Merge branch 'feature/1176-automate-authority-contacts' into rails-3-developLouise Crow2014-01-28-9/+92
|\ \ \
| * | | Add form for closing change request without actionLouise Crow2014-01-13-0/+15
| * | | Populate admin public body forms based on a change request.Louise Crow2014-01-13-3/+39
| * | | Allow from_admin_message to take a name and email.Louise Crow2014-01-13-1/+2
| * | | Add change requests to the 'Things to do' listLouise Crow2014-01-13-0/+2
| * | | Clean up admin indexLouise Crow2014-01-13-5/+6
| * | | Form and models for asking for a public body change.Louise Crow2014-01-13-0/+28
* | | | Merge branch 'feature/cache-request-lists' into rails-3-developLouise Crow2014-01-28-103/+7
|\ \ \ \
| * | | | Cache frequently accessed request lists.Louise Crow2013-12-19-7/+5
| * | | | Move make_query_from_params to XapianQueriesLouise Crow2013-12-19-97/+3
| |/ / /
* | | | Merge branch 'release/0.16' into rails-3-developLouise Crow2014-01-14-3/+0
|\ \ \ \ | | |/ / | |/| |
| * | | Merge branch 'feature/cleanup-popups' into release/0.16Louise Crow2014-01-14-3/+0
| |\ \ \ | | |/ / | |/| |
| | * | Cleanup popup notices.Louise Crow2014-01-14-3/+0
* | | | localisation bug fixed in request_controllerGyörgy Peng2014-01-08-1/+1
* | | | Standardise explanation generation by using render_to_stringLouise Crow2013-12-18-9/+7
|/ / /
* | | Merge branch 'feature/display-social-media-when-configured' into rails-3-developLouise Crow2013-12-09-0/+4
|\ \ \
| * | | Only show the blog if a BLOG_FEED is configured.Louise Crow2013-12-09-0/+4
| | |/ | |/|
* / | Fix the command-line CSV importer under Ruby 1.9Mark Longair2013-12-03-0/+2
|/ /
* | Merge remote-tracking branch 'origin/merged-rails-3-2-assset-pipeline' into r...Louise Crow2013-11-29-5/+11
|\ \ | |/ |/|
| * Merge branch 'feature/rails-3-2-upgrade-spike' into feature/switch-to-asset-p...Mark Longair2013-11-29-5/+11
| |\
| | * Add a dummy exception notification address for testingLouise Crow2013-11-12-1/+3
| | * Don't specify format in template name.Louise Crow2013-11-12-4/+8