aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeLines
* 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
| * | | | Add some release notes.Louise Crow2014-02-27-1/+32
| | | | |
* | | | | Merge branch 'hotfix/0.16.0.8' into rails-3-developLouise Crow2014-03-03-1/+2
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | Merge branch 'hotfix/0.16.0.8' of ↵0.16.0.8Louise Crow2014-03-03-1/+2
| |\ \ \ \ | | |_|/ / | |/| | | | | | | | ssh://git.mysociety.org/data/git/public/alaveteli into hotfix/0.16.0.8
| | * | | Set the blackhole address as the return path for import error messages.hotfix/0.16.0.8Louise Crow2014-02-28-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | Also send them directly to the non-bounce address, don't pipe them through mailin again.
* | | | | Remove survey variables added in error.Louise Crow2014-03-03-5/+0
| | | | |
* | | | | Merge branch 'hotfix/0.16.0.8' into rails-3-developLouise Crow2014-02-28-0/+5
|\| | | | | |_|/ / |/| | | | | | | | | | | Conflicts: locale/cy/app.po
| * | | Merge branch 'hotfix/0.16.0.7' into wdtkLouise Crow2014-02-19-38/+52
| |\| |
| * | | Use HTTPS Google docs viewer where using HTTPS for alaveteliLouise Crow2014-02-18-1/+2
| | | |
| * | | Make all WDTK references use HTTPS.Matthew Somerville2014-02-18-9/+9
| | | |
| * | | Merge branch 'hotfix/0.16.0.3' into wdtkLouise Crow2014-01-27-2/+16
| |\ \ \
| * \ \ \ Merge branch 'welsh-fixes' into wdtkLouise Crow2014-01-27-8/+8
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: locale/cy/app.po
| * \ \ \ \ Merge branch 'hotfix/0.16.0.1' into wdtkLouise Crow2014-01-24-3/+4
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: app/views/request/_view_html_stylesheet.html.erb
| * | | | | | Fixing more typosLouise Crow2014-01-24-2/+2
| | | | | | |
| * | | | | | Point at application.cssLouise Crow2014-01-24-1/+1
| | | | | | |
| * | | | | | Fix typoLouise Crow2014-01-24-1/+1
| | | | | | |
| * | | | | | Restore survey variables.Louise Crow2014-01-24-0/+5
| | | | | | |
| * | | | | | Merge branch 'release/0.16' into wdtkLouise Crow2014-01-24-3363/+19753
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'feature/cleanup-popups' into wdtkLouise Crow2014-01-14-2/+0
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'feature/cleanup-popups' into wdtkLouise Crow2014-01-14-1/+1
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'feature/cleanup-popups' into wdtkLouise Crow2014-01-14-79/+90
| |\ \ \ \ \ \ \ \ \
* | | | | | | | | | | Syntax fixes in locale files.Louise Crow2014-02-27-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The translated strings here were added manually and had the wrong variable name in them.
* | | | | | | | | | | Adding latest strings for translation.Louise Crow2014-02-27-616/+487
| | | | | | | | | | |
* | | | | | | | | | | Clean up translation interpolation syntax.Louise Crow2014-02-27-4/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't translate strings to be used in the admin interface - we're leaving it in English for now until we can markup the whole thing (#1353 and #1354). Use {{}} interpolation syntax where #{} was used in error.
* | | | | | | | | | | Latest translations from Transifex.Louise Crow2014-02-27-189/+190
| | | | | | | | | | |
* | | | | | | | | | | Make test specific to versions of ruby with String.encodeLouise Crow2014-02-24-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The code being tested is specific in that way.
* | | | | | | | | | | Merge remote-tracking branch ↵Louise Crow2014-02-24-16/+23
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'opennewzealand_github/feature/encode-utf8-messages' into rails-3-develop
generated by cgit v1.2.3 (git 2.25.1) at 2025-09-06 11:50:07 +0000