aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeLines
* Split factories in to individual filesGareth Rees2014-03-25-193/+227
| | | | | | | | | | | | Factories are loaded automatically from: - test/factories.rb - spec/factories.rb - test/factories/*.rb - spec/factories/*.rb Keeping factories per-model helps navigation, especially when they get more complex with traits and inheritance.
* Merge branch 'ab_annotations_1' into rails-3-developGareth Rees2014-03-25-41/+173
|\
| * Add AdminHelper#comment_visibilityGareth Rees2014-03-25-1/+27
| | | | | | | | Get the canonical human-readable status of a comment
| * 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
|/ | | | The UI provides a list of comment_ids and a newstate="visible" or "hide"
* 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
| | | | | | | | Closes #1313 and #365.
| * Only pass InfoRequestEvent to _request_listing_via_event templateLouise Crow2014-03-17-20/+19
| | | | | | | | The InfoRequest is always the one associated with the event.
| * Remove redundant h() callsLouise Crow2014-03-13-3/+3
| | | | | | | | Text will be escaped by default in Rails 3
* | Merge remote-tracking branch 'openaustralia_github/admin-typo' into ↵Louise Crow2014-03-18-1/+1
|\ \ | | | | | | | | | rails-3-develop
| * | 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 ↵Louise Crow2014-03-13-17/+15
|\ \ | | | | | | | | | 'opennewzealand_github/feature/handle-undefined-conversion' into rails-3-develop
| * | 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
| | | | | | | | | | | | | | | | | | From: http://ruby-doc.org/core-2.0/String.html#method-i-encode Ducktypes for having encode rather than relying on RUBY_VERSION
* | | Merge branch 'rails-3-develop' of ↵Louise Crow2014-03-13-35/+64
|\ \ \ | | | | | | | | | | | | ssh://git.mysociety.org/data/git/public/alaveteli into rails-3-develop
| * \ \ 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extract checking whether a user is banned from making Comments on an InfoRequest to a filter in CommentController. Removes responsibility from the #new method. Adds a missing spec.
| | * | | Use filter to reject unless comments allowedGareth Rees2014-03-13-9/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extract checking whether comments are allowed on an InfoRequest to a filter in CommentController. Removes responsibility from the #new method.
| | * | | Extract create_track_thing from CommentControllerGareth Rees2014-03-13-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | Use a before_filter to make @track_thing available to all filters called on the same action and remove responsibility from the #new method
| | * | | Extract find_info_request from CommentControllerGareth Rees2014-03-13-12/+17
| | | | | | | | | | | | | | | | | | | | | | | | | Use a before_filter to make @info_request available to all filters called on the same action
| | * | | Graceful failure of new_comment routeGareth Rees2014-03-13-13/+16
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes https://github.com/mysociety/alaveteli/issues/662 If /annotate/request/:url_title is accessed when comments are disabled an exception is incorrectly thrown. Conditionals should be used for control flow, so now the action redirects to the info_request path and displays a notice.
* | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | We only really want to redirect people to live sites, so pre-launch sites don't belong in WorldFOIWebsites. Handle the case where the current locale isn't there. Closes #1345.
* | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Calling simple_date threw an exception as it uses a helper internally. Only LinkToHelper is included in to the controller, so the underlying helper was not available.
| * | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For a better workflow http://mysociety.github.io/installation-standards.html#silver # Host # Note that --recursive must be specified to include commonlib # submodule $ git clone --recursive git@github.com:mysociety/alaveteli.git $ cd alaveteli && vagrant up $ vagrant ssh # Guest $ cd /home/vagrant/alaveteli && bundle exec rake spec
| * | | | Remove Vagrant reliance on install-script branchGareth Rees2014-03-11-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Background IRC Chat: 2014-03-07T11:28:33+0000] <gareth> Why is the branch being replaced here? https://github.com/mysociety/alaveteli/blob/rails-3-develop/config/Vagra ntfile#L18 [2014-03-07T11:29:55+0000] <gareth> It can't checkout install-script branch as it doesn't exist [2014-03-07T11:32:10+0000] <gareth> not sure how/why it could do this when it fetched a new copy of the repo rather than using the host checkout [2014-03-07T11:35:42+0000] <louise> gareth that may be my fault - I deleted a bunch of what I thought were old branches earlier this week - perhaps install-script was one of them - let me look [2014-03-07T11:36:58+0000] <louise> nope, doesn't look like it was - mark, should the install-script branch exist? [2014-03-07T11:38:18+0000] <mark> what the install script does is to use the first of these that can be checked out: origin/install-script 0.15 origin/master [2014-03-07T11:38:46+0000] <mark> but i must have created that Vagrantfile while the install-script branch existed and worked, but the master branch wouldn't [2014-03-07T11:38:56+0000] <mark> i think now it'd be safe to take that line out of the vagrant file
| * | | | Create development environment with VagrantGareth Rees2014-03-11-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Share the host git checkout in to the VM so that a developer can use their preferred environment while running the application in a production-like environment. Use the --dev option of install-site.sh so that the existing git checkout is used. The gems are installed outside of the app directory in development because VirtualBox's directory shares can be slow when the directory contains an excessive amount of files. Installing gems in to this directory results in ~15K additional files, which is beyond what VirtualBox can reasonably be expected to handle
| * | | | Allow the location of the bundle to be configuredGareth Rees2014-03-11-3/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Sets vendor/bundle as default - Uses $HOME/bundle when generating general.yml Based on d9f162c8ab08cb881cd68a3eee900c52c63cb1ae
| * | | | 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
|/ / / / | | | | | | | | | | | | | | | | | | | | Required for Vagrant >=1.1 Should be backwards compatible with older versions http://docs.vagrantup.com/v2/installation/backwards-compatibility.html
* | | | Merge branch 'release/0.17' into rails-3-developLouise Crow2014-03-04-21/+55
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: config/general.yml-example locale/cy/app.po
| * | | | 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
| |\ \ \ \ \ | | | |_|/ / | | |/| | | | | | | | | | | | | | | Conflicts: locale/cy/app.po
generated by cgit v1.2.3 (git 2.25.1) at 2025-09-08 14:54:06 +0000