aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeLines
* Use badge to show number of categories in headingGareth Rees2014-11-18-3/+6
* Merge branch '1968-disable-category-tag-field' into rails-3-developGareth Rees2014-11-18-9/+16
|\
| * Disable rather than hide form fields that can’t be modifiedGareth Rees2014-11-17-9/+16
* | Merge branch '1977-update-categories-redirect-to-edit' into rails-3-developGareth Rees2014-11-18-10/+82
|\ \
| * | Use flash[:error] for error conditionGareth Rees2014-11-18-2/+4
| * | Add specs to cover unsuccessful creationGareth Rees2014-11-17-1/+12
| * | Add coverage to ensure ‘new’ templates are renderedGareth Rees2014-11-17-0/+11
| * | Add expectation to #index specGareth Rees2014-11-17-0/+1
| * | Redirect to #edit after updatingGareth Rees2014-11-17-4/+21
| * | Redirect to #edit after updatingGareth Rees2014-11-17-2/+19
| * | Provide expectations for controller specsGareth Rees2014-11-17-4/+17
| |/
* | Update translationsGareth Rees2014-11-18-718/+7548
* | Clean translationsGareth Rees2014-11-18-50/+44
* | Update translationsGareth Rees2014-11-18-246/+256
* | Update newrelic_rpmGareth Rees2014-11-18-1/+1
* | Merge branch 'hotfix/0.19.0.10' into rails-3-developLouise Crow2014-11-17-26/+26
|\ \ | |/ |/|
| * Upgrade to Rails 3.2.210.19.0.10hotfix/0.19.0.10Louise Crow2014-11-17-26/+26
* | Fix missing translation introduced in 962357cGareth Rees2014-11-12-3/+3
* | Revert text changes in bf31b10Gareth Rees2014-11-12-2/+2
* | Revert text changes in 8a21f27Gareth Rees2014-11-12-2/+2
* | Merge branch '1433-admin-bottom-margin' into rails-3-developGareth Rees2014-11-11-1/+1
|\ \
| * | Add margin to bottom of admin viewsGareth Rees2014-11-05-1/+1
* | | Merge branch 'rails-3-develop' of ssh://git.mysociety.org/data/git/public/ala...Louise Crow2014-11-10-103/+14055
|\ \ \
| * \ \ Merge branch '1663-split-select-authority-page' into rails-3-developGareth Rees2014-11-10-101/+71
| |\ \ \
| | * | | Move “Can’t find an authority” to sidebarGareth Rees2014-10-30-1/+42
| | * | | Improve /select_authority search boxGareth Rees2014-10-30-1/+8
| | * | | Tidy up request/select_authority.html.erbGareth Rees2014-10-30-23/+26
| | * | | Remove authority preview from /select_authorityGareth Rees2014-10-30-88/+7
| * | | | Merge branch 'issues/1437-apple-mail-attachment-parsing' into rails-3-developGareth Rees2014-11-10-2/+13970
| |\ \ \ \
| | * | | | Add fix for Apple Mail with attachments Gareth Rees2014-11-04-2/+13825
| | * | | | Add some specs to MailBackendGareth Rees2014-11-04-0/+145
| | | |/ / | | |/| |
| * | | | Merge branch 'help_page_redirect' into rails-3-developGareth Rees2014-11-10-0/+14
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Redirect /help to /help/aboutGareth Rees2014-11-05-0/+14
| |/ / /
* | | | Merge branch 'update-compass-rails-conservatively' into rails-3-developLouise Crow2014-11-10-11/+16
|\ \ \ \ | |/ / / |/| | |
| * | | Upgrade compass-rails to version 2.0.0Louise Crow2014-11-07-5/+5
| * | | Use mysociety's version of ruby-msg.Louise Crow2014-11-06-6/+11
|/ / /
* | | Merge branch 'hotfix/0.19.0.9' into rails-3-developLouise Crow2014-10-31-478/+4347
|\ \ \ | | |/ | |/|
| * | Comment out spec which sends an invalid utf-8 param.0.19.0.9hotfix/0.19.0.9Louise Crow2014-10-31-6/+9
| * | Upgrade to Rails 3.2.20 - fixes CVE-2014-7818Louise Crow2014-10-31-26/+26
| * | Results of running 'bundle update rails'Louise Crow2014-10-31-3/+3
| * | Latest translations from Transifex0.19.0.8hotfix/0.19.0.8Louise Crow2014-10-27-12/+3876
| * | Latest translations from transifex.0.19.0.7hotfix/0.19.0.7Louise Crow2014-10-24-433/+435
| * | Merge branch 'hotfix/0.19.0.6'0.19.0.6Gareth Rees2014-09-24-1/+2
| |\ \
* | \ \ Merge branch '875-remove-charities' into rails-3-developGareth Rees2014-10-30-10/+0
|\ \ \ \
| * | | | Remove WDTK-specific charity linksGareth Rees2014-10-29-10/+0
| | |_|/ | |/| |
* | | | Merge branch 'issues/1457-close-change-request-without-email' into rails-3-de...Louise Crow2014-10-30-27/+38
|\ \ \ \ | |/ / / |/| | |
| * | | Remove redirect to trailing slash URL.Louise Crow2014-10-30-13/+1
| * | | Allow closure of a change request without sending an email.Louise Crow2014-10-30-14/+37
| |/ /
* | | Merge branch 'code_tidying' into rails-3-developGareth Rees2014-10-29-564/+716
|\ \ \
| * | | Remove extra newlinesGareth Rees2014-10-29-3/+0