aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeLines
* Merge branch 'hotfix/0.17.0.2'Gareth Rees2014-05-07-31/+31
|\
| * Update rails to 3.2.18Gareth Rees2014-05-07-31/+31
|/
* Make sure mail/part is loaded.hotfix/0.17.0.1Louise Crow2014-04-25-0/+2
* Fix for badly-formed content-disposition header.Louise Crow2014-04-25-0/+11
* Merge branch 'release/0.17'0.17Louise Crow2014-03-04-1310/+15107
|\
| * 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
| |\ | |/ |/|
* | Merge branch 'hotfix/0.16.0.8' of ssh://git.mysociety.org/data/git/public/ala...0.16.0.8Louise Crow2014-03-03-1/+2
|\ \
| * | Set the blackhole address as the return path for import error messages.hotfix/0.16.0.8Louise Crow2014-02-28-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
| | |\ | |_|/ |/| |
* | | 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
|\ \ \ \
* \ \ \ \ Merge branch 'hotfix/0.16.0.1' into wdtkLouise Crow2014-01-24-3/+4
|\ \ \ \ \
* | | | | | 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
|\ \ \ \ \ \ \ \ \
| | | | | | | | | * Add some release notes.Louise Crow2014-02-27-1/+32
| | | | | | | | | * Syntax fixes in locale files.Louise Crow2014-02-27-2/+2
| | | | | | | | | * Adding latest strings for translation.Louise Crow2014-02-27-616/+487
| | | | | | | | | * Clean up translation interpolation syntax.Louise Crow2014-02-27-4/+5
| | | | | | | | | * 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
| | | | | | | | | * Merge remote-tracking branch 'opennewzealand_github/feature/encode-utf8-messa...Louise Crow2014-02-24-16/+23
| | | | | | | | | |\
| | | | | | | | | | * 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
| | | | | | | | | * | 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 'opennewzealand_github/feature/translate-view-em...Louise Crow2014-02-18-3/+9
| | | | | | | | | |\
| | | | | | | | | | * 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
| | | | | | | | | * | Update the .pot and .po filesMark Longair2014-01-30-393/+13588
| | | | | | | | | * | Update translations after pulling from Transfix + cleaningMark Longair2014-01-30-30/+30
| | | | | | | | | |/
| | | | | | | | | * Merge branch 'feature/batch-requests' into rails-3-developLouise Crow2014-01-29-196/+1503
| | | | | | | | | |\
| | | | | | | | | | * Fix typoLouise Crow2014-01-28-1/+1