aboutsummaryrefslogtreecommitdiffstats
path: root/config
Commit message (Expand)AuthorAgeLines
...
* | Merge branch 'rails-3-develop' of ssh://git.mysociety.org/data/git/public/ala...Louise Crow2015-04-30-1/+1
|\ \
| * | Merge branch 'master' into rails-3-developGareth Rees2015-04-30-1/+1
| |\|
| | * Bump alaveteli version0.21.0.25Gareth Rees2015-04-30-1/+1
* | | Merge branch 'easy-ruby-version' into rails-3-developLouise Crow2015-04-30-0/+0
|\ \ \ | |/ / |/| |
| * | Use .example files for daemons.Louise Crow2015-04-28-0/+0
* | | Symlink the theme directory on Capistrano deploysHenare Degan2015-04-28-0/+2
* | | Delete .cvsignoreGareth Rees2015-04-28-3/+0
|/ /
* | Merge branch 'fix-alert-daemon-restart' into rails-3-developLouise Crow2015-04-28-2/+2
|\ \
| * | Use a retry option when stopping daemons.Louise Crow2015-04-28-2/+2
* | | Merge branch 'add-widget' into rails-3-developLouise Crow2015-04-28-0/+11
|\ \ \ | |/ / |/| |
| * | Allow widgets to be controlled with a feature flag.Louise Crow2015-04-27-0/+8
| * | Use resource-based RESTful routing and separate controllerLouise Crow2015-04-27-2/+1
| * | Add controller for non-logged in "voting"Jody McIntyre2015-04-27-0/+1
| * | Add widget for info requestsJody McIntyre2015-04-23-0/+3
* | | Merge branch 'hotfix/0.21.0.23' into rails-3-developGareth Rees2015-04-27-1/+1
|\ \ \ | | |/ | |/|
| * | Bump alaveteli versionhotfix/0.21.0.23Gareth Rees2015-04-27-1/+1
* | | Merge branch 'hotfix/0.21.0.22' into rails-3-developGareth Rees2015-04-24-1/+1
|\| |
| * | Bump alaveteli versionhotfix/0.21.0.22Gareth Rees2015-04-24-1/+1
* | | Merge branch 'hotfix/0.21.0.21' into rails-3-developLouise Crow2015-04-23-1/+1
|\| | | |/ |/|
| * Bump alaveteli version0.21.0.21hotfix/0.21.0.21Louise Crow2015-04-23-1/+1
* | Merge remote-tracking branch 'openaustralia_github/fix-varnish-cookie-removal...Louise Crow2015-04-17-8/+8
|\ \
| * | Strip trailing spaces onlyHenare Degan2015-04-17-7/+7
| * | Don't remove cookies from txt files in suggested Varnish configurationHenare Degan2015-04-17-1/+1
* | | Merge branch 'hotfix/0.21.0.20' into rails-3-developGareth Rees2015-04-17-1/+1
|\ \ \ | |/ / |/| / | |/
| * Bump alaveteli versionhotfix/0.21.0.20Gareth Rees2015-04-17-1/+1
* | Merge branch 'hotfix/0.21.0.19' into rails-3-developGareth Rees2015-04-16-1/+1
|\|
| * Bump alaveteli versionhotfix/0.21.0.19Gareth Rees2015-04-16-1/+1
* | Merge branch 'hotfix/0.21.0.18' into rails-3-developGareth Rees2015-04-16-1/+1
|\|
| * Bump alaveteli versionhotfix/0.21.0.18Gareth Rees2015-04-16-1/+1
* | Merge branch 'hotfix/0.21.0.17' into rails-3-developGareth Rees2015-04-16-1/+1
|\|
| * Bump alaveteli versionhotfix/0.21.0.17Gareth Rees2015-04-16-1/+1
* | Merge branch 'hotfix/0.21.0.16' into rails-3-developGareth Rees2015-04-15-1/+1
|\|
| * Bump alaveteli versionhotfix/0.21.0.16Gareth Rees2015-04-15-1/+1
* | Merge branch 'smtp-mailer-configuration' into rails-3-developLouise Crow2015-04-14-1/+41
|\ \ | |/ |/|
| * Make clear that it is only the production delivery method that is being set.Louise Crow2015-04-14-5/+5
| * Fix some typosLouise Crow2015-04-14-3/+3
| * Make clear that SMTP mail settings are SMTP-specific.Louise Crow2015-04-14-14/+14
| * Allow configuration for SMTP settingsCaleb2015-04-09-1/+41
* | Bump alaveteli versionhotfix/0.21.0.15Gareth Rees2015-04-10-1/+1
* | Bump alaveteli version.0.21.0.14hotfix/0.21.0.14Louise Crow2015-04-10-1/+1
* | Bump alaveteli versionhotfix/0.21.0.13Gareth Rees2015-04-09-1/+1
* | Bump alaveteli versionhotfix/0.21.0.12Gareth Rees2015-04-09-1/+1
* | Bump alaveteli versionhotfix/0.21.0.11Gareth Rees2015-04-08-1/+1
* | Bump alaveteli versionhotfix/0.21.0.10Gareth Rees2015-04-08-1/+1
* | Bump alaveteli versionhotfix/0.21.0.9Gareth Rees2015-04-08-1/+1
* | Bump alaveteli versionhotfix/0.21.0.8Gareth Rees2015-04-08-1/+1
* | Bump alaveteli version.hotfix/0.21.0.7Louise Crow2015-04-07-1/+1
|/
* Bump alaveteli version.Louise Crow2015-04-02-1/+1
* Bump alaveteli version.0.21.0.2hotfix/0.21.0.2Louise Crow2015-04-02-1/+1
* Bump alaveteli version.0.21.0.1Louise Crow2015-03-31-1/+1