aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeLines
* Fix indentation onlyHenare Degan2013-01-27-6/+6
|
* This API seems to have changed so just check if there's a bodyHenare Degan2013-01-27-1/+1
|
* Don't need both url_helpersHenare Degan2013-01-25-1/+0
|
* Overwriting validate has been deprecatedHenare Degan2013-01-25-9/+12
|
* path helper should be html safe and fix up view test for rspec 2Matthew Landauer2013-01-25-4/+4
|
* Remove rails_xss pluginMatthew Landauer2013-01-25-2887/+0
|
* Merge branch 'rails_xss' into rails-3-spikeMatthew Landauer2013-01-25-577/+4160
|\ | | | | | | | | | | | | | | Conflicts: Gemfile Gemfile.lock config/environment.rb lib/i18n_fixes.rb
| * html escaping fixMatthew Landauer2013-01-15-1/+1
| |
| * Merge remote-tracking branch 'mysociety/develop' into rails_xssMatthew Landauer2013-01-15-7521/+7097
| |\
| | * As we're validating filename with validates_presence_of, which doesn't allow ↵Louise Crow2013-01-14-2/+13
| | | | | | | | | | | | blanks, ensure_filename! should populate a default filename on a blank filename, as well as on nil.
| | * Latest translations pulled from Transifex to fix inadvertantly committed ↵Louise Crow2013-01-09-1250/+266
| | | | | | | | | | | | unmerged conflicted files.
| | * Merge branch 'hotfix/0.6.8.3' into developLouise Crow2013-01-09-21/+1649
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: Gemfile.lock locale/ar/app.po locale/cs/app.po locale/cy/app.po locale/en_IE/app.po locale/es/app.po locale/pt_BR/app.po
| | | * Security update for newrelichotfix/0.6.8.3Louise Crow2013-01-09-1/+1
| | | |
| | | * Rails security update.Louise Crow2013-01-09-20/+21
| | | |
| | | * Merge branch 'hotfix/0.6.8-last-translations'Louise Crow2012-12-18-174/+4089
| | | |\
| | | | * Latest translations from Transifex.Louise Crow2012-12-18-174/+4089
| | | |/
| | | * Merge branch 'hotfix/authenticate-and-expire-download-zips'0.6.8.2Louise Crow2012-12-13-13/+67
| | | |\
| | * | | Don't export the fake authorities that we use for admin.Louise Crow2013-01-08-0/+2
| | | | |
| | * | | Handle case where info request doesn't have a user_nameLouise Crow2013-01-07-0/+8
| | | | |
| * | | | Removed reserved keys in gettext_interpolation because they were unused and ↵Matthew Landauer2013-01-15-4/+1
| | | | | | | | | | | | | | | | | | | | untested
| * | | | There's no way that gettext_interpolate would work when not passed a hash - ↵Matthew Landauer2013-01-15-25/+15
| | | | | | | | | | | | | | | | | | | | untested and unused. So removing.
| * | | | Remove escaping of code in gettext_interpolation because it's not used and ↵Matthew Landauer2013-01-15-5/+3
| | | | | | | | | | | | | | | | | | | | not tested
| * | | | More escaping fixesMatthew Landauer2013-01-15-4/+4
| | | | |
| * | | | Fix translations with interpolations to correctly handle safe_htmlMatthew Landauer2013-01-15-3/+49
| | | | |
| * | | | Added comment about the syntax of the interpolations in the translationsMatthew Landauer2013-01-15-0/+4
| | | | |
| * | | | More small html escaping fixesMatthew Landauer2013-01-15-2/+2
| | | | |
| * | | | Don't escape text emailsMatthew Landauer2013-01-15-1/+1
| | | | |
| * | | | Layouts for text emails should not escape their contentsMatthew Landauer2013-01-15-4/+4
| | | | |
| * | | | Switch from unofficial rails_xss gem to official rails plugin for rails_xssMatthew Landauer2013-01-15-5/+2888
| | | | |
| * | | | Revert "Assume the result of doing any translation is html_safe"Matthew Landauer2013-01-14-3/+1
| | | | | | | | | | | | | | | | | | | | This reverts commit 493e8e7ec43351952e2d7876afaede0cdb5d3644.
| * | | | Revert "Switched to a forked version of rails_xss that includes a fix we need"Matthew Landauer2013-01-14-9/+3
| | | | | | | | | | | | | | | | | | | | This reverts commit 0f0b36c8883605dbe0cfc663a7b046f3a1a8d196.
| * | | | Switched to a forked version of rails_xss that includes a fix we needHenare Degan2013-01-14-3/+9
| | | | |
* | | | | In rails 3 sendmail is passed the destination of the email on the ↵Matthew Landauer2013-01-25-23/+6
| | | | | | | | | | | | | | | | | | | | commandline. Also, monkeypatch not needed anymore
* | | | | Rename mailer method to avoid naming conflict in Rails 3Matthew Landauer2013-01-25-5/+5
| | | | |
* | | | | Remove timezone monkeypatch fixes because they're not necessary in Rails 3 ↵Matthew Landauer2013-01-25-27/+5
| | | | | | | | | | | | | | | | | | | | anymore
* | | | | read_attribute does timezone conversion in rails 3. So using ↵Matthew Landauer2013-01-25-13/+8
| | | | | | | | | | | | | | | | | | | | attributes_before_type_cast instead
* | | | | Small comment edit in timezone_fixes to remind that this can be removed in ↵Matthew Landauer2013-01-25-1/+3
| | | | | | | | | | | | | | | | | | | | Rails 3.x
* | | | | Copied load_test_categories from rspec 2 to rspec 3 helper fileMatthew Landauer2013-01-25-0/+8
| | | | |
* | | | | Temporarily commented out some ExceptionNotification setup code that was ↵Matthew Landauer2013-01-25-4/+6
| | | | | | | | | | | | | | | | | | | | causing problems in the test
* | | | | Disable routing filter in tests by using RoutingFilter.active rather than ↵Matthew Landauer2013-01-25-27/+18
| | | | | | | | | | | | | | | | | | | | writing to ActionController::Routing::Routes.filters
* | | | | Fix path to main configuration file. How did this ever work before?Matthew Landauer2013-01-25-2/+2
| | | | |
* | | | | globalize3 had a bug that affects us so temporarily switch to a forkHenare Degan2013-01-24-6/+13
| | | | |
* | | | | Change method name as it conflicts with globalize3 method nameHenare Degan2013-01-24-3/+3
| | | | |
* | | | | bundle update globalize3Henare Degan2013-01-24-3/+3
| | | | |
* | | | | Remove Rails 2 scriptsHenare Degan2013-01-24-24/+0
| | | | |
* | | | | Oops. accidently deleted file in last commitMatthew Landauer2013-01-23-0/+1
| | | | |
* | | | | Fixes to ApplicationMailer tests in Rails 3Matthew Landauer2013-01-23-16/+11
| | | | |
* | | | | Fix deprecation warningsHenare Degan2013-01-23-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | * Errors#on have been deprecated * Errors#[] now always returns an Array
* | | | | Change syntax - this looks like a test to meHenare Degan2013-01-23-1/+1
| | | | |
* | | | | In 447e4af we started adding the error to each attribute so start testing eachHenare Degan2013-01-23-4/+10
| | | | |