aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeLines
* Remove memcached config files, references to memcached and interlock.Louise Crow2013-01-17-27/+0
|
* Remove leading space - seems to be causing test failures, although not a ↵Louise Crow2013-01-17-1/+1
| | | | problem in app itself.
* Fix typo.Louise Crow2013-01-17-1/+1
|
* Merge remote-tracking branch 'openaustralia_github/interlock' into developLouise Crow2013-01-17-10676/+74
|\
| * Remove interlock as it's not compatible with Rails 3 and is unmaintainedHenare Degan2013-01-18-10676/+74
|/
* Merge remote-tracking branch 'openaustralia_github/rails_xss' into developLouise Crow2013-01-16-114/+3043
|\
| * html escaping fixMatthew Landauer2013-01-15-1/+1
| |
| * Merge remote-tracking branch 'mysociety/develop' into rails_xssMatthew Landauer2013-01-15-7521/+7097
| |\
| * | 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
| | |
| * | html content of messages and comments are html safeMatthew Landauer2013-01-03-3/+3
| | |
| * | Escaping fixesMatthew Landauer2013-01-03-2/+6
| | |
| * | Escaping fixes involving the unpleasant mix of translations, html and string ↵Matthew Landauer2013-01-03-56/+56
| | | | | | | | | | | | interpolation
| * | Escaping fixesMatthew Landauer2013-01-03-2/+2
| | |
| * | Make use_spans_for_errors monkey patch output html safe stringMatthew Landauer2013-01-03-1/+1
| | |
| * | Escape error messages in foi_error_messages_forMatthew Landauer2013-01-03-3/+3
| | |
| * | Escaping fixesMatthew Landauer2013-01-03-4/+4
| | |
| * | Escaping fixesMatthew Landauer2013-01-02-2/+2
| | |
| * | Escaping fixesMatthew Landauer2013-01-02-3/+3
| | |
| * | Escaping fixMatthew Landauer2013-01-02-2/+2
| | |
| * | Assume the result of doing any translation is html_safeMatthew Landauer2013-01-02-1/+3
| | |
| * | Bring tag monkeypatch up to date with latest rails 2.3Matthew Landauer2013-01-02-2/+1
| | |
| * | Add rails_xss gemMatthew Landauer2013-01-02-0/+8
| | |
* | | Merge remote-tracking branch ↵Louise Crow2013-01-16-1/+3
|\ \ \ | | | | | | | | | | | | 'openaustralia_github/timezone_fixes_comment_edit' into develop
| * | | Small comment edit in timezone_fixes to remind that this can be removed in ↵Matthew Landauer2013-01-16-1/+3
| | |/ | |/| | | | | | | Rails 3.x
* | | Merge remote-tracking branch 'openaustralia_github/remove_mongrel_proctitle' ↵Louise Crow2013-01-16-169/+0
|\ \ \ | | | | | | | | | | | | into develop
| * | | Remove mongrel_proctitle plugin because the standard configuration now uses ↵Matthew Landauer2013-01-16-169/+0
| |/ / | | | | | | | | | passenger rather than mongrel
* | | Merge branch 'feature/standalone_cap_theme_install' into developLouise Crow2013-01-15-1/+1
|\ \ \
| * | | Allow cap rake:themes:install to be run standalone and in the context of a ↵Louise Crow2013-01-14-1/+1
| | | | | | | | | | | | | | | | deploy. According to https://github.com/capistrano/capistrano/blob/master/lib/capistrano/recipes/deploy.rb#L75 'latest_release' seems to fit the bill.
* | | | Even in development, bundle should be installed in the vendor directory. ↵Louise Crow2013-01-15-1/+4
| | | | | | | | | | | | | | | | Fixes #730. Capistrano-based deploys don't use rails-post-deploy, so I don't think this will be a problem for them.
* | | | Update lock to latest copy of rails - 2.3.15Louise Crow2013-01-15-2/+2
| | | |
* | | | Merge branch 'release/0.6.9' into developLouise Crow2013-01-15-23/+52
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | Conflicts: Gemfile.lock locale/cy/app.po
| * | | Try just specifying that rails should come from git, to avoid deprecation ↵Louise Crow2013-01-15-10/+0
| | | | | | | | | | | | | | | | warnings about "require 'actionmailer'" rather than "require 'action_mailer'" etc.
| * | | Add note on Rails security upgrades to change file.Louise Crow2013-01-15-0/+1
| | | |
| * | | Add updated Gemfile.lock after running bundle install.Louise Crow2013-01-15-10/+21
| | | |
| * | | Update Gemfile to use a security patched copy of rails from the mySociety ↵Louise Crow2013-01-15-1/+9
| | | | | | | | | | | | | | | | git repo
| * | | Latest translations pulled from Transifex.Louise Crow2013-01-14-11/+12
| | | |
| * | | Bump Alaveteli release number.Louise Crow2013-01-14-1/+1
| | | |
| * | | Latest translations pulled from Transifex to fix inadvertantly committed ↵Louise Crow2013-01-14-1250/+266
| | | | | | | | | | | | | | | | unmerged conflicted files.
generated by cgit v1.2.3 (git 2.25.1) at 2025-09-05 01:22:10 +0000