Commit message (Collapse) | Author | Age | Lines | |
---|---|---|---|---|
* | Merge branch 'hotfix/0.17.0.2' into rails-3-develop | Gareth Rees | 2014-05-07 | -30/+30 |
|\ | ||||
| * | Update rails to 3.2.18 | Gareth Rees | 2014-05-07 | -31/+31 |
| | | ||||
* | | Merge branch 'issues/772-pdf-image-conversion' into rails-3-develop | Gareth Rees | 2014-05-06 | -0/+48 |
|\ \ | ||||
| * | | Work around bug#77932 in pdftohtml | Gareth Rees | 2014-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-develop | Gareth Rees | 2014-05-06 | -11/+15 |
|\ \ | ||||
| * | | Don't install debug gems for CI | Gareth Rees | 2014-05-06 | -1/+1 |
| | | | ||||
| * | | Rename develop Gemfile group to debug | Gareth Rees | 2014-05-06 | -2/+2 |
| | | | | | | | | | | | | Develop is too similar to development to mean anything different. | |||
| * | | Move gems to appropriate Gemfile Groups | Gareth Rees | 2014-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 group | Gareth Rees | 2014-05-06 | -5/+6 |
| | | | | | | | | | | | | | | | Develop seems to be a debugging group so should take lowest visual precedence. | |||
* | | | Merge branch 'vagrantfile-docs' into rails-3-develop | Gareth Rees | 2014-05-06 | -3/+3 |
|\ \ \ | |/ / |/| | | ||||
| * | | Fix Vagrantfile customisation docs | Gareth Rees | 2014-04-23 | -2/+2 |
| | | | | | | | | | | | | Used the local constant rather than the env var required | |||
| * | | Use full rails server command in Vagrantfile docs | Gareth Rees | 2014-04-23 | -1/+1 |
| | | | ||||
* | | | Merge branch 'issues/762-travis-before-install' into rails-3-develop | Gareth Rees | 2014-05-06 | -4/+4347 |
|\ \ \ | ||||
| * | | | Don't let travis bundle twice | Gareth Rees | 2014-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 S3 | Gareth Rees | 2014-05-02 | -4/+4346 |
| |/ / | | | | | | | | | | https://github.com/Fingertips/WAD | |||
* | | | Remove test directory added by mistake. | Louise Crow | 2014-05-02 | -23275/+0 |
| | | | ||||
* | | | Remove dependency on timezone in config | Louise Crow | 2014-05-02 | -10/+12 |
| | | | ||||
* | | | Specify ruby-1.8.7-p374 as possible workaround for Travis error. | Louise Crow | 2014-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 previews | Louise Crow | 2014-05-02 | -0/+1 |
| | | | | | | | | | | | | | | | Moves the target to the new content - more useful in new responsive layout on smaller devices. | |||
* | | | Remove redundant float | Louise Crow | 2014-05-02 | -1/+0 |
| | | | ||||
* | | | Position the logged in links absolutely to handle long names | Louise Crow | 2014-05-02 | -1/+2 |
| | | | ||||
* | | | Merge branch 'rails-3-develop' of ↵ | Louise Crow | 2014-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-develop | Gareth Rees | 2014-05-01 | -0/+135 |
| |\ \ \ | ||||
| | * | | | Remove Total Requests from quarterly stats | Gareth Rees | 2014-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 stats | Gareth Rees | 2014-05-01 | -0/+55 |
| | | | | | ||||
| | * | | | Extract quarters_between to DateQuarter lib | Gareth Rees | 2014-05-01 | -0/+52 |
| | | | | | ||||
| | * | | | Add PublicBody.search | Gareth Rees | 2014-05-01 | -0/+28 |
| | |/ / | | | | | | | | | | | | | | | | | Search for public bodies whose searchable attributes are like a given query. | |||
* | / / | Use correct path for responsive stylesheets | Louise Crow | 2014-05-01 | -2/+2 |
|/ / / | ||||
* | | | Only use grid-row on upper describe_state form | Louise Crow | 2014-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 labels | Louise Crow | 2014-04-29 | -0/+4 |
| | | | | | | | | | | | | Introduced by Foundation's form module | |||
* | | | Standardise on 'normal' and 'bold' for font-weight | Louise Crow | 2014-04-29 | -4/+4 |
| | | | ||||
* | | | Add top margin to signin reason | Louise Crow | 2014-04-28 | -0/+3 |
| | | | ||||
* | | | Remove redundant css. | Louise Crow | 2014-04-28 | -3/+0 |
| | | | ||||
* | | | Add distinct colour for error messages | Louise Crow | 2014-04-28 | -2/+9 |
| | | | ||||
* | | | Don't let photo hit top margin of comment | Louise Crow | 2014-04-28 | -0/+1 |
| | | | ||||
* | | | Remove checkbox label padding | Louise Crow | 2014-04-28 | -12/+0 |
| | | | | | | | | | | | | In stripped down styling, not needed. | |||
* | | | Merge remote-tracking branch 'openaustralia_github/upgrade-newrelic' into ↵ | Louise Crow | 2014-04-28 | -1/+1 |
|\ \ \ | | | | | | | | | | | | | rails-3-develop | |||
| * | | | bundle update newrelic_rpm | Henare Degan | 2014-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 Crow | 2014-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-develop | Gareth Rees | 2014-04-25 | -15/+20 |
| |\ \ \ | ||||
| | * | | | Fix formatting of compact-xapian-database | Gareth Rees | 2014-04-14 | -14/+17 |
| | | | | | ||||
| | * | | | Suppress non-error output compact-xapian-database | Gareth Rees | 2014-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. | |||
| | * | | | Update commonlib | Gareth Rees | 2014-04-09 | -0/+0 |
| | | | | | ||||
* | | | | | Add top margin to requests when in list | Louise Crow | 2014-04-28 | -0/+1 |
|/ / / / | ||||
* | | | | Merge branch 'hotfix/0.17.0.1' into rails-3-develop | Louise Crow | 2014-04-25 | -0/+13 |
|\ \ \ \ | | |_|/ | |/| | | ||||
| * | | | Make sure mail/part is loaded.hotfix/0.17.0.1 | Louise Crow | 2014-04-25 | -0/+2 |
| | | | | ||||
| * | | | Fix for badly-formed content-disposition header. | Louise Crow | 2014-04-25 | -0/+11 |
| | | | | | | | | | | | | | | | | Taken from https://github.com/mikel/mail/pull/602 | |||
* | | | | Merge branch 'feature/1352-core-responsive-stylesheet' into rails-3-develop | Louise Crow | 2014-04-24 | -100/+25611 |
|\ \ \ \ | |_|_|/ |/| | | | ||||
| * | | | Import, rather than require, custom.css | Louise Crow | 2014-04-24 | -3/+2 |
| | | | | | | | | | | | | | | | | This means that it gets access to other functions e.g. in _utils.css | |||
| * | | | Allow more width for logo on smaller screens | Louise Crow | 2014-04-24 | -2/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: app/assets/stylesheets/responsive/_header_layout.scss |