aboutsummaryrefslogtreecommitdiffstats
path: root/config
Commit message (Expand)AuthorAgeLines
* Merge branch 'upgrade-jquery-rails' into developLouise Crow2015-06-23-2/+1
|\
| * Update jquery.JcropLouise Crow2015-06-17-2/+1
* | Add a line to httpd.conf to show how to use with rbenvLouise Crow2015-06-23-0/+4
* | Merge branch 'add-rbenv-shims' into developLouise Crow2015-06-23-0/+20
|\ \
| * | Add example of wrapper script used to run mailin and handlemail.Louise Crow2015-06-23-0/+8
| * | Add some commented out lines showing how to use with rbenvLouise Crow2015-06-19-0/+12
* | | Use :platform to add rack-utf8_sanitizerLouise Crow2015-06-19-1/+1
|/ /
* | Merge branch 'switch-xml-mini-backend' into developLouise Crow2015-06-19-0/+2
|\ \
| * | Switch xml backend to nokogiri to avoiC CVE-2015-3227.Louise Crow2015-06-19-0/+2
| |/
* | Merge branch 'hotfix/0.21.0.38' into developGareth Rees2015-06-17-1/+1
|\ \
| * | Bump alaveteli versionGareth Rees2015-06-17-1/+1
| * | Bump alaveteli versionGareth Rees2015-06-17-1/+1
* | | Bump alaveteli versionGareth Rees2015-06-17-1/+1
* | | Remove sharutils packageGareth Rees2015-06-15-5/+1
| |/ |/|
* | Use rack-utf8_sanitizer to handle badly-formed UTF-8 in request URI and headers.Louise Crow2015-06-11-0/+5
* | Merge branch 'hotfix/0.21.0.36' into developGareth Rees2015-06-04-1/+1
|\|
| * Bump alaveteli versionhotfix/0.21.0.36Gareth Rees2015-06-04-1/+1
* | Merge branch 'hotfix/0.21.0.35' into rails-3-developrails-3-developLouise Crow2015-05-29-1/+1
|\|
| * Bump Alaveteli version0.21.0.35hotfix/0.21.0.35Louise Crow2015-05-29-1/+1
* | Merge branch 'hotfix/0.21.0.34' into rails-3-developLouise Crow2015-05-28-1/+1
|\|
| * Bump alaveteli version0.21.0.34hotfix/0.21.0.34Louise Crow2015-05-28-1/+1
* | Merge branch 'hotfix/0.21.0.33' into rails-3-developLouise Crow2015-05-28-1/+1
|\|
| * Bump alaveteli version0.21.0.33hotfix/0.21.0.33Louise Crow2015-05-28-1/+1
* | Merge branch 'hotfix/0.21.0.32' into rails-3-developLouise Crow2015-05-26-1/+1
|\|
| * Bump alaveteli version0.21.0.32hotfix/0.21.0.32Louise Crow2015-05-26-1/+1
| * Bump Alaveteli version0.21.0.31Louise Crow2015-05-15-1/+1
* | Add a AdminColumn concernJames McKinney2015-05-20-0/+1
* | Merge branch 'set-file-encodings' into rails-3-developLouise Crow2015-05-15-1/+24
|\ \
| * | Add source file encoding for all ruby files.Louise Crow2015-05-15-1/+24
* | | Merge branch 'hotfix/0.21.0.30' into rails-3-developLouise Crow2015-05-15-1/+1
|\ \ \ | | |/ | |/|
| * | Bump alaveteli version0.21.0.30hotfix/0.21.0.30Louise Crow2015-05-15-1/+1
* | | Merge branch 'hotfix/0.21.0.29' into rails-3-developGareth Rees2015-05-13-1/+1
|\| |
| * | Bump alaveteli versionGareth Rees2015-05-13-1/+1
* | | Merge branch 'hotfix/0.21.0.28' into rails-3-developGareth Rees2015-05-13-1/+1
|\| | | |/ |/|
| * Bump alaveteli versionhotfix/0.21.0.28Gareth Rees2015-05-13-1/+1
* | Merge remote-tracking branch 'petter_github/debian-wheezy-font-pkg' into rail...Louise Crow2015-05-12-0/+1
|\ \
| * | Add the ttf-bitstream-vera package to provide Vera.ttf to the cron jobs.Petter Reinholdtsen2015-05-09-0/+1
* | | Merge branch 'html-relative-path' into rails-3-developLouise Crow2015-05-12-1/+1
|\ \ \ | |/ / |/| / | |/
| * Bump alaveteli version0.21.0.27hotfix/0.21.0.27Louise Crow2015-05-12-1/+1
* | Merge branch 'remove-obsolete-code' into rails-3-developLouise Crow2015-05-07-1/+0
|\ \
| * | Remove monkeypatch required when running Rails 2.3 under Ruby 1.9Louise Crow2015-05-07-1/+0
* | | Merge branch 'version-dependent-caching' into rails-3-developLouise Crow2015-05-07-1/+2
|\ \ \
| * | | Make the namespace for memcached dependent on ruby version.Louise Crow2015-05-05-1/+2
| |/ /
* | | Add bulletGareth Rees2015-05-07-0/+16
* | | Merge branch 'hotfix/0.21.0.26' into rails-3-developGareth Rees2015-05-06-1/+1
|\ \ \ | |/ / |/| / | |/
| * Bump alavetli versionGareth Rees2015-05-06-1/+1
* | root no longer required for loading mail logsLouise Crow2015-04-30-3/+1
* | 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