aboutsummaryrefslogtreecommitdiffstats
path: root/app
Commit message (Collapse)AuthorAgeLines
* Restrict old_unclassified methods to normal prominence.0.13.0.3hotfix/0.13.0.3Louise Crow2013-09-18-3/+12
| | | | Fixes #1082.
* Handle case of nil user_idLouise Crow2013-08-20-1/+1
| | | | When status was updated by a script.
* Merge branch 'feature/further-request-event-fixes' into rails-3-developLouise Crow2013-08-15-11/+43
|\
| * Comments on described_state and calculated_stateLouise Crow2013-08-15-3/+20
| | | | | | | | | | | | Add some notes on the logic and expectations around InfoRequest.described_state and calculate_status and InfoRequestEvent.described_state and calculated_state.
| * 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-7/+8
| | | | | | | | | | | | | | 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.
| * Allow 'edit' and 'status_update' calculated states to propagate.Louise Crow2013-08-15-4/+16
| | | | | | | | | | | | | | | | Update test expectations and add further test to explicitly show that we want the described status from a status update to be propagated to a preceding response, as well as being filled in in the status update itself (which is mostly to deal with the case where there isn't a preceding response). Make those changes to calculate_event_states
* | 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
|/
* Use raw on select_tag option string so it doesn't get escaped. Fixes #1027.Louise Crow2013-07-31-2/+2
|
* Preserve string "Tags (separated by a space):", removed in ↵Louise Crow2013-07-31-1/+1
| | | | f89e2c3d5cee5e3bf2bd2227254fa0edb09aeb53, as there are lots of translations for this already, and we'll probably be re-introducing it with more features around tagging.
* 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/localisation-fixes' into rails-3-developLouise Crow2013-07-29-2/+2
|\
| * Use FastGettext.locale, not I18n.locale as the latter will return hyphens, ↵Louise Crow2013-07-23-1/+1
| | | | | | | | not underscores as we use in our URLs.
| * gettext_i18n_rails patches I18n.locale= so that it changes underscores in ↵Louise Crow2013-07-18-1/+1
| | | | | | | | locale names (as used in the gettext world) to the dashes that I18n prefers. So for locales that include an underscore the equality test was returning false. Use FastGettext.locale instead to be consistent. Fixes #998.
* | Prevent erroneous internal error messages with multibyte characters under ↵Louise Crow2013-07-25-2/+2
| | | | | | | | ruby 1.8 by using mb_chars for length comparison - it counts multibyte characters.
* | Merge branch 'feature/similar-fixes' into rails-3-developLouise Crow2013-07-23-9/+14
|\ \
| * | Change concatenated header and title strings to full, properly escaped ↵Louise Crow2013-07-22-8/+13
| | | | | | | | | | | | strings that are available for translation. Fixes #1003.
| * | Supply correct parameter for similar requests page. Fixes #1002.Louise Crow2013-07-22-1/+1
| |/
* | Merge remote-tracking branch ↵Louise Crow2013-07-23-11/+11
|\ \ | | | | | | | | | | | | | | | | | | '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-10/+10
| | |
| * | How we would handle event states if we added a state_update event whenever a ↵Matthew Landauer2013-04-20-1/+1
| | | | | | | | | | | | user classifies a request
| * | Simple solution to bugs shown up in tests in last 2 commitsMatthew Landauer2013-04-18-1/+1
| | |
* | | Merge remote-tracking branch 'origin/721-defunct-tag' into rails-3-developLouise Crow2013-07-23-21/+32
|\ \ \ | |_|/ |/| |
| * | Say Defunct instead of Make your own request in listings.Matthew Somerville2013-07-17-2/+8
| | | | | | | | | | | | Also don't show 'Make your own request' unless it's requestable.
| * | Always show defunct message, whether body has notes or not (for #721).Matthew Somerville2013-07-17-19/+24
| | |
* | | Syntax fix - we don't want to output the final value of the iterator.Louise Crow2013-07-18-1/+1
|/ /
* | Merge branch 'hotfix/0.11.0.16' into rails-3-developLouise Crow2013-06-25-19/+11
|\ \ | | | | | | | | | | | | | | | | | | | | | Conflicts: locale/he_IL/app.po locale/hr_HR/app.po locale/nb_NO/app.po locale/uk/app.po
| * | Use two forms, one for changing the search term, and one for applying ↵hotfix/0.11.0.16Louise Crow2013-06-25-4/+11
| | | | | | | | | | | | filters to the current search term. Fixes #511.
| * | Remove unused method.Louise Crow2013-06-25-3/+0
| | |
| * | Remove unused code. Let's re-add it when we need it.Louise Crow2013-06-25-12/+0
| | |
* | | Split the string interpolation and translation into two steps so that the ↵Louise Crow2013-06-24-2/+5
| | | | | | | | | | | | translation gets picked up by rake gettext:find. Add a bit more explanation.
* | | Use request.params to generate a json format url when @has_json is true, not ↵Louise Crow2013-06-20-1/+1
| | | | | | | | | | | | request.query_parameters. The latter has unexpected results when a querystring parameter of 'action' or 'controller' is supplied. Fixes #981.
* | | 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-1/+5
| | |
* | | Merge branch 'hotfix/0.11.0.14' into rails-3-developLouise Crow2013-06-19-1/+1
|\| |
| * | Allow the HTML display of the body of an email to handle the case where the ↵0.11.0.14hotfix/0.11.0.14Louise Crow2013-06-19-1/+1
| | | | | | | | | | | | body is only quoted text and there is no subject.
* | | 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 branch 'hotfix/0.11.0.11' into rails-3-developLouise Crow2013-06-12-1/+1
|\| | |
| * | | Allow an item to have an author, not a creatorhotfix/0.11.0.11Louise Crow2013-06-12-1/+1
| | | |
* | | | Merge branch 'hotfix/0.11.0.9' into rails-3-developLouise Crow2013-06-11-6/+4
|\| | |
| * | | Only do time calculation once.hotfix/0.11.0.9Louise Crow2013-06-11-1/+2
| | | |
| * | | Get user records in batches, remove unneeded clause.Louise Crow2013-06-11-5/+2
| | | |
* | | | Merge commit '0.11.0.8' into rails-3-developLouise Crow2013-06-11-7/+4
|\| | |
| * | | Cache a user's profile photo rather than repulling it each time.hotfix/0.11.0.8Louise Crow2013-06-11-0/+1
| | | |