aboutsummaryrefslogtreecommitdiffstats
path: root/app/controllers/application_controller.rb
Commit message (Collapse)AuthorAgeLines
* Merge branch 'feature/hide-individual-responses' into rails-3-developLouise Crow2013-09-17-13/+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 some download methods to InfoRequest.Louise Crow2013-09-16-13/+0
| | | | | | | | | | | | Use send_file to send zips. Also adds 'all_can_view_all_correspondence?' - is this request completely cachable, or do we need to cache different versions for different levels of privilege?
* | Make method name clearerHenare Degan2013-08-10-2/+2
| |
* | Don't show diagnostic messages when request is simply localHenare Degan2013-08-10-6/+3
|/ | | | | | This fixes the scenario when Alaveteli is behind a proxy in production Resolves #1039
* Merge remote-tracking branch 'openaustralia_github/app_version_api_feature' ↵Louise Crow2013-06-18-0/+4
|\ | | | | | | | | | | | | | | | | into rails-3-develop Conflicts: app/controllers/application_controller.rb app/controllers/general_controller.rb config/routes.rb
| * Extract methodMatthew Landauer2013-02-24-0/+5
| |
* | Merge branch 'hotfix/0.11.0.13' into rails-3-developLouise Crow2013-06-17-1/+4
|\ \ | | | | | | | | | | | | Conflicts: spec/mailers/outgoing_mailer_spec.rb
| * | Explicitly set I18n.locale in set_gettext_locale in order to get Rails to ↵0.11.0.13hotfix/0.11.0.13Louise Crow2013-06-17-1/+4
| | | | | | | | | | | | expire the template cache and trigger a lookup.
* | | Merge commit '0.11.0.8' into rails-3-developLouise Crow2013-06-11-4/+0
|\| |
| * | Only render the popup banner in the layout where it's actually used.Louise Crow2013-06-11-4/+0
| | |
* | | Merge branch 'release/0.11' into rails-3-developLouise Crow2013-06-04-1/+4
|\| |
| * | For non-HTML requests, just return the response code for now.Louise Crow2013-06-03-1/+4
| | |
* | | Merge remote-tracking branch ↵Louise Crow2013-06-04-6/+9
|\ \ \ | |/ / |/| | | | | 'openaustralia_github/inline_search_method_refactor' into rails-3-develop
| * | Tiny refactorMatthew Landauer2013-03-25-5/+2
| | |
| * | Inline method InfoRequest.full_searchMatthew Landauer2013-03-25-1/+7
| | |
* | | Add logging of any errors.Louise Crow2013-05-02-0/+4
| | |
* | | Remove now unused methodsLouise Crow2013-05-02-50/+0
| | |
* | | Handle routing errors with our custom template too.Louise Crow2013-05-02-1/+4
| | |
* | | Clearer setting of status code, addition of notification.Louise Crow2013-05-02-10/+17
| | |
* | | Return the correct status codes for ActiveRecord::RecordNotFound, ↵Louise Crow2013-05-02-0/+8
| | | | | | | | | | | | ActionController::UnknownAction, PermissionDenied and general exceptions.
* | | Add new error handler method that renders the general/exception_caught templateLouise Crow2013-05-02-0/+13
| | |
* | | Change email address in header of source code to hello@mysociety.orgMatthew Landauer2013-03-26-1/+1
|/ /
* | Merge remote-tracking branch 'mysociety/develop' into rails-3-developHenare Degan2013-03-14-17/+13
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * Pass parameters to method rather explicitlyMatthew Landauer2013-02-12-9/+9
| |
| * Inline methodMatthew Landauer2013-02-12-8/+4
| |
| * Simplify param_exists methodMatthew Landauer2013-02-12-1/+1
| |
* | Not required with the new version of exception_notificationHenare Degan2013-03-05-3/+0
| |
* | Rename Configuration class to avoid conflict with ActiveSupport::ConfigurableHenare Degan2013-03-03-8/+8
| |
* | Rename ALL THE TEMPLATES!!1!!!one!!1!!Henare Degan2013-02-27-1/+1
| | | | | | | | .rhtml is deprecated in favour of .erb in Rails 3
* | 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 popup banner as html_safeLouise Crow2013-02-08-1/+1
| |
* | Fixup up test_code_redirect_by_email_token for rspec 2Matthew Landauer2013-01-29-1/+2
| |
* | Merge remote-tracking branch 'mysociety/develop' into rails-3-spikeMatthew Landauer2013-01-04-0/+13
|\| | | | | | | | | | | | | | | | | | | | | Conflicts: Gemfile.lock Rakefile app/controllers/request_controller.rb lib/tasks/rspec.rake spec/controllers/services_controller_spec.rb spec/spec_helper.rb spec/views/request/_after_actions.rhtml_spec.rb
| * Merge branch 'hotfix/authenticate-and-expire-download-zips' into developLouise Crow2012-12-13-0/+13
| |\
| | * Remove any download zip files when a request's cached files are expired.Louise Crow2012-12-13-0/+4
| | |
| | * Put download zips in a predictable location - sharded folders based on ↵Louise Crow2012-12-13-0/+5
| | | | | | | | | | | | request ID, rather than distributing them across the download directories by the generated SHA. Preserve the uniqueness of the subdirectory.
| | * Use helper method for download path, and use Rails.root instead of file ↵Louise Crow2012-12-13-0/+4
| | | | | | | | | | | | location.
* | | Using #request_uri is deprecatedHenare Degan2012-12-11-1/+1
| | |
* | | Thought I got this in b0ae75aba63d40146cfbc7e6af27e1d6051f1804 but it must ↵Henare Degan2012-12-11-3/+0
| | | | | | | | | | | | have been set twice - safety first!
* | | Disable rescue customisations until we can move it to rackHenare Degan2012-12-11-13/+14
| | |
* | | This is deprecated and now set in application.rbHenare Degan2012-12-11-3/+0
|/ /
* | Give the implicit default locale in a URL without locale precedence over the ↵Louise Crow2012-11-28-2/+7
| | | | | | | | session in the case where the default locale is not being included in URLs. This allows the user to return to the default locale.
* | Fix styling of error page with current themesMatthew Landauer2012-11-16-7/+4
|/
* Move methods used only in admin controllers to admin_controller.rbLouise Crow2012-10-30-24/+0
|
* If we're doing admin authentication internally, don't bother with the ↵Louise Crow2012-10-30-2/+8
| | | | request environment, set the admin_name on the session instead.
* Redirect calls to admin_http_auth_user to more generic wrapper ↵Louise Crow2012-10-30-0/+4
| | | | admin_current_user
* 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-10/+7
|
* Don't pass a page param of less than one through to Xapian, treat it as a ↵Louise Crow2012-08-21-3/+6
| | | | param of 1. Fixes #557.
* Merge branch 'wdtk' into developLouise Crow2012-08-16-0/+3
|\ | | | | | | | | | | | | Conflicts: app/controllers/admin_request_controller.rb config/httpd.conf spec/models/info_request_spec.rb
generated by cgit v1.2.3 (git 2.25.1) at 2025-07-25 16:53:16 +0000