aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeLines
* Merge branch 'hotfix/0.21.0.35' into rails-3-developrails-3-developLouise Crow2015-05-29-8/+27
|\
| * Bump Alaveteli version0.21.0.35hotfix/0.21.0.35Louise Crow2015-05-29-1/+1
| * Go back to setting up xapian index with fixturesLouise Crow2015-05-29-4/+6
| * Address#to_s changes the input passed to it - dup before calling.Louise Crow2015-05-28-3/+20
* | Merge branch 'hotfix/0.21.0.34' into rails-3-developLouise Crow2015-05-28-1/+1
|\|
| * Bump alaveteli version0.21.0.34hotfix/0.21.0.34Louise Crow2015-05-28-1/+1
| * Fix encoding issue with searching for macronsCaleb2015-05-28-35/+48
* | Merge branch 'hotfix/0.21.0.33' into rails-3-developLouise Crow2015-05-28-106/+178
|\|
| * Bump alaveteli version0.21.0.33hotfix/0.21.0.33Louise Crow2015-05-28-1/+1
| * Merge branch 'handle-unparsed-email-as-binary' into hotfix/0.21.0.33Louise Crow2015-05-28-33/+64
| |\
| | * Handle unparsed email contents as binary.Louise Crow2015-05-26-14/+59
| | * Cleanup spec.Louise Crow2015-05-22-13/+14
| | * Remove obsolete testLouise Crow2015-05-22-19/+4
| * | Add required setupLouise Crow2015-05-28-11/+18
| * | Make sure regexes used in highlight helper are UTF-8 encodedLouise Crow2015-05-28-0/+1
| * | Make sure spelling corrections are encoded as UTF-8Louise Crow2015-05-28-1/+33
| * | Cleanup spec.Louise Crow2015-05-26-52/+54
| * | Move acts_as_xapian specs to own file.Louise Crow2015-05-26-71/+73
* | | Merge branch 'rails-3-develop' of ssh://git.mysociety.org/data/git/public/ala...Louise Crow2015-05-28-17/+15
|\ \ \
| * \ \ Merge remote-tracking branch 'jpmckinney/js' into rails-3-developGareth Rees2015-05-28-1/+0
| |\ \ \
| | * | | Don't analyze JavaScript code qualityJames McKinney2015-05-27-1/+0
| * | | | Merge remote-tracking branch 'jpmckinney/truefalse' into rails-3-developGareth Rees2015-05-28-16/+15
| |\ \ \ \
| | * | | | Eliminate !! (bang bang)James McKinney2015-05-27-3/+3
| | * | | | Avoid unnecessary ternary operationsJames McKinney2015-05-21-15/+15
| | * | | | AdminUserController: remove unused instance variable and avoid unneeded ternaryJames McKinney2015-05-21-2/+1
* | | | | | Merge branch 'force-filenames-to-utf8' into rails-3-developLouise Crow2015-05-28-2/+137
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Fix typoLouise Crow2015-05-15-1/+1
| * | | | | Force attachment filenames to utf-8 before trying to save themLouise Crow2015-05-15-4/+73
| * | | | | Add method for forcing strings to valid utf-8Louise Crow2015-05-14-0/+66
* | | | | | Merge branch 'rails-3-develop' of ssh://git.mysociety.org/data/git/public/ala...Louise Crow2015-05-28-0/+6
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | Merge remote-tracking branch 'jpmckinney/codeclimate' into rails-3-developGareth Rees2015-05-27-0/+6
| |\ \ \ \ \
| | * | | | | Exclude "lib/strip_attributes/test/*" from CodeClimateJames McKinney2015-05-20-0/+6
* | | | | | | Merge branch 'locale-specific-language-name' into rails-3-developLouise Crow2015-05-28-0/+24
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Allow locale specific language names and add one for Hong Kong Chinese.Louise Crow2015-05-15-0/+24
| |/ / / / /
* | | | | | Merge remote-tracking branch 'jpmckinney_github/extract_method4' into rails-3...Louise Crow2015-05-26-18/+14
|\ \ \ \ \ \
| * | | | | | MailServerLog: Extract duplicate code into new methodJames McKinney2015-05-21-18/+14
| | |_|/ / / | |/| | | |
* | | | | | Merge branch 'scope-comments' into rails-3-developLouise Crow2015-05-26-5/+11
|\ \ \ \ \ \
| * | | | | | Restore methods with deprecation noticesLouise Crow2015-05-26-0/+12
| * | | | | | Replace visible_comments method with a scope on the Comment modelHenare Degan2015-05-22-7/+5
| * | | | | | Remove unused methodHenare Degan2015-05-22-4/+0
* | | | | | | Merge remote-tracking branch 'jpmckinney_github/class_methods' into rails-3-d...Louise Crow2015-05-26-74/+74
|\ \ \ \ \ \ \
| * | | | | | | Declare class methods the idiomatic Ruby wayJames McKinney2015-05-21-74/+74
| | |/ / / / / | |/| | | | |
* | | | | | | Merge remote-tracking branch 'openaustralia_github/286-public-body-show-visib...Louise Crow2015-05-26-7/+10
|\ \ \ \ \ \ \
| * | | | | | | Only include visible requests in count on body pageHenare Degan2015-05-22-7/+10
| | |/ / / / / | |/| | | | |
* | | | | | | Merge remote-tracking branch 'schlos_github/patch-2' into rails-3-developLouise Crow2015-05-26-1/+5
|\ \ \ \ \ \ \
| * | | | | | | Adding Croatian AlaveteliMiroslav2015-05-24-1/+5
* | | | | | | | Merge remote-tracking branch 'petter_github/forgot-i18n-string' into rails-3-...Louise Crow2015-05-26-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Make a 'Your email:' string translatable.Petter Reinholdtsen2015-05-23-1/+1
| |/ / / / / / /
* | | | | | | | Merge branch 'hotfix/0.21.0.32' into rails-3-developLouise Crow2015-05-26-2/+12
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | / / | | |_|_|_|/ / | |/| | | | |
| * | | | | | Bump alaveteli version0.21.0.32hotfix/0.21.0.32Louise Crow2015-05-26-1/+1
| | |_|_|_|/ | |/| | | |