aboutsummaryrefslogtreecommitdiffstats
path: root/app/controllers/request_controller.rb
Commit message (Collapse)AuthorAgeLines
* Allow the donation url to be configured. Closes #909.Louise Crow2013-06-07-2/+12
|
* Merge branch 'release/0.11' into rails-3-developLouise Crow2013-06-04-12/+19
|\
| * Handle json requests for hidden info requests.Louise Crow2013-06-03-12/+19
| |
* | Merge remote-tracking branch ↵Louise Crow2013-06-04-19/+0
|\ \ | | | | | | | | | 'openaustralia_github/more_info_on_report_request' into rails-3-develop
| * | Move reporting actions to their own controllerMatthew Landauer2013-03-22-22/+0
| | |
| * | Extract methodMatthew Landauer2013-03-22-3/+1
| | |
| * | Only allow posts for reporting request. Don't try redirection when not logged inMatthew Landauer2013-03-22-9/+5
| | |
| * | Posted reason and message gets sent out in the emailMatthew Landauer2013-03-22-1/+1
| | |
| * | Only allow reporting a request when logged inMatthew Landauer2013-03-22-0/+5
| | |
| * | Add first pass at page for reporting a requestMatthew Landauer2013-03-22-0/+4
| | |
* | | Merge remote-tracking branch ↵Louise Crow2013-06-04-2/+2
|\ \ \ | |_|/ |/| | | | | 'openaustralia_github/inline_search_method_refactor' into rails-3-develop
| * | ActsAsXapian doesn't need to be referenced from the global namespaceMatthew Landauer2013-03-25-2/+2
| |/
* | Only cache attachments that are returned with a 200 HTTP status codeMark Longair2013-05-24-1/+1
| | | | | | | | | | | | | | Otherwise redirects will be cached, and since headers and the status code aren't stored, a non-redirecting redirect page will be returned in the future, but with 200. It's easiest to only cache the 200 responses.
* | Check that display_filename matches URL part number or fallbackMark Longair2013-05-24-2/+7
| | | | | | | | | | | | | | | | | | | | | | If the display_filename of the attachment found from the URL part number doesn't match the passed in display_filename then the email may have been reparsed, causing a reordering. In that case, look to see if there is another attachment that uniquely matches that filename, and, if so, return that other attachment. If no matching uniquely matching filename is found, redirect to the incoming message, rather than returning a 404.
* | Move "require 'alaveteli_file_types'" into the initializerMark Longair2013-05-16-1/+0
| |
* | Merge branch 'rails-3-develop' of ↵Louise Crow2013-04-24-0/+1
|\ \ | | | | | | | | | ssh://git.mysociety.org/data/git/public/alaveteli into rails-3-develop
| * | Add encoding specifications to two files that use UTF-8Mark Longair2013-04-16-0/+1
| | | | | | | | | | | | | | | Both of these files include multi-byte UTF-8 sequences, so should have a 'magic comment' specifying the encoding.
* | | Merge branch 'release/0.9' into rails-3-developLouise Crow2013-04-24-3/+3
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: Gemfile.lock app/controllers/public_body_controller.rb app/mailers/track_mailer.rb app/views/request/_hidden_correspondence.html.erb app/views/request/_sidebar.html.erb app/views/request/hidden.html.erb app/views/request/new_please_describe.html.erb app/views/request/preview.html.erb app/views/user/show.html.erb config/environment.rb config/routes.rb spec/controllers/public_body_controller_spec.rb
| * | Merge branch 'feature/final-consistent-translation-interpolation' into developLouise Crow2013-04-16-3/+3
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: app/models/outgoing_message.rb app/views/general/search.rhtml app/views/public_body/list.rhtml app/views/public_body/show.rhtml app/views/public_body/view_email.rhtml app/views/request/_after_actions.rhtml app/views/request/_followup.rhtml app/views/request/_sidebar.rhtml app/views/request/new.rhtml app/views/request/select_authority.rhtml app/views/request/upload_response.rhtml locale/aln/app.po locale/app.pot locale/ar/app.po locale/bs/app.po locale/ca/app.po locale/cs/app.po locale/cy/app.po locale/de/app.po locale/en/app.po locale/en_IE/app.po locale/es/app.po locale/eu/app.po locale/fr/app.po locale/gl/app.po locale/hu_HU/app.po locale/id/app.po locale/nb_NO/app.po locale/pt_BR/app.po locale/ro_RO/app.po locale/sl/app.po locale/sq/app.po locale/sr@latin/app.po locale/tr/app.po locale/uk/app.po
| | * | Use {{}} not %s in translation.Louise Crow2013-04-09-1/+1
| | | |
| | * | Use {{}} instead of %s in url interpolation.Louise Crow2013-04-09-3/+3
| | | |
| * | | Set locale with I18n rather than through globalizeMatthew Landauer2013-04-02-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | Conflicts: app/controllers/general_controller.rb
* | | | Change email address in header of source code to hello@mysociety.orgMatthew Landauer2013-03-26-1/+1
| |_|/ |/| |
* | | Stop pollution of params[:outgoing_message]Matthew Landauer2013-03-19-4/+1
| | |
* | | Config name change missed in the mergeHenare Degan2013-03-15-2/+2
| | |
* | | Whoever said don't sweat the small stuff obviously never messed up a merge ↵Henare Degan2013-03-15-1/+1
| | | | | | | | | | | | and missed changing variable scope
* | | Fix up some merge action from f60ada47d4e7aabe0dce152109cb0d91865929daHenare Degan2013-03-15-1/+0
| | |
* | | Merge remote-tracking branch 'mysociety/develop' into rails-3-developHenare Degan2013-03-14-88/+89
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: Gemfile Gemfile.lock app/controllers/admin_request_controller.rb app/controllers/admin_track_controller.rb app/controllers/request_controller.rb app/controllers/services_controller.rb app/helpers/link_to_helper.rb app/mailers/request_mailer.rb app/models/application_mailer.rb app/models/info_request.rb app/views/admin_censor_rule/edit.html.erb app/views/admin_censor_rule/new.html.erb app/views/admin_public_body/_form.html.erb app/views/admin_public_body/_locale_selector.html.erb app/views/admin_public_body/_one_list.html.erb app/views/admin_public_body/edit.html.erb app/views/admin_public_body/list.html.erb app/views/admin_public_body/new.html.erb app/views/admin_request/_incoming_message_actions.html.erb app/views/admin_request/edit.html.erb app/views/admin_request/edit_comment.html.erb app/views/admin_request/edit_outgoing.html.erb app/views/admin_request/list.html.erb app/views/admin_request/list_old_unclassified.html.erb app/views/admin_request/show.html.erb app/views/admin_track/_some_tracks.html.erb app/views/admin_track/list.html.erb app/views/admin_user/edit.html.erb app/views/admin_user/list.html.erb app/views/admin_user/show.html.erb app/views/general/_footer.html.erb app/views/general/exception_caught.html.erb app/views/help/contact.html.erb app/views/layouts/default.html.erb app/views/public_body/_alphabet.html.erb app/views/request/_request_listing_single.html.erb app/views/request/_sidebar.html.erb app/views/request/new.html.erb app/views/request/show.html.erb app/views/request_mailer/external_response.rhtml app/views/request_mailer/fake_response.rhtml config/environment.rb config/environments/production.rb config/routes.rb spec/controllers/admin_censor_rule_controller_spec.rb spec/controllers/request_controller_spec.rb spec/controllers/track_controller_spec.rb spec/helpers/link_to_helper_spec.rb spec/mailers/request_mailer_spec.rb spec/models/info_request_spec.rb spec/spec_helper.rb spec/views/public_body/show.html.erb_spec.rb spec/views/request/show.html.erb_spec.rb vendor/plugins/rails_xss/lib/rails_xss/erubis.rb
| * | Merge remote-tracking branch ↵Louise Crow2013-03-13-84/+84
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'openaustralia_github/one_support_email_on_admin_attention_state' into develop Conflicts: Gemfile.lock app/controllers/request_controller.rb app/models/request_mailer.rb app/views/admin_general/index.rhtml spec/models/request_mailer_spec.rb
| | * | Remove deleted action from list of actionsMatthew Landauer2013-03-06-2/+2
| | | |
| | * | Now direct changes of state to error_message and requires_admin to a new ↵Matthew Landauer2013-03-06-9/+30
| | | | | | | | | | | | | | | | page asking for more info
| | * | Can also record a message when posting to RequestController#describe_stateMatthew Landauer2013-03-05-1/+2
| | | |
| | * | Remove code added previously because on the wrong trackMatthew Landauer2013-03-05-22/+0
| | | |
| | * | Don't allow external requests to have their state changedMatthew Landauer2013-03-04-0/+7
| | | |
| | * | Record who changes the stateMatthew Landauer2013-03-04-1/+1
| | | |
| | * | Refactor functionality from controller to modelMatthew Landauer2013-03-04-12/+0
| | | |
| | * | Fix bug when user not owner of request changing state to requires_admin ↵Matthew Landauer2013-03-04-1/+1
| | | | | | | | | | | | | | | | email should come from user making the change
| | * | Use Ability::can_update_request_state? in RequestController#describe_stateMatthew Landauer2013-03-04-5/+4
| | | |
| | * | Inline temporary variablesMatthew Landauer2013-03-04-6/+2
| | | |
| | * | No need for instance variables in action without viewMatthew Landauer2013-03-04-34/+34
| | | |
| | * | Extract method that knows who can update the state of a requestMatthew Landauer2013-03-03-4/+6
| | | |
| | * | Can update status when request is old and unclassifiedMatthew Landauer2013-03-03-1/+1
| | | |
| | * | admin user can change statusMatthew Landauer2013-03-03-1/+1
| | | |
| | * | only can make the change as the owner of a requestMatthew Landauer2013-03-03-1/+1
| | | |
| | * | Add basic authentication to new actionMatthew Landauer2013-03-03-9/+4
| | | |
| | * | Switch to pretty urlsMatthew Landauer2013-03-02-1/+1
| | | |
| | * | Add authenticationMatthew Landauer2013-03-02-2/+15
| | | |
| | * | New request controller action for requires_admin state with messageMatthew Landauer2013-03-02-0/+5
| | | |
| | * | Inline methodMatthew Landauer2013-03-02-1/+1
| | | |
| | * | Refactor state logicMatthew Landauer2013-03-02-35/+36
| | | |