aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeLines
* Merge branch 'feature/idiomatic-syntax' into rails-3-developLouise Crow2014-05-15-2/+2
|\
| * More rubyish syntaxLouise Crow2014-05-09-2/+2
| |
* | Merge branch 'translation-fix' into rails-3-developLouise Crow2014-05-13-16/+16
|\ \
| * | Restore translations of other locale message.Louise Crow2014-05-13-1796/+5005
| | | | | | | | | | | | The only difference here was in the link content, so don't want to make people translate it again.
* | | Updated translations with new strings using rake gettext:findLouise Crow2014-05-13-1796/+5005
|/ /
* | Latest translations from transifex.Louise Crow2014-05-13-237/+241
| |
* | Remove translation of error messagesLouise Crow2014-05-12-2/+2
| | | | | | | | These messages will only appear in the admin interface so currently shouldn't be translated - https://github.com/mysociety/alaveteli/issues/1353
* | Revert indentation of translations from 28a7d304b5f60ce5f32546d82740669db7d3a54dLouise Crow2014-05-12-4/+4
| | | | | | | | | | To preserve the existing whitespace and prevent the need for retranslation
* | Merge branch 'hotfix/0.17.0.2' into rails-3-developGareth Rees2014-05-07-30/+30
|\ \
| * | Update rails to 3.2.18Gareth Rees2014-05-07-31/+31
| | |
* | | Merge branch 'issues/772-pdf-image-conversion' into rails-3-developGareth Rees2014-05-06-0/+48
|\ \ \
| * | | Work around bug#77932 in pdftohtmlGareth Rees2014-05-06-0/+48
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | Sometimes pdftohtml will generate thousands of images when converting an image embedded in a PDF. This causes a request spike when a user tries to view the converted PDF as HTML. See https://bugs.freedesktop.org/show_bug.cgi?id=77932 for the bug report.
* | | Merge branch 'update_gemfile' into rails-3-developGareth Rees2014-05-06-11/+15
|\ \ \
| * | | Don't install debug gems for CIGareth Rees2014-05-06-1/+1
| | | |
| * | | Rename develop Gemfile group to debugGareth Rees2014-05-06-2/+2
| | | | | | | | | | | | | | | | Develop is too similar to development to mean anything different.
| * | | Move gems to appropriate Gemfile GroupsGareth Rees2014-05-06-3/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't install things we don't need in the given environment. Mainly an attempt to speed up CI builds somewhat: http://docs.travis-ci.com/user/languages/ruby/#Speed-up-your-build-by-excluding-non-essential-dependencies
| * | | Reposition test, development groupGareth Rees2014-05-06-5/+6
| | | | | | | | | | | | | | | | | | | | Develop seems to be a debugging group so should take lowest visual precedence.
* | | | Merge branch 'vagrantfile-docs' into rails-3-developGareth Rees2014-05-06-3/+3
|\ \ \ \ | |/ / / |/| | |
| * | | Fix Vagrantfile customisation docsGareth Rees2014-04-23-2/+2
| | | | | | | | | | | | | | | | Used the local constant rather than the env var required
| * | | Use full rails server command in Vagrantfile docsGareth Rees2014-04-23-1/+1
| | | |
* | | | Merge branch 'issues/762-travis-before-install' into rails-3-developGareth Rees2014-05-06-4/+4347
|\ \ \ \ | |_|_|/ |/| | |
| * | | Don't let travis bundle twiceGareth Rees2014-05-02-0/+1
| | | | | | | | | | | | | | | | | | | | bundle install is run via script/wad in the step that runs script/rails-post-deploy
| * | | Use WAD to cache bundles to Amazon S3Gareth Rees2014-05-02-4/+4346
| |/ / | | | | | | | | | https://github.com/Fingertips/WAD
* | | Remove test directory added by mistake.Louise Crow2014-05-02-23275/+0
| | |
* | | Remove dependency on timezone in configLouise Crow2014-05-02-10/+12
| | |
* | | Specify ruby-1.8.7-p374 as possible workaround for Travis error.Louise Crow2014-05-02-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Currently it's defaulting to ree-1.8.7-2012.02and failing to find rake with 'Could not find rake-0.9.2.2 in any of the sources' even though the gem has been installed. https://s3.amazonaws.com/archive.travis-ci.org/jobs/24249705/log.txt
* | | Set the location hash when loading authority previewsLouise Crow2014-05-02-0/+1
| | | | | | | | | | | | | | | Moves the target to the new content - more useful in new responsive layout on smaller devices.
* | | Remove redundant floatLouise Crow2014-05-02-1/+0
| | |
* | | Position the logged in links absolutely to handle long namesLouise Crow2014-05-02-1/+2
| | |
* | | Merge branch 'rails-3-develop' of ↵Louise Crow2014-05-01-0/+135
|\ \ \ | | | | | | | | | | | | ssh://git.mysociety.org/data/git/public/alaveteli into rails-3-develop
| * \ \ Merge branch 'issues/1390-james-cheshire-infographic' into rails-3-developGareth Rees2014-05-01-0/+135
| |\ \ \
| | * | | Remove Total Requests from quarterly statsGareth Rees2014-05-01-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | Was confusing what the number meant; easier to just sum numbers in the quartery columns to get totals.
| | * | | Add rake tasks for James Cheshire statsGareth Rees2014-05-01-0/+55
| | | | |
| | * | | Extract quarters_between to DateQuarter libGareth Rees2014-05-01-0/+52
| | | | |
| | * | | Add PublicBody.searchGareth Rees2014-05-01-0/+28
| | |/ / | | | | | | | | | | | | | | | | Search for public bodies whose searchable attributes are like a given query.
* | / / Use correct path for responsive stylesheetsLouise Crow2014-05-01-2/+2
|/ / /
* | | Only use grid-row on upper describe_state formLouise Crow2014-04-29-1/+7
| | | | | | | | | | | | | | | | | | Set the upper describe_state form width to match the correspondence and the lower describe_state form. The lower one is already contained in a column.
* | | Remove the titlecasing of small labelsLouise Crow2014-04-29-0/+4
| | | | | | | | | | | | Introduced by Foundation's form module
* | | Standardise on 'normal' and 'bold' for font-weightLouise Crow2014-04-29-4/+4
| | |
* | | Add top margin to signin reasonLouise Crow2014-04-28-0/+3
| | |
* | | Remove redundant css.Louise Crow2014-04-28-3/+0
| | |
* | | Add distinct colour for error messagesLouise Crow2014-04-28-2/+9
| | |
* | | Don't let photo hit top margin of commentLouise Crow2014-04-28-0/+1
| | |
* | | Remove checkbox label paddingLouise Crow2014-04-28-12/+0
| | | | | | | | | | | | In stripped down styling, not needed.
* | | Merge remote-tracking branch 'openaustralia_github/upgrade-newrelic' into ↵Louise Crow2014-04-28-1/+1
|\ \ \ | | | | | | | | | | | | rails-3-develop
| * | | bundle update newrelic_rpmHenare Degan2014-04-25-1/+1
| |/ / | | | | | | | | | Mainly for a low impact security issue: https://docs.newrelic.com/docs/traces/security-for-postgresql-explain-plans
* | | Merge branch 'rails-3-develop' of ↵Louise Crow2014-04-28-15/+20
|\ \ \ | | | | | | | | | | | | ssh://git.mysociety.org/data/git/public/alaveteli into rails-3-develop
| * \ \ Merge branch 'issues/1338-noisy-compact-xapan-database' into rails-3-developGareth Rees2014-04-25-15/+20
| |\ \ \
| | * | | Fix formatting of compact-xapian-databaseGareth Rees2014-04-14-14/+17
| | | | |
| | * | | Suppress non-error output compact-xapian-databaseGareth Rees2014-04-14-3/+5
| | | | | | | | | | | | | | | | | | | | Cron sends an email for all output, whereas generally we only want to get an email if the command exited in error.