aboutsummaryrefslogtreecommitdiffstats
path: root/app/controllers/admin_request_controller.rb
Commit message (Collapse)AuthorAgeLines
* Merge branch 'feature/hide-individual-responses' into rails-3-developLouise Crow2013-09-17-85/+0
|\ | | | | | | | | | | | | | | | | | | | | Conflicts: Gemfile app/views/admin_request/edit_outgoing.html.erb config/packages doc/CHANGES.md doc/INSTALL.md spec/models/info_request_spec.rb spec/models/public_body_spec.rb
| * Move incoming message admin to its own controller.Louise Crow2013-09-16-52/+0
| | | | | | | | | | Make specs that depend on multiple controllers and models interacting integration specs.
| * Move outgoing message admin actions to their own controller.Louise Crow2013-09-16-33/+0
| | | | | | | | Eventually this should use standard RESTful routing.
* | Make admin edits affect info_request_event described_states.Louise Crow2013-08-15-4/+4
|/ | | | | | | Make sure that admin edits changing the described state of an info request are reflected in the latest_status and status values of info request events so that the info requests are retrieved correctly in status-based searches.
* Change email address in header of source code to hello@mysociety.orgMatthew Landauer2013-03-26-1/+1
|
* Removed in eadfc265ff83524cbd54b2682f2de818bca24bf4Henare Degan2013-03-15-15/+0
|
* Merge remote-tracking branch 'mysociety/develop' into rails-3-developHenare Degan2013-03-14-21/+21
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * Removed unused admin page. This stuff is now shown on the summary pageMatthew Landauer2013-03-08-15/+0
| |
| * Merge remote-tracking branch 'openaustralia_github/make-links-relative' into ↵Louise Crow2013-03-06-20/+20
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * Inline helperMatthew Landauer2013-02-15-15/+15
| | |
| | * Stop using admin_url to generate absolute url for the admin interfaceMatthew Landauer2013-02-15-1/+1
| | |
| | * Stop using main_url to generate absolute urls for the main siteMatthew Landauer2013-02-15-3/+3
| | |
| | * Rename helper methodMatthew Landauer2013-02-15-1/+1
| | |
| * | Use string interpolation to make the flash message more readable in the codeMatthew Landauer2013-02-26-1/+1
| | |
| * | Make flash message in admin interface html safeMatthew Landauer2013-02-26-1/+1
| | |
| * | Mark the info request name as safe - hidden_user_explanation's content will ↵Louise Crow2013-02-19-1/+1
| |/ | | | | | | be escaped in the parent template. Strip content in the controller and mark as HTML safe.
* | In will_paginate 3 you can call paginate directly on the modelHenare Degan2013-03-03-1/+1
| |
* | Rename Configuration class to avoid conflict with ActiveSupport::ConfigurableHenare Degan2013-03-03-2/+2
| |
* | Rename ALL THE TEMPLATES!!1!!!one!!1!!Henare Degan2013-02-27-1/+1
| | | | | | | | .rhtml is deprecated in favour of .erb in Rails 3
* | Update to new mail sending APIHenare Degan2013-02-25-2/+2
| |
* | 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
| * Mark flash with markup in it as html safe.Louise Crow2013-02-08-1/+1
| |
* | Convert query to more activerecord 3 formMatthew Landauer2013-01-30-7/+5
| |
* | If now query is supplied get all the requestsMatthew Landauer2013-01-30-4/+10
|/
* Remove redundant method.Louise Crow2012-12-04-1/+1
|
* Use mail handler method to get mail object from raw data when redelivering a ↵Louise Crow2012-11-15-2/+1
| | | | mail from the admin interface.
* Re-route model code that accesses the mail object from field via wrapper methodsLouise Crow2012-11-15-2/+2
|
* Add wrapper method so that admin_request_controller doesn't access mail ↵Louise Crow2012-11-15-1/+1
| | | | object directly.
* Redirect calls to admin_http_auth_user to more generic wrapper ↵Louise Crow2012-10-30-9/+9
| | | | admin_current_user
* Bugfix - fixed cut and paste error.Louise Crow2012-10-17-1/+1
|
* Remove svn tags that are out of date as we are now using gitMatthew Landauer2012-10-09-2/+0
|
* Extract configuration with defaults into one moduleMatthew Landauer2012-09-25-2/+2
|
* Add an option to disable comments on a requestRobin Houston2012-09-19-1/+4
| | | | Closes #30.
* Paginate the list of old unclassified requests.Louise Crow2012-09-13-1/+12
|
* Reformat for readability.Louise Crow2012-09-13-1/+3
|
* Allow external requests to be hidden from the admin interface.Louise Crow2012-08-22-6/+10
|
* Fail with NotFound if request slug doesn't existRobin Houston2012-08-20-1/+1
| | | | Closes #554.
* Merge branch 'wdtk' into developLouise Crow2012-08-16-7/+16
|\ | | | | | | | | | | | | Conflicts: app/controllers/admin_request_controller.rb config/httpd.conf spec/models/info_request_spec.rb
| * Fix typo in comment.Louise Crow2012-08-16-7/+16
| |
* | Ensure (at least in the most basic cases) that views support recent ↵Seb Bacon2012-07-09-1/+1
|/ | | | "external request" changes (mainly that InfoRequests no longer necessarily have a User).
* Log an event when a request is hiddenRobin Houston2012-06-04-1/+9
|
* Allow subject to be specified when request hiddenRobin Houston2012-06-03-1/+2
| | | | When a request is hidden by an admin, allow the subject line to be specified.
* Always supply admins with reason why a request was sent to the holding pen, ↵Seb Bacon2012-05-29-1/+1
| | | | even if it's "unknown"
* Allow messages to be redelivered to more than one request. Closes #442Seb Bacon2012-05-29-25/+29
|
* Support easy hiding of requests for admins. Currently not exposed in core ↵Seb Bacon2012-05-25-0/+29
| | | | admin interface (requires adminbootstraptheme).
* Remove trailing whitespace (to make a cleaner forthcoming merge with ↵Seb Bacon2012-05-15-31/+31
| | | | wombleton:feature/440_sparkly_admin_css)
* Show the rejected reason for the incoming message in question, not the most ↵Seb Bacon2011-08-11-1/+1
| | | | recent rejected reason for the info request in question. Fixes #129.
* allow admin to redeliver emails to closed requests. Fixes #116Seb Bacon2011-08-08-1/+1
|
* Guess holding pen emails based on having a correct hash and an incorrect id. ↵Seb Bacon2011-08-08-9/+1
| | | | Closes #117
* Log the reason why an incoming mail is routed to the holding pen, and ↵Seb Bacon2011-08-03-1/+4
| | | | display it to administrators. Closes #107.