aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeLines
* Merge branch 'all-authorities-reduce-memory' into rails-3-developMark Longair2013-11-19-7/+43
|\
| * Reduce the memory used to serve /body/all-authorities.csvMark Longair2013-11-14-7/+43
* | Merge branch 'fixes-for-upstream-globalize' into rails-3-developMark Longair2013-11-19-32/+40
|\ \
| * | Fix construction of example public bodies for upstream globalizeMark Longair2013-11-19-14/+16
| * | Refactor some tests to use with_default_localeMark Longair2013-11-19-17/+15
| * | Add a helper method for temporarily setting I18n.default_localeMark Longair2013-11-19-0/+8
* | | Update commonlib to include Alaveteli support in install-site.shMark Longair2013-11-19-0/+0
* | | Use our own copy of globalize3 for now.Louise Crow2013-11-19-4/+4
|/ /
* | Update globalize3 repo.Louise Crow2013-11-18-5/+5
* | Insert cookie stripping at correct point in middleware stack.Louise Crow2013-11-18-1/+13
* | Session keys are stored as strings in Rails 3.Louise Crow2013-11-18-30/+30
* | Merge branch 'master' into rails-3-developMark Longair2013-11-15-289/+317
|\ \
| * | Bump ALAVETELI_VERSION to 0.150.15Mark Longair2013-11-15-1/+1
| * | Release notes for 0.15Mark Longair2013-11-15-0/+28
| * | Fixes for the Welsh translationMark Longair2013-11-15-46/+46
| * | Include the latest translations from TransifexMark Longair2013-11-15-287/+287
| |/
* | Merge branch 'rails-3-develop' of ssh://git.mysociety.org/data/git/public/ala...Louise Crow2013-11-12-2713/+6930
|\|
| * Update translations after re-pulling from Transfix + cleaningrelease/0.15Mark Longair2013-11-08-246/+113
| * Fix a syntax error in locale/sr@latin/app.poMark Longair2013-11-08-4/+1
| * Fix a syntax error in locale/bg/app.poMark Longair2013-11-08-3/+1
| * Updated .po files and the .pot file with 'rake gettext:find'Mark Longair2013-11-08-384/+625
| * Update translatable columnsMark Longair2013-11-08-2/+1
| * cy (Welsh) locale: fix various problemsMark Longair2013-11-08-81/+81
| * cy (Welsh) locale: fix a link element's nameMark Longair2013-11-08-1/+1
| * cy (Welsh) locale: fix capitalization of USER_NAMEMark Longair2013-11-08-3/+3
| * Update with the latest translations from TransifexMark Longair2013-11-08-2213/+5663
| * Merge branch 'feature/1118-fix-ask-us-to-add-links' into rails-3-developMark Longair2013-11-07-13/+28
| |\
| | * Show 'browse all' and 'ask us to add' one for authority only search.Louise Crow2013-11-07-0/+7
| | * Don't show sorting links when there are no results.Louise Crow2013-11-07-1/+1
| | * Don't show link for browsing bodiesLouise Crow2013-11-07-2/+0
| | * Show highlights and correction regardless of search type.Louise Crow2013-11-07-8/+20
| | * Add 'browse all' and 'ask us to add' to authority search.Louise Crow2013-11-07-3/+1
| * | Switch .tx/config to refer to transifex.com instead of transifex.netMark Longair2013-11-07-1/+1
| * | Merge branch 'install-script' into rails-3-developMark Longair2013-11-07-87/+737
| |\ \
| | * | Set 'constraint_disabling: false' for tests in database.ymlMark Longair2013-11-07-0/+1
| | * | Add a Vagrantfile to use the install script in a Vagrant boxMark Longair2013-11-07-0/+23
| | * | Rename /etc/postfix/regexp to /etc/postfix/transportsMark Longair2013-11-07-8/+7
| | * | Reduce "backscatter" bounce risk by setting local_recipient_mapsMark Longair2013-11-07-1/+9
| | * | Invoke commands as the unprivileged user in a login shellMark Longair2013-11-07-3/+3
| | * | Use a more recent rubygems from squeeze-backportsMark Longair2013-11-07-1/+1
| | * | Update INSTALL.md with details of the AMI and install scriptMark Longair2013-11-07-20/+140
| | * | Remove make-crontab and update INSTALL.mdMark Longair2013-11-07-18/+14
| | * | Make X-Accel-Redirect work with the example nginx configMark Longair2013-11-07-0/+7
| | * | nginx: root should be the public directory so that try_files worksMark Longair2013-11-07-1/+1
| | * | Add a rake task to rewrite the crontab-example fileMark Longair2013-11-07-4/+23
| | * | Fix an undefined variable errorMark Longair2013-11-07-6/+2
| | * | Switch to using 'rake config_files:convert_init_script'Mark Longair2013-11-07-6/+3
| | * | If the origin/install-script branch exists, use that in preferenceMark Longair2013-11-07-7/+4
| | * | crontab-example: use !!(*= .vhost_dir *)!! to avoid '/data/vhost/'Mark Longair2013-10-31-13/+13
| | * | We don't use foi-purge-varnish ourselves, so remove itMark Longair2013-10-31-7/+1