aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeLines
* Don't translate validation messages for models created/edited in admin interfacerelease/0.20Louise Crow2014-12-02-771/+96
* Restore translations lost in 3a412f2ec2c8f8c0a0eb5000791165ab82e7a550Louise Crow2014-12-02-289/+730
* Latest translations from TransifexLouise Crow2014-12-02-251/+228
* Fix for interpolation bug introduced in 7a3b462f41321034cbdd2c83707f739a442e8...Louise Crow2014-12-01-1/+11
* Bump Alaveteli versionLouise Crow2014-12-01-1/+1
* Merge branch 'rails-3-develop' into release/0.20Louise Crow2014-12-01-0/+7
|\
| * Merge branch '2000-validate-category-description' into rails-3-developLouise Crow2014-12-01-0/+7
| |\
| | * Validate the presence of the description.Louise Crow2014-12-01-0/+7
* | | Move up the config changes - they're important.Louise Crow2014-12-01-3/+3
* | | Merge branch 'rails-3-develop' into release/0.20Louise Crow2014-12-01-127/+4636
|\| |
| * | Merge branch '1965-censor-rule-creation-failure' into rails-3-developLouise Crow2014-12-01-23/+575
| |\ \ | | |/ | |/|
| | * Remove redundant hidden fieldsGareth Rees2014-12-01-2/+0
| | * Use instance variable for CensorRule in #destroyGareth Rees2014-11-19-8/+10
| | * Use new routes for creating censor rulesGareth Rees2014-11-19-10/+10
| | * Tidy AdminCensorRuleController#updateGareth Rees2014-11-19-3/+7
| | * Set the form URL to POST to in #createGareth Rees2014-11-19-0/+20
| | * Associate censor rule with something in #createGareth Rees2014-11-19-2/+65
| | * Set the form URL to POST to in #newGareth Rees2014-11-19-0/+21
| | * Add extra censor rule routesGareth Rees2014-11-19-0/+18
| | * Associate censor rule with something in #newGareth Rees2014-11-19-0/+14
| | * Initialize a new CensorRule in #newGareth Rees2014-11-19-0/+7
| | * Specs for AdminCensorRuleController#updateGareth Rees2014-11-19-0/+126
| | * Specs for AdminCensorRuleController#createGareth Rees2014-11-19-0/+111
| | * 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
| |\ \ \
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-07 11:38:22 +0000