aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeLines
* 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
| * | | | | | | | | | Add test for _get_attachment_text_internal with invalid utf-8Rowan Crawford2014-02-23-8/+15
| | | | | | | | | | |
| * | | | | | | | | | encode does no work if it thinks it's already utf-8 (even if invalid)Rowan Crawford2014-02-10-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also use duck typing for whether we should use encode
* | | | | | | | | | | Merge branch 'hotfix/0.16.0.7' into rails-3-developLouise Crow2014-02-19-28/+28
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | |
| * | | | | | | | | | Upgrade to latest version of Rails0.16.0.7hotfix/0.16.0.7Louise Crow2014-02-19-28/+28
| |/ / / / / / / / /
* | | | | | | | | | Merge remote-tracking branch ↵Louise Crow2014-02-18-3/+9
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'opennewzealand_github/feature/translate-view-email' into rails-3-develop
| * | | | | | | | | | Translate titleRowan Crawford2014-02-10-1/+1
| | | | | | | | | | |
| * | | | | | | | | | Translate "make a new FOI request" in view emailRowan Crawford2014-02-10-2/+8
| |/ / / / / / / / /
* | | | | | | | | | Merge branch 'feature/https-fixes' into rails-3-developLouise Crow2014-02-17-10/+11
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Use HTTPS Google docs viewer where using HTTPS for alaveteliLouise Crow2014-02-17-1/+2
| | | | | | | | | | |
| * | | | | | | | | | Make all WDTK references use HTTPS.Matthew Somerville2014-01-30-9/+9
| | | | | | | | | | |
* | | | | | | | | | | Remove an obsolete stringMark Longair2014-01-31-5/+2
| | | | | | | | | | |
* | | | | | | | | | | Remove fuzzy strings from en_UG/app.po as wellMark Longair2014-01-30-57/+29
| | | | | | | | | | |
* | | | | | | | | | | Remove fuzzy strings from the .po filesMark Longair2014-01-30-3420/+1656
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Done by re-pulling from Transifex and running: bundle exec rake gettext:clean
* | | | | | | | | | | Update the .pot and .po filesMark Longair2014-01-30-393/+13588
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These were updated with: bundle exec rake gettext:store_model_attributes bundle exec rake gettext:find
* | | | | | | | | | | Update translations after pulling from Transfix + cleaningMark Longair2014-01-30-30/+30
|/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As suggested in the release manager's checklist, this commit introduces the results of re-pulling from transifex: tx pull -a -f ... and cleaning the .po files again: bundle exec rake gettext:clean