aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeLines
* Split factories in to individual filesGareth Rees2014-03-25-193/+227
* Merge branch 'ab_annotations_1' into rails-3-developGareth Rees2014-03-25-41/+173
|\
| * Add AdminHelper#comment_visibilityGareth Rees2014-03-25-1/+27
| * Add specs for AdminUserController#modify_comment_visibilityGareth Rees2014-03-25-0/+86
| * Add a form for changing annotation visibilityAndrew Black2014-03-25-41/+54
| * Controller code to hide/unhide annotationsAndrew Black2014-03-25-0/+7
|/
* Merge branch 'feature/1313-better-translation-markup' into rails-3-developLouise Crow2014-03-24-41/+115
|\
| * Refactor event description to make it easier to translate.Louise Crow2014-03-17-22/+97
| * Only pass InfoRequestEvent to _request_listing_via_event templateLouise Crow2014-03-17-20/+19
| * Remove redundant h() callsLouise Crow2014-03-13-3/+3
* | Merge remote-tracking branch 'openaustralia_github/admin-typo' into rails-3-d...Louise Crow2014-03-18-1/+1
|\ \
| * | Fix typo on request admin pageHenare Degan2014-03-18-1/+1
|/ /
* | Add encoding lineLouise Crow2014-03-14-0/+1
* | Rename spec files so they're run by rake spec.Louise Crow2014-03-13-0/+0
* | Merge remote-tracking branch 'opennewzealand_github/feature/handle-undefined-...Louise Crow2014-03-13-17/+15
|\ \
| * | needs _spec.rb to be run by `rake spec`Rowan Crawford2014-03-01-0/+0
| * | Fix tests for basic encodingRowan Crawford2014-03-01-10/+10
| * | Remove unused variableRowan Crawford2014-03-01-2/+0
| * | Handle UndefinedConversionError when converting to utf-8Rowan Crawford2014-03-01-5/+5
* | | Merge branch 'rails-3-develop' of ssh://git.mysociety.org/data/git/public/ala...Louise Crow2014-03-13-35/+64
|\ \ \
| * \ \ Merge branch 'issues/662' into rails-3-developGareth Rees2014-03-13-35/+64
| |\ \ \
| | * | | Use filter to reject if user is bannedGareth Rees2014-03-13-7/+22
| | * | | Use filter to reject unless comments allowedGareth Rees2014-03-13-9/+11
| | * | | Extract create_track_thing from CommentControllerGareth Rees2014-03-13-1/+5
| | * | | Extract find_info_request from CommentControllerGareth Rees2014-03-13-12/+17
| | * | | Graceful failure of new_comment routeGareth Rees2014-03-13-13/+16
| |/ / /
* | | | Merge branch 'feature/1345-other-country-fallback' into rails-3-developLouise Crow2014-03-13-2/+9
|\ \ \ \ | |/ / / |/| | |
| * | | Handle the case where the current locale isn't in site listLouise Crow2014-03-13-2/+9
* | | | Merge branch 'issues/1358' into rails-3-developGareth Rees2014-03-13-11/+92
|\ \ \ \
| * | | | Use :text format if using simple_date in .text.erbGareth Rees2014-03-13-4/+4
| * | | | Correctly call helpers in RequestController#describe_stateGareth Rees2014-03-13-2/+2
| * | | | Add formatting options to LinkToHelper#simple_dateGareth Rees2014-03-13-5/+86
|/ / / /
* | | | Merge branch 'update_vagrantfile' into rails-3-developGareth Rees2014-03-13-26/+101
|\ \ \ \
| * | | | Add Vagrant alaveteli-themes shareGareth Rees2014-03-12-0/+9
| * | | | Improve Vagrantfile usage instructionsGareth Rees2014-03-12-7/+46
| * | | | Highlight Vagrantfile customisation optionsGareth Rees2014-03-11-1/+4
| * | | | Move Vagrantfile to repo rootGareth Rees2014-03-11-1/+1
| * | | | Remove Vagrant reliance on install-script branchGareth Rees2014-03-11-3/+0
| * | | | Create development environment with VagrantGareth Rees2014-03-11-1/+5
| * | | | Allow the location of the bundle to be configuredGareth Rees2014-03-11-3/+13
| * | | | Enable configurable VirtualBox memoryGareth Rees2014-03-07-1/+2
| * | | | Ignore .vagrant directoriesGareth Rees2014-03-07-0/+1
| * | | | Enable configurable FQDN for VagrantGareth Rees2014-03-07-2/+7
| * | | | Update Vagrantfile to Vagrant API v2Gareth Rees2014-03-07-3/+9
|/ / / /
* | | | Merge branch 'release/0.17' into rails-3-developLouise Crow2014-03-04-21/+55
|\ \ \ \
| * | | | Latest translations from Transifexrelease/0.17Louise Crow2014-03-04-19/+23
| * | | | Bumping Alaveteli versionLouise Crow2014-03-03-1/+1
| * | | | Merge branch 'hotfix/0.16.0.8' into release/0.17Louise Crow2014-03-03-1/+2
| |\ \ \ \
| * | | | | Remove survey variables added in error.Louise Crow2014-03-03-4/+0
| * | | | | Merge branch 'hotfix/0.16.0.8' into release/0.17Louise Crow2014-02-28-0/+5
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-07 02:14:35 +0000