aboutsummaryrefslogtreecommitdiffstats
path: root/app/controllers
Commit message (Expand)AuthorAgeLines
* Merge branch 'issues/337-attachment-title' into rails-3-developGareth Rees2014-04-14-9/+8
|\
| * Update gubbins to call AttachmentToHTMLGareth Rees2014-04-07-13/+8
| * Use AttachmentToHTML to generate FoiAttachment#body_as_htmlGareth Rees2014-03-28-8/+12
* | Merge branch 'issues/1343-ip-spoofing-error' into rails-3-developGareth Rees2014-04-14-1/+5
|\ \
| * | Rescue from IpSpoofAttackError when using remote IPGareth Rees2014-04-14-1/+5
* | | Rescue from non-numeric page parameter exceptionsGareth Rees2014-04-10-1/+1
|/ /
* | Merge branch 'issues/1317-holding-pen-spam' into rails-3-developGareth Rees2014-04-07-0/+27
|\ \
| * | Add AdminSpamAddressesController and UIGareth Rees2014-03-28-0/+27
| |/
* | Merge branch 'rails-3-develop' of ssh://git.mysociety.org/data/git/public/ala...Louise Crow2014-04-04-0/+10
|\ \
| * \ Merge branch 'issues/1406-render-exception-error' into rails-3-developGareth Rees2014-04-02-0/+10
| |\ \
| | * | URL Encode the path parameter for render_exceptionGareth Rees2014-03-31-0/+10
| | |/
* | | Merge branch 'feature/1310-better-track-translation' into rails-3-developLouise Crow2014-04-04-16/+3
|\ \ \ | |/ / |/| |
| * | Add notices for unsubscribing from things.Louise Crow2014-03-24-1/+1
| * | Add notices for subscribing to something.Louise Crow2014-03-24-5/+1
| * | Add notices for subscribing something you're subscribed to.Louise Crow2014-03-24-1/+1
| * | Remove obsolete line.Louise Crow2014-03-24-1/+0
| * | Remove old unused code.Louise Crow2014-03-24-8/+0
* | | Add honeypot spam protection to contact formGareth Rees2014-03-31-0/+9
| |/ |/|
* | Controller code to hide/unhide annotationsAndrew Black2014-03-25-0/+6
* | Merge branch 'rails-3-develop' of ssh://git.mysociety.org/data/git/public/ala...Louise Crow2014-03-13-26/+41
|\ \
| * | Use filter to reject if user is bannedGareth Rees2014-03-13-7/+9
| * | Use filter to reject unless comments allowedGareth Rees2014-03-13-9/+11
| * | Extract create_track_thing from CommentControllerGareth Rees2014-03-13-1/+5
| * | Extract find_info_request from CommentControllerGareth Rees2014-03-13-12/+17
| * | Graceful failure of new_comment routeGareth Rees2014-03-13-4/+6
* | | Merge branch 'feature/1345-other-country-fallback' into rails-3-developLouise Crow2014-03-13-2/+9
|\ \ \ | |/ / |/| |
| * | Handle the case where the current locale isn't in site listLouise Crow2014-03-13-2/+9
| |/
* / Correctly call helpers in RequestController#describe_stateGareth Rees2014-03-13-2/+2
|/
* 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