aboutsummaryrefslogtreecommitdiffstats
path: root/app
Commit message (Expand)AuthorAgeLines
* Handle case of nil user_idLouise Crow2013-08-20-1/+1
* 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
| * Set the calculated state on external requests.Louise Crow2013-08-15-0/+2
| * Make admin edits affect info_request_event described_states.Louise Crow2013-08-15-7/+8
| * Allow 'edit' and 'status_update' calculated states to propagate.Louise Crow2013-08-15-4/+16
* | 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 f89e2c3d5cee5e3bf2...Louise Crow2013-07-31-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 suffixe...Louise Crow2013-07-29-2/+2
* 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, no...Louise Crow2013-07-23-1/+1
| * gettext_i18n_rails patches I18n.locale= so that it changes underscores in loc...Louise Crow2013-07-18-1/+1
* | Prevent erroneous internal error messages with multibyte characters under rub...Louise Crow2013-07-25-2/+2
* | Merge branch 'feature/similar-fixes' into rails-3-developLouise Crow2013-07-23-9/+14
|\ \
| * | Change concatenated header and title strings to full, properly escaped string...Louise Crow2013-07-22-8/+13
| * | Supply correct parameter for similar requests page. Fixes #1002.Louise Crow2013-07-22-1/+1
| |/
* | Merge remote-tracking branch 'openaustralia_github/tests_set_described_state'...Louise Crow2013-07-23-11/+11
|\ \
| * | 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
| * | 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
| * | 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
|\ \
| * | Use two forms, one for changing the search term, and one for applying filters...hotfix/0.11.0.16Louise Crow2013-06-25-4/+11
| * | 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 tra...Louise Crow2013-06-24-2/+5
* | | Use request.params to generate a json format url when @has_json is true, not ...Louise Crow2013-06-20-1/+1
* | | Respond to a (currently unsupported) json request for a public body list with...Louise Crow2013-06-20-1/+3
* | | 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 b...0.11.0.14hotfix/0.11.0.14Louise Crow2013-06-19-1/+1
* | | Merge remote-tracking branch 'openaustralia_github/app_version_api_feature' i...Louise Crow2013-06-18-1/+14
|\ \ \
| * | | Add publicly accesible json api to query alaveteli and ruby version. Implemen...Matthew Landauer2013-02-24-1/+9
| * | | Extract methodMatthew Landauer2013-02-24-1/+6
* | | | Merge branch 'hotfix/0.11.0.13' into rails-3-developLouise Crow2013-06-17-1/+4
|\ \ \ \ | | |/ / | |/| |
| * | | Explicitly set I18n.locale in set_gettext_locale in order to get Rails to exp...0.11.0.13hotfix/0.11.0.13Louise Crow2013-06-17-1/+4
* | | | 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
| * | | Only render the popup banner in the layout where it's actually used.Louise Crow2013-06-11-7/+3