aboutsummaryrefslogtreecommitdiffstats
path: root/config
Commit message (Expand)AuthorAgeLines
* Merge branch 'release/0.11' of ssh://git.mysociety.org/data/git/public/alavet...0.11Louise Crow2013-06-03-1/+1
|\
| * Merge branch 'rails-3-develop' into release/0.11Mark Longair2013-05-30-1/+1
| |\
| | * Fix typo.Louise Crow2013-05-30-1/+1
* | | Bump version number.Louise Crow2013-06-03-1/+1
|/ /
* / Add note about config/httpd.confLouise Crow2013-05-30-1/+1
|/
* Remove the (we think) now unneeded will_paginate customizationMark Longair2013-05-29-4/+0
* Merge branch 'tmail-to-mail-tests' into rails-3-developMark Longair2013-05-28-1/+4
|\
| * Move "require 'alaveteli_file_types'" into the initializerMark Longair2013-05-16-0/+1
| * Add functions for converting from arbitrary text data to UTF-8Mark Longair2013-05-16-1/+3
* | Update the install documentation for the new database.yml paramLouise Crow2013-05-28-0/+2
* | Disable referential integrity disabling in the test database, if a config par...Louise Crow2013-05-28-0/+5
|/
* Merge remote-tracking branch 'openaustralia_github/rails_3_cookies_prefix' in...Louise Crow2013-05-13-1/+6
|\
| * Invalidate cookies on upgrading from Rails 2 to Rails 3. Fixes #899Matthew Landauer2013-04-05-1/+6
* | Merge branch 'feature/restore-custom-error-pages' into rails-3-developLouise Crow2013-05-13-1/+4
|\ \
| * | Handle routing errors with our custom template too.Louise Crow2013-05-02-1/+4
* | | Add a simple hook to allow theme tests to load the theme code in the context ...Louise Crow2013-05-02-5/+16
|/ /
* | Remove softlink to vendor/rails-locales and reference to it.Louise Crow2013-04-25-1/+0
* | Add encoding specifications to two files that use UTF-8Mark Longair2013-04-16-0/+1
* | Fix attachment downloading for attachments that have file extensionsMark Longair2013-04-16-2/+2
* | Add a RackEnv setting to httpd.conf-example and explain whyMark Longair2013-04-08-0/+5
* | Rename httpd.conf to httpd.conf-exampleMark Longair2013-04-08-0/+0
|/
* Bump ALAVETELI_VERSION to 0.10 (should be the first Rails 3 version)Mark Longair2013-04-03-1/+1
* Merge branch 'hotfix/0.8.0.1' into rails-3-developLouise Crow2013-04-02-1/+9
|\
| * When force_ssl is true make links in emails httpsMatthew Landauer2013-04-02-0/+8
* | Change email address in header of source code to hello@mysociety.orgMatthew Landauer2013-03-26-3/+3
* | Merge remote-tracking branch 'openaustralia_github/rails-3-develop' into rail...Louise Crow2013-03-21-11/+0
|\ \
| * | We've already removed the proxied admin interface (and ADMIN_PUBLIC_URL confi...Matthew Landauer2013-03-20-11/+0
* | | Merge branch 'develop' into rails-3-developLouise Crow2013-03-19-1/+3
|\ \ \ | |/ / |/| / | |/
| * Bump version number to 0.8Louise Crow2013-03-19-1/+1
| * Allow the emergency user account to be disabled.Louise Crow2013-03-19-0/+1
| * Merge branch 'hotfix/0.7.0.5' into release/0.8Louise Crow2013-03-18-1/+1
| |\
| | * Upgrade to Rails 2.3.18 to get fixes for CVE-2013-1855, CVE-2013-1856, CVE-20...hotfix/0.7.0.5Louise Crow2013-03-18-1/+1
* | | Correct URLs in example fileHenare Degan2013-03-16-2/+2
* | | This is already the defaultHenare Degan2013-03-16-5/+0
* | | This no longer requires iconv in Ruby 1.9Henare Degan2013-03-16-7/+0
* | | The PUT method is also(?) used so revert thisHenare Degan2013-03-16-1/+1
* | | Fix named route conflict originally done in 889bb7b79f16533be7c8f2c46c9463b77...Henare Degan2013-03-15-1/+1
* | | Fix describe_state_message from the mergeHenare Degan2013-03-15-0/+1
* | | POST became enforced in fa624fc7f17b6b4b6710817ed63291386e525f9cHenare Degan2013-03-15-1/+1
* | | These routes were renamed in 64fe099163e8b786e6c05fe05fe9cbb8c068e380Henare Degan2013-03-15-3/+3
* | | Removed in eadfc265ff83524cbd54b2682f2de818bca24bf4Henare Degan2013-03-15-1/+0
* | | Add admin JS route from 5f7d17bc2128d7de3749f65d3e9168e2fcc1a478Henare Degan2013-03-15-0/+1
* | | Don't specify an id on a new public body. Fixes problems with using named routesHenare Degan2013-03-14-1/+1
* | | In Rails 3 we need to explicity requireHenare Degan2013-03-14-0/+1
* | | Removed in 09ce54c6c09d878015102153cd214cf1d7ad3660Henare Degan2013-03-14-1/+0
* | | Merge remote-tracking branch 'mysociety/develop' into rails-3-developHenare Degan2013-03-14-25/+50
|\| |
| * | Merge remote-tracking branch 'openaustralia_github/one_support_email_on_admin...Louise Crow2013-03-13-1/+3
| |\ \
| | * | Now direct changes of state to error_message and requires_admin to a new page...Matthew Landauer2013-03-06-0/+1
| | * | Fix bug in rails 2 cookiestore that only shows up when using integration testsMatthew Landauer2013-03-06-0/+1
| | * | Remove code added previously because on the wrong trackMatthew Landauer2013-03-05-1/+0