aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeLines
* Return a string from user.name always to avoid any complications with other f...hotfix/0.9.0.5Louise Crow2013-05-28-4/+17
* Merge branch 'hotfix/0.9.0.4'Mark Longair2013-05-23-1/+1
|\
| * Fix a typo in a view name0.9.0.4hotfix/0.9.0.4Mark Longair2013-05-23-1/+1
|/
* Merge remote-tracking branch 'origin/hotfix/0.9.0.3'0.9.0.3Louise Crow2013-05-16-1/+9
|\
| * Latest version of commonlib - I don't think the require of 'spec/rake/spectas...hotfix/0.9.0.3Louise Crow2013-05-16-0/+0
| * Merge branch 'external-command-memory-limit' into hotfix/0.9.0.3Louise Crow2013-05-16-1/+9
| |\
| | * Merge branch 'external-command-memory-limit' of ssh://git.mysociety.org/data/...Louise Crow2013-05-15-0/+0
| | |\
| | | * Use ruby 1.8.7 bindings for backward compatibilityIan Chard2013-05-15-0/+0
| | * | Re-add commonlib rake filesLouise Crow2013-05-15-0/+3
| | |/
| | * Limit memory available to wvText, which calls elinksIan Chard2013-05-15-1/+2
| | * Add option to limit memory available to external commandsIan Chard2013-05-15-0/+4
| |/ |/|
| * Update commonlib to get memory allocation flag for ExternalCommandLouise Crow2013-05-16-0/+0
|/
* Merge branch 'hotfix/0.9.0.2'0.9.0.2Louise Crow2013-05-07-2/+16
|\
| * Bugfix for the case where a suspended user sends a contact message. Their nam...hotfix/0.9.0.2Louise Crow2013-05-07-2/+16
|/
* Merge branch 'hotfix/0.9.0.1'0.9.0.1Louise Crow2013-05-01-0/+0
|\
| * Update commonlib to get https://github.com/mysociety/commonlib/commit/735dbe5...hotfix/0.9.0.1Louise Crow2013-05-01-0/+0
|/
* Mark ban text as html safeLouise Crow2013-04-29-1/+1
* Merge branch 'release/0.9'0.9Louise Crow2013-04-24-4054/+3911
|\
| * Bump alaveteli versionrelease/0.9Louise Crow2013-04-24-1/+1
| * Fix string interpolation param.Louise Crow2013-04-24-1/+1
| * Make sure raw emails are loaded before running integration specLouise Crow2013-04-23-0/+1
| * Translation files re-pulled from transifex.Louise Crow2013-04-23-145/+163
| * Translation file format fixes.Louise Crow2013-04-23-3/+3
| * Results of running bundle exec rake gettext:store_model_attributes, followed ...Louise Crow2013-04-23-41/+34
| * Merge latest translations from Transifex with new interpolation format.Louise Crow2013-04-23-383/+3768
| * Add changes for release 0.9Louise Crow2013-04-23-0/+10
| * Restore call to N_Louise Crow2013-04-23-1/+1
| * Remove method restriction on describe_state - as noted later in the routes.rb...Louise Crow2013-04-23-1/+1
| * Fix the deadlock on dealing with incoming emailMark Longair2013-04-18-0/+11
| * Also silence network unreachable errors.Louise Crow2013-04-17-6/+6
| * Translation cleanup.Louise Crow2013-04-16-1738/+1679
| * Remove trailing space.Louise Crow2013-04-16-27/+27
| * Remove duplicate translation string.Louise Crow2013-04-16-3/+0
| * Remove extra translation stringLouise Crow2013-04-16-3/+0
| * Remove extra quoteLouise Crow2013-04-16-1/+1
| * Add missing quote escapingLouise Crow2013-04-16-1/+1
| * Fix up broken translation msgidLouise Crow2013-04-16-2/+1
| * Update outgoing message signoff translationLouise Crow2013-04-16-1/+1
| * Remove duplicate string resulting from stripping link from around text.Louise Crow2013-04-16-84/+9
| * Update locale file to use new variable interpolation format.Louise Crow2013-04-16-85/+82
| * Merge branch 'feature/final-consistent-translation-interpolation' into developLouise Crow2013-04-16-2784/+2786
| |\
| | * Fix typoLouise Crow2013-04-15-1/+1
| | * Resolving merge conflictsLouise Crow2013-04-15-187/+28
| | * Removing unused translation stringMatthew Landauer2013-04-15-18/+0
| | * In translation strings replace %s with {{}} formattingMatthew Landauer2013-04-15-41/+41
| | * In translation strings replace %s with {{}} formattingMatthew Landauer2013-04-15-52/+42
| | * In translation strings replace %{} with {{}} formattingMatthew Landauer2013-04-15-45/+42
| | * Replace %s with {{}} in "Everything that you enter on this page..."Louise Crow2013-04-15-86/+87
| | * Replace %s with {{}} in translation "If you are thinking of using a pseudonym...Louise Crow2013-04-15-80/+71
| | * Replace %s with {{}} in translation "We do not have a working.."Louise Crow2013-04-15-50/+43