aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeLines
* Remove apparently unneeded I18n customizationMark Longair2013-08-28-105/+0
| | | | | | The tests still pass with this code removed, so remove it - if it's still needed, it should be readded with tests that would fail without.
* Ignore db/development_structure.sqlLouise Crow2013-08-22-0/+1
| | | | We're not checking it in any more.
* Merge branch 'feature/restore-unobtrusive-js' into rails-3-developLouise Crow2013-08-22-9268/+400
|\
| * Merge branch 'feature/restore-unobtrusive-js' of ↵Louise Crow2013-08-22-0/+0
| |\ | | | | | | | | | ssh://git.mysociety.org/data/git/public/alaveteli into feature/restore-unobtrusive-js
| | * Include unobtrusive js in the admin layout, where we use the :confirm option ↵Louise Crow2013-08-12-1/+1
| | | | | | | | | | | | of the submit_tag helper. Fixes #1042.
| | * Add unobtrusive javascript gem to provide the js side of Rails built-in ↵Louise Crow2013-08-12-0/+398
| | | | | | | | | | | | helpers using the jquery framework rather than prototype.
| | * Remove prototype javascript files. We don't seem to be using them, we seem ↵Louise Crow2013-08-12-9265/+0
| | | | | | | | | | | | to be using jquery.
| * | Add confirmation to outgoing messsage destroy.Louise Crow2013-08-22-2/+1
| | | | | | | | | | | | Closes #1053.
| * | Include unobtrusive js in the admin layoutLouise Crow2013-08-22-1/+1
| | | | | | | | | | | | We use the :confirm option of the submit_tag helper. Fixes #1042.
| * | Add unobtrusive javascript gem.Louise Crow2013-08-22-0/+398
| | | | | | | | | | | | | | | This is to provide the js side of Rails built-in helpers using the jquery framework rather than prototype.
| * | Remove prototype javascript files.Louise Crow2013-08-22-9265/+0
| |/ | | | | | | We don't seem to be using them, we seem to be using jquery.
* | Merge branch 'release/0.13' into rails-3-developLouise Crow2013-08-20-11/+34
|\ \
| * | Mark all events for the fixed requests as needing a reindex.release/0.13Louise Crow2013-08-20-9/+16
| | |
| * | Handle case of nil user_idLouise Crow2013-08-20-1/+1
| | | | | | | | | | | | When status was updated by a script.
| * | Release notes for 0.13Louise Crow2013-08-15-0/+16
| | |
| * | Bump application version.Louise Crow2013-08-15-1/+1
| | |
| * | Merge branch 'rails-3-develop' into release/0.13Louise Crow2013-08-15-36/+151
| |\ \
| * \ \ Merge branch 'rails-3-develop' into release/0.13Louise Crow2013-08-12-2153/+36
| |\ \ \
* | \ \ \ 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
* | | | | | Add libxml2-dev and libxslt-devLouise Crow2013-08-19-0/+2
| |_|_|/ / |/| | | | | | | | | | | | | | They are depended on by nokogiri, depended on in turn by webrat.
* | | | | Merge branch 'feature/further-request-event-fixes' into rails-3-developLouise Crow2013-08-15-14/+126
|\ \ \ \ \
| * | | | | 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.
| * | | | | Add task for cleaning up bad request histories.Louise Crow2013-08-15-0/+30
| | | | | |
| * | | | | Set the calculated state on external requests.Louise Crow2013-08-15-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | 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/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-7/+45
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | The mysociety debian repo only has 64-bit packagesGanesh Sittampalam2013-08-14-1/+1
| | | | |
* | | | | Run migrations before trying to install themeIan Chard2013-08-14-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: script/rails-post-deploy
* | | | | Try to convert csv files of public bodies into utf-8 before importing them.Louise Crow2013-08-14-1/+2
| | | | |
* | | | | add wheezy package names as alternates for rdoc and irbIan Chard2013-08-14-2/+2
| | | | |
* | | | | Update tests for changes to fixture file.Louise Crow2013-08-14-14/+18
| | | | |
* | | | | Fix for #566. Also fix wrong identifier being used in text.Louise Crow2013-08-13-1/+1
| |_|/ / |/| | |
* | | | Clean up paths to be a bit less OS dependent.Louise Crow2013-08-12-6/+4
| |_|/ |/| |
* | | Merge remote-tracking branch ↵Louise Crow2013-08-12-51/+1
|\ \ \ | |_|/ |/| | | | | 'openaustralia_github/upgrade-rvmrc-to-ruby-version' into rails-3-develop
| * | Switch from .rvmrc to .ruby-versionHenare Degan2013-08-10-51/+1
|/ / | | | | | | ruby-version is cross compatible with other Ruby version managers
* | Removing db/development_structure.sql from version control. Because ↵Louise Crow2013-08-08-2095/+0
| | | | | | | | different versions of postgres are producing minor variations every time this is generated, it's proving more of a hindrance than a help to development. Happy to reinstate it if anyone has suggestions about how to keep it stable across minor postgres version differences.
* | Merge branch 'feature/check-submodules' into rails-3-developLouise Crow2013-08-08-0/+30
|\ \
| * | Only check commonlib, don't try to split the response into segments (as @mhl ↵Louise Crow2013-08-08-7/+8
| | | | | | | | | | | | points out, the case where the initial character is a space is somewhat confusing), just grab the first character of the whole string and check it against expected values.
| * | Call it an error, not a warning.Louise Crow2013-07-30-4/+4
| | |
| * | Get first character in a way that will work in Ruby 1.8 and 1.9Louise Crow2013-07-30-1/+1
| | |
| * | Add a rake task to print a warning if the state of a submodule is not what ↵Louise Crow2013-07-30-0/+29
| | | | | | | | | | | | we expect it to be.
* | | Update for Rails 3 - script/server is deprecated.Louise Crow2013-08-07-1/+1
| |/ |/|
* | Translations with new strings.Louise Crow2013-08-05-81/+384
| |
* | Latest translations from transifexLouise Crow2013-08-05-390/+7217
| |
* | Use raw on select_tag option string so it doesn't get escaped. Fixes #1027.Louise Crow2013-07-31-2/+2
| |
* | Merge remote-tracking branch 'scjody_github/patch-1' into rails-3-developLouise Crow2013-07-31-1/+1
|\ \
| * | Fix name of locale/ directory in INSTALL.mdJody McIntyre2013-07-31-1/+1
| | |
| * | Mark ban text as html safeLouise Crow2013-04-25-1/+1
| | |
generated by cgit v1.2.3 (git 2.25.1) at 2025-07-23 04:18:30 +0000