aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeLines
...
| | | * Specs for AdminCensorRuleController#destroyGareth Rees2014-11-18-0/+65
| | | * Specs for AdminCensorRuleController#editGareth Rees2014-11-18-0/+23
| | | * Specs for AdminCensorRuleController#newGareth Rees2014-11-18-0/+48
| | | * Add CensorRule factoriesGareth Rees2014-11-18-0/+32
| | * | Merge branch 'clean-enRW' into rails-3-developGareth Rees2014-11-27-1186/+361
| | |\ \
| | | * | Manually correct spacing in en_RW msgidGareth Rees2014-11-27-2/+2
| | | * | Clean en_RW/app.poGareth Rees2014-11-27-1186/+361
| | * | | Merge branch 'rails-3-develop' of ssh://git.mysociety.org/data/git/public/ala...Louise Crow2014-11-27-38/+4738
| | |\| |
| | | * | Merge branch 'add-en_RW' into rails-3-developGareth Rees2014-11-26-0/+4691
| | | |\ \
| | | | * | Add Rwandan English translation file.Louise Crow2014-11-26-0/+4691
| | | * | | Don't comment out example configurationGareth Rees2014-11-25-1/+2
| | | * | | Merge branch '1975-destroy-pbc-heading-msg' into rails-3-developGareth Rees2014-11-20-37/+43
| | | |\ \ \
| | | | * | | Add JS confirmation for deleting heading/categoryGareth Rees2014-11-20-2/+4
| | | | * | | Fix incorrect count for heading childrenGareth Rees2014-11-20-1/+1
| | | | * | | Tidy public body category management UIGareth Rees2014-11-20-36/+40
| | | * | | | Merge branch '1905-prep-for-full-version-string' into rails-3-developGareth Rees2014-11-20-0/+2
| | | |\ \ \ \ | | | | |/ / / | | | |/| | |
| | | | * | | Support the full four-point version stringGareth Rees2014-11-19-0/+2
| | | |/ / /
| | * | | | Merge branch 'close-update-public-body' into rails-3-developLouise Crow2014-11-27-0/+3
| | |\ \ \ \ | | | |/ / / | | |/| | |
| | | * | | Adds button missing from 921ee9a19c267bb0e6e784091b985f3ba80d835bLouise Crow2014-11-18-0/+3
| | * | | | Merge branch 'issues/1969-inconsistent-public-body-admin-interface' into rail...Gareth Rees2014-11-19-52/+54
| | |\ \ \ \
| | | * | | | Remove restricton on deleting PublicBodyHeadings with associated PublicBodyCa...lizconlan2014-11-19-31/+27
| | | * | | | Fix view bug preventing PublicBodyCategories being deleted in the admin inter...lizconlan2014-11-19-21/+27
| | | | |/ / | | | |/| |
| | * | | | Merge branch '1962-category-dropdowns' into rails-3-developGareth Rees2014-11-19-3/+6
| | |\ \ \ \
| | | * | | | Use badge to show number of categories in headingGareth Rees2014-11-18-3/+6
| | | | |_|/ | | | |/| |
| | * | | | Merge branch '1970-remove-load-categories-stub' into rails-3-developGareth Rees2014-11-19-5/+0
| | |\ \ \ \ | | | |/ / / | | |/| | |
| | | * | | Remove stubs of removed methodGareth Rees2014-11-18-5/+0
| | |/ / /
| | * | | 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
| | | |/ /
| * | | | Emphasise public body categories upgrade stepGareth Rees2014-11-18-1/+1
| * | | | Update CHANGELOG (Version 0.20)Gareth Rees2014-11-18-1/+51
| |/ / /
| * | | 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
| |\ \ | | |/ | |/|
| * | 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
| | |\ \ \