aboutsummaryrefslogtreecommitdiffstats
path: root/app/controllers
Commit message (Collapse)AuthorAgeLines
* Merge remote-tracking branch ↵Louise Crow2013-08-20-8/+5
|\ | | | | | | 'openaustralia_github/fix-production-diagnostic-messages' into rails-3-develop
| * Make method name clearerHenare Degan2013-08-10-3/+3
| |
| * 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 branch 'feature/further-request-event-fixes' into rails-3-developLouise Crow2013-08-15-4/+6
|\ \
| * | Set the calculated state on external requests.Louise Crow2013-08-15-0/+2
| | | | | | | | | | | | Set to 'waiting_response' on creation, to match the displayed state.
| * | 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.
* | Try to convert csv files of public bodies into utf-8 before importing them.Louise Crow2013-08-14-1/+1
| |
* | Fix for #566. Also fix wrong identifier being used in text.Louise Crow2013-08-13-1/+1
|/
* Remove unused line of codeLouise Crow2013-07-30-1/+0
|
* Handle the case of a name that hits the character limits and has been ↵Louise Crow2013-07-29-2/+2
| | | | suffixed with a number.
* Merge branch 'feature/similar-fixes' into rails-3-developLouise Crow2013-07-23-6/+0
|\
| * Change concatenated header and title strings to full, properly escaped ↵Louise Crow2013-07-22-6/+0
| | | | | | | | strings that are available for translation. Fixes #1003.
* | Merge remote-tracking branch ↵Louise Crow2013-07-23-0/+10
|\ \ | |/ |/| | | | | | | | | 'openaustralia_github/tests_set_described_state' into rails-3-develop Conflicts: spec/models/info_request_spec.rb
| * Now record a state_update event *whenever* a user classifies a requestMatthew Landauer2013-04-20-0/+10
| |
* | Respond to a (currently unsupported) json request for a public body list ↵Louise Crow2013-06-20-1/+3
| | | | | | | | with a 406, not a 500 caused by a missing template.
* | Add pagination to the list of requests on the admin page for a public bodyLouise Crow2013-06-20-0/+3
| |
* | Merge remote-tracking branch 'openaustralia_github/app_version_api_feature' ↵Louise Crow2013-06-18-1/+14
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | into rails-3-develop Conflicts: app/controllers/application_controller.rb app/controllers/general_controller.rb config/routes.rb
| * | Add publicly accesible json api to query alaveteli and ruby version. ↵Matthew Landauer2013-02-24-1/+9
| | | | | | | | | | | | Implements #834
| * | Extract methodMatthew Landauer2013-02-24-1/+6
| | |
* | | 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/+1
|\| | |
| * | | Cache a user's profile photo rather than repulling it each time.hotfix/0.11.0.8Louise Crow2013-06-11-0/+1
| | | |
| * | | Only render the popup banner in the layout where it's actually used.Louise Crow2013-06-11-4/+0
| | | |
| * | | We're assuming feed urls without format suffixes should serve up atom/xml, ↵0.11.0.4hotfix/0.11.0.4Louise Crow2013-06-05-0/+3
| | | | | | | | | | | | | | | | so ignore any format from content negotiation in favour of that default.
* | | | Allow the donation url to be configured. Closes #909.Louise Crow2013-06-07-2/+12
| | | |
* | | | We're assuming feed urls without format suffixes should serve up atom/xml, ↵Louise Crow2013-06-05-0/+3
| | | | | | | | | | | | | | | | so ignore any format from content negotiation in favour of that default.
* | | | Remove support for theme stylesheet inclusion via template deprecated in ↵Louise Crow2013-06-05-6/+0
| | | | | | | | | | | | | | | | version 0.5. Closes #972.
* | | | Merge branch 'release/0.11' into rails-3-developLouise Crow2013-06-04-13/+23
|\| | |
| * | | Handle json requests for hidden info requests.Louise Crow2013-06-03-12/+19
| | | |
| * | | 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-19/+31
|\ \ \ \ | | | | | | | | | | | | | | | 'openaustralia_github/more_info_on_report_request' into rails-3-develop
| * | | | User needs to choose a reasonMatthew Landauer2013-03-22-4/+12
| | | | |
| * | | | Rename parameter used in routes and controllerMatthew Landauer2013-03-22-2/+2
| | | | |
| * | | | Rename controller actionsMatthew Landauer2013-03-22-2/+2
| | | | |
| * | | | Move reporting actions to their own controllerMatthew Landauer2013-03-22-22/+23
| | | | |
| * | | | 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-14/+19
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | 'openaustralia_github/inline_search_method_refactor' into rails-3-develop
| * | | | | Tiny refactorMatthew Landauer2013-03-25-5/+2
| | | | | |
| * | | | | ActsAsXapian doesn't need to be referenced from the global namespaceMatthew Landauer2013-03-25-3/+3
| | | | | |
| * | | | | Tiny refactorMatthew Landauer2013-03-25-4/+2
| | | | | |
| * | | | | Inline method InfoRequest.full_searchMatthew Landauer2013-03-25-2/+12
| |/ / / /
* | | | | Merge remote-tracking branch ↵Louise Crow2013-05-30-6/+0
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | 'openaustralia_github/remove_random_request_action' into rails-3-develop
| * | | | Remove apparently unused action for showing random requestMatthew Landauer2013-03-22-6/+0
| |/ / /
* | | | Make sure Atom feeds are served with content type application/atom+xmlMark Longair2013-05-29-1/+1
| | | | | | | | | | | | | | | | Fixes #961
* | | | Replace 'render_for_text data' with 'render :text => data'Mark Longair2013-05-28-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | render_for_text no longer exists in Rails 3. Fixes #955