aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeLines
...
* | | | | | Merge branch 'hotfix/0.18.0.9' into rails-3-developLouise Crow2014-07-29-1/+12
|\| | | | |
| * | | | | Don't use stylesheet_link_tags0.18.0.9hotfix/0.18.0.9Louise Crow2014-07-29-1/+12
| | | | | | | | | | | | | | | | | | | | | | | | There attachments will be cached, so we don't want timestamped references to stylesheets.
* | | | | | Merge branch 'hotfix/0.18.0.8' into rails-3-developLouise Crow2014-07-29-1/+3
|\| | | | |
| * | | | | Add min-height for iframe0.18.0.8hotfix/0.18.0.8Louise Crow2014-07-29-1/+3
| |/ / / /
* | | | | Merge branch 'issues/1418-update-described-state-via-api' into rails-3-developlizconlan2014-07-28-392/+587
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | whitespacelizconlan2014-07-28-467/+458
| | | | | | | | | | | | | | | | | | | | includes various code layout fixes
| * | | | Sending an invalid state value to add_correspondence now aborts the entire ↵lizconlan2014-07-28-32/+52
| | | | | | | | | | | | | | | | | | | | operation
| * | | | Refactor state update API, better error handlinglizconlan2014-07-28-61/+59
| | | | | | | | | | | | | | | | | | | | Filters; more 403s, fewer 500s; added logging; less duplication
| * | | | Extend add_correspondence API method to optionally accept a state paramlizconlan2014-07-28-86/+157
| | | | |
| * | | | New API method for updating request statelizconlan2014-07-28-277/+392
|/ / / /
* | | | Merge branch 'rails-3-develop' of ↵Louise Crow2014-07-16-1/+1
|\ \ \ \ | | |/ / | |/| | | | | | ssh://git.mysociety.org/data/git/public/alaveteli into rails-3-develop
| * | | Merge branch 'issues/1585-responsive-styling-by-default' into rails-3-developGareth Rees2014-07-15-1/+1
| |\ \ \
| | * | | Set fallback responsitve styling to trueGareth Rees2014-07-11-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | 156481f set the default example to true but this ensures the fallback is true.
* | | | | Merge branch 'remove-obsolete-fcgi-files' into rails-3-developLouise Crow2014-07-16-6/+0
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Remove obsolete files.Louise Crow2014-07-16-6/+0
|/ / / /
* | | | Merge branch 'rails-3-develop' of ↵Louise Crow2014-07-10-28/+25
|\| | | | | | | | | | | | | | | ssh://git.mysociety.org/data/git/public/alaveteli into rails-3-develop
| * | | Merge branch 'log-config' into rails-3-developGareth Rees2014-07-10-28/+25
| |\ \ \
| | * | | Add upgrade notes for new shared log configurationGareth Rees2014-07-10-0/+18
| | | | |
| | * | | Add log/ to switch-to-shared scriptGareth Rees2014-07-10-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | script/rails-deploy-before-down will complain if log is listed in the SHARED_DIRECTORIES configuration variable and already exists in APP_ROOT. It will recommend this script be used to migrate to a timestamped deployment structure, so adding log/ makes the transition of the log directory easier.
| | * | | Add log directory to shared directoriesGareth Rees2014-07-10-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now that the install script leaves the log directory alone (a5f79a5) we let the generic mechanism for SHARED_DIRECTORIES handle creating a persisted log directory and symlinking it together.
| | * | | Persist log directory across capistrano deploymentsGareth Rees2014-07-10-0/+2
| | | | |
| | * | | Update log pathsGareth Rees2014-07-10-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | Use the standard rails locations. Deployment systems should move the log directory.
| | * | | Remove mySociety log handling from install scriptsGareth Rees2014-07-10-25/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The deployment system should deal with putting logs in the desired place. As this script gets run on a variety of systems it can cause problems for non-mySociety reinstallers.
* | | | | Merge branch 'feature/update-world-foi-sites' into rails-3-developLouise Crow2014-07-10-3/+14
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Update list of world FOI websites.Louise Crow2014-07-08-3/+14
|/ / / /
* | | | Merge branch 'issues/1226-add-wheezy-details' into rails-3-developLouise Crow2014-07-08-0/+36
|\ \ \ \
| * | | | Add a package list for Debian wheezyMark Longair2014-06-26-0/+36
| | | | |
* | | | | Merge branch 'feature/responsive-styling-by-default' into rails-3-developLouise Crow2014-07-08-1/+1
|\ \ \ \ \
| * | | | | Now that alavetelitheme has a responsive stylesheet, make this the default.Louise Crow2014-06-10-1/+1
| | | | | |
* | | | | | Merge branch 'update-url-in-vagrantfile' into rails-3-developLouise Crow2014-07-08-1/+1
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Update install-site url to point at current locationLouise Crow2014-07-02-1/+1
| | | | | |
* | | | | | Merge branch 'rails-3-develop' of ↵Louise Crow2014-07-07-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | ssh://git.mysociety.org/data/git/public/alaveteli into rails-3-develop
| * \ \ \ \ \ Merge branch 'cron-holidays' into rails-3-developGareth Rees2014-07-04-1/+1
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | Change wording of public holidays in crontabGareth Rees2014-07-01-1/+1
| | | |_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | Bank holiday is quite a UK-centric term, so replace with public holiday for easier understanding among international reusers
* | / | | | Upgrade Rails versionLouise Crow2014-07-07-28/+28
|/ / / / /
* | | | | Merge branch 'hotfix/0.18.0.7' into rails-3-developLouise Crow2014-07-01-1258/+1334
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Add upgrade notes for anti-spam honeypot0.18.0.7hotfix/0.18.0.7Louise Crow2014-07-01-1/+8
| | | | |
| * | | | Latest translations from Transifex.0.18.0.6hotfix/0.18.0.6Louise Crow2014-06-30-273/+277
| | | | |
| * | | | Copy Brazilian Portugese to Portugal Portugese0.18.0.5hotfix/0.18.0.5Louise Crow2014-06-27-984/+1049
| | | | |
| * | | | Use new status icon names (with old icons)0.18.0.4hotfix/0.18.0.4Louise Crow2014-06-09-22/+106
| | | | | | | | | | | | | | | | | | | | | | | | | Defining the basic css for status icons here so that themes can just set colours and add their own icons.
| * | | | Merge remote-tracking branch 'origin/hotfix/0.18.0.3'0.18.0.3Louise Crow2014-06-06-0/+13
| |\ \ \ \
| * \ \ \ \ Merge branch 'hotfix/0.18.0.2'0.18.0.2Louise Crow2014-06-06-7/+26
| |\ \ \ \ \
* | \ \ \ \ \ Merge branch 'rails-3-develop' of ↵Louise Crow2014-06-30-4/+6
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | | | | | | | | ssh://git.mysociety.org/data/git/public/alaveteli into rails-3-develop
| * | | | | | Merge branch 'update-database-config-example' into rails-3-developGareth Rees2014-06-26-4/+6
| |\ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| | * | | | | Add template to example database configGareth Rees2014-06-26-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Recommended setup includes creating a template (d0a8e9b) so specify that in the database configuration example too.
| | * | | | | Rename example databases to match documentationGareth Rees2014-06-26-4/+3
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | Renamed with alaveteli_ prefix rather than foi_ in 3cd30c9 so keep the example consistent.
* | | | | | Don't display locale options when there's only one.Louise Crow2014-06-30-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Fixes bug introduced in 039fb5cc0f2965346ef23a4ba1b9d20f6cf73805
* | | | | | Ignore deploy.yml filesLouise Crow2014-06-30-0/+1
|/ / / / /
* | | | | Merge branch 'rails-3-develop' of ↵Louise Crow2014-06-26-1/+4
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | ssh://git.mysociety.org/data/git/public/alaveteli into rails-3-develop
| * \ \ \ \ Merge branch 'use-utf8-database' into rails-3-developGareth Rees2014-06-26-1/+4
| |\ \ \ \ \