aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeLines
* Only allow reporting a request when logged inMatthew Landauer2013-03-22-0/+29
|
* Add first pass at page for reporting a requestMatthew Landauer2013-03-22-0/+28
|
* Merge remote-tracking branch 'openaustralia_github/rails-3-develop' into ↵Louise Crow2013-03-21-11/+0
|\ | | | | | | rails-3-develop
| * We've already removed the proxied admin interface (and ADMIN_PUBLIC_URL ↵Matthew Landauer2013-03-20-11/+0
| | | | | | | | configuration setting)
* | Update Configuration references to new name.Louise Crow2013-03-19-2/+2
| |
* | Merge branch 'develop' into rails-3-developLouise Crow2013-03-19-103/+141
|\ \ | |/ |/| | | | | | | | | | | Conflicts: Gemfile Gemfile.lock app/views/admin_request/show.html.erb config/environment.rb
| * Follow alphabetical ordering.Louise Crow2013-03-19-1/+1
| |
| * Merge branch 'release/0.8' into developLouise Crow2013-03-19-103/+140
| |\ | | | | | | | | | | | | | | | Conflicts: locale/he_IL/app.po locale/id/app.po
| | * Supply info request id in an HTML 5 data attributerelease/0.8Louise Crow2013-03-19-6/+8
| | |
| | * Bump version number to 0.8Louise Crow2013-03-19-1/+1
| | |
| | * Allow the emergency user account to be disabled.Louise Crow2013-03-19-4/+22
| | |
| | * Latest translations from Transifex.Louise Crow2013-03-19-93/+92
| | |
| | * Merge branch 'hotfix/0.7.0.5' into release/0.8Louise Crow2013-03-18-19/+20
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: Gemfile.lock locale/cy/app.po locale/fr/app.po locale/he_IL/app.po locale/id/app.po locale/pt_BR/app.po locale/ro_RO/app.po locale/sr@latin/app.po locale/uk/app.po
| | * \ Merge branch 'develop' into release/0.8Louise Crow2013-03-14-8/+14
| | |\ \
| | * | | Fix bad merge of d88b79d1aa24a78ed95255a37a0403d7e3c0117eLouise Crow2013-03-14-3/+3
| | | | |
| | * | | Add some release notes.Louise Crow2013-03-14-0/+17
| | | | |
| * | | | Merge branch 'hotfix/0.7.0.5' into developLouise Crow2013-03-18-19/+19
| |\ \ \ \ | | |_|/ / | |/| | / | | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: Gemfile.lock locale/cy/app.po locale/fr/app.po locale/he_IL/app.po locale/id/app.po locale/pt_BR/app.po locale/ro_RO/app.po locale/sr@latin/app.po locale/uk/app.po
| | * | Upgrade to Rails 2.3.18 to get fixes for CVE-2013-1855, CVE-2013-1856, ↵hotfix/0.7.0.5Louise Crow2013-03-18-20/+20
| | | | | | | | | | | | | | | | CVE-2013-1857.
| | * | Merge branch 'hotfix/0.7.0.4'Louise Crow2013-03-14-1951/+1977
| | |\ \
| | | * | Latest translations from transifex.hotfix/0.7.0.4Louise Crow2013-03-14-1951/+1977
| | |/ /
* | | | Fix another order dependent test issueMatthew Landauer2013-03-19-0/+4
| | | |
* | | | Fix view for admin create authority. Block form of helper needs to return valueMatthew Landauer2013-03-19-3/+2
| | | |
* | | | Make search ahead pagination link to the right place. Fixes #860Matthew Landauer2013-03-19-1/+1
| | | |
* | | | Another order dependent test issue fixedMatthew Landauer2013-03-19-0/+2
| | | |
* | | | Rails security updateMatthew Landauer2013-03-19-100/+33
| | | | | | | | | | | | | | | | | | | | The rails upgrade also forces a mail gem upgrade. To make things work again we need to remove part of the monkeypatched backporting of encoding fixes.
* | | | Stop AlaveteliConfiguration class being loaded twiceMatthew Landauer2013-03-19-4/+0
| | | |
* | | | Stop pollution of params[:outgoing_message]Matthew Landauer2013-03-19-4/+1
| | | |
* | | | Merge branch 'develop' into rails-3-developMatthew Landauer2013-03-19-2242/+5931
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: Gemfile Gemfile.lock doc/INSTALL.md
| * | | Move Gemfile to httpsLouise Crow2013-03-14-2/+2
| | | |
| * | | Update to specific commit in webrat for launchy fix without other breaking ↵Louise Crow2013-03-14-3/+4
| | | | | | | | | | | | | | | | changes.
| * | | And now latest version of launchy.Louise Crow2013-03-14-4/+3
| | | |
| * | | Pull more up-to-date version of webrat from git - trying to resolve travis ↵Louise Crow2013-03-14-8/+13
| | | | | | | | | | | | | | | | issues with launchy dependency.
| * | | Fix bad merge of d88b79d1aa24a78ed95255a37a0403d7e3c0117eLouise Crow2013-03-14-3/+3
| | | |
| * | | Downgrade launchy to avoid deprecation warning.Louise Crow2013-03-14-5/+6
| | |/ | |/|
| * | New strings for translation.Louise Crow2013-03-14-333/+3983
| | |
| * | Cleanup whitespace.Louise Crow2013-03-14-57/+57
| | |
| * | Latest translations from Transifex.Louise Crow2013-03-14-1951/+1977
| | |
| * | Try adding launchy as a gem - webrat seems to have a dependency on it.Louise Crow2013-03-13-0/+5
| | |
| * | Consistent syntax for X-Forwarded-ProtoLouise Crow2013-03-13-23/+23
| | |
* | | Now randomise the test order by default to help uncover order dependent issuesMatthew Landauer2013-03-19-1/+1
| | |
* | | Remove test of rails internals that is somehow interfering with other testsMatthew Landauer2013-03-19-4/+0
| | |
* | | Deal with further side effects of stuff done outside of a transaction in testsMatthew Landauer2013-03-19-0/+2
| | |
* | | bundle update debugger rmagickMatthew Landauer2013-03-18-31/+30
| | |
* | | Correct URLs in example fileHenare Degan2013-03-16-2/+2
| | |
* | | This is already the defaultHenare Degan2013-03-16-5/+0
| | |
* | | This no longer requires iconv in Ruby 1.9Henare Degan2013-03-16-7/+0
| | |
* | | We don't need test unit any more because we're not using RSpec 1.xHenare Degan2013-03-16-6/+0
| | | | | | | | | | | | Also fixes last issue related to tests expecting no output #820
* | | This won't work anymore so remove itHenare Degan2013-03-16-8/+0
| | |
* | | Replace use of Iconv in Ruby 1.9 to get rid of deprecation warningsHenare Degan2013-03-16-7/+23
| | |
* | | Fix syntax to reinstate link to annotationHenare Degan2013-03-16-1/+1
| | |