aboutsummaryrefslogtreecommitdiffstats
path: root/app/controllers/request_controller.rb
Commit message (Collapse)AuthorAgeLines
* 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
|
* 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
| | |
| | * Use routes to only allow post to RequestController#describe_stateMatthew Landauer2013-03-02-6/+0
| | |
| * | Merge remote-tracking branch 'openaustralia_github/make-links-relative' into ↵Louise Crow2013-03-06-5/+5
| |\ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | develop Conflicts: app/controllers/admin_request_controller.rb app/models/request_mailer.rb app/views/admin_general/index.rhtml app/views/admin_general/stats.rhtml app/views/admin_public_body/_one_list.rhtml app/views/admin_public_body/_tags.rhtml app/views/admin_public_body/show.rhtml app/views/admin_request/show.rhtml app/views/admin_user/show.rhtml app/views/layouts/admin.rhtml app/views/public_body/show.rhtml app/views/request/new.rhtml
| | * Use absolute urls when redirectingMatthew Landauer2013-02-15-2/+2
| | |
| | * Rename named routes for categorisation game as they clash with request_url & ↵Matthew Landauer2013-02-15-1/+1
| | | | | | | | | | | | request_path helpers
| | * Redirects should be done with absolute urlsMatthew Landauer2013-02-15-15/+15
| | |
| | * Rename helper methodMatthew Landauer2013-02-15-17/+17
| | |
| | * Redirects should be done with absolute urlsMatthew Landauer2013-02-15-1/+1
| | |
| | * Rename helper methodMatthew Landauer2013-02-15-1/+1
| | |
| * | Don't pass latest_status param to locale switching links on view requests pageMatthew Landauer2013-02-12-2/+1
| | |
| * | Pass parameters to method rather explicitlyMatthew Landauer2013-02-12-1/+1
| |/
* | Explicitly load association. Doesn't feel right but probably should refactor ↵Henare Degan2013-03-04-0/+3
| | | | | | | | all this anyway
* | Rails 3.1 doesn't load the association from the id when creating a new ↵Henare Degan2013-03-04-4/+4
| | | | | | | | InfoRequest object
* | Rename Configuration class to avoid conflict with ActiveSupport::ConfigurableHenare Degan2013-03-03-7/+7
| |
* | Remove Tmail and use the Mail gem under Ruby 1.8.7 as wellHenare Degan2013-02-27-27/+2
| |
* | Rename ALL THE TEMPLATES!!1!!!one!!1!!Henare Degan2013-02-27-2/+2
| | | | | | | | .rhtml is deprecated in favour of .erb in Rails 3
* | file_name is passed as a string not an arrayHenare Degan2013-02-26-3/+3
| |
* | create_ is deprecatedHenare Degan2013-02-25-1/+1
| |
* | Update to new mail sending APIHenare Degan2013-02-25-1/+1
| |
* | Cast to a string so it's not saved to the DB as an object under Ruby 1.9.3Henare Degan2013-02-21-1/+1
| |
* | Remove deprecated constants - #589Henare Degan2013-02-20-1/+1
| |
* | Merge branch 'develop' into rails-3-spikeHenare Degan2013-02-15-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: Gemfile Gemfile.lock app/controllers/general_controller.rb app/controllers/track_controller.rb app/models/outgoing_message.rb app/models/public_body.rb app/models/user.rb app/views/general/frontpage.rhtml config/environment.rb config/initializers/inflections.rb config/initializers/mime_types.rb db/migrate/094_remove_old_tags_foreign_key.rb lib/timezone_fixes.rb spec/models/request_mailer_spec.rb spec/views/request/list.rhtml_spec.rb