Commit message (Collapse) | Author | Age | Lines | ||
---|---|---|---|---|---|
... | |||||
* | | | See how we go not disabling this now | Henare Degan | 2013-03-03 | -21/+0 | |
| | | | |||||
* | | | Rename Configuration class to avoid conflict with ActiveSupport::Configurable | Henare Degan | 2013-03-03 | -10/+10 | |
| | | | |||||
* | | | Different class in newer version of will_paginate | Henare Degan | 2013-03-03 | -1/+1 | |
| | | | |||||
* | | | Revert "Update this to match the older version of the mail gem we're using" | Henare Degan | 2013-03-03 | -1/+2 | |
| | | | | | | | | | | | | This reverts commit b9a2d996408c1ef703aa78311f8c2a0f6e0d7afc. | ||||
* | | | Backport Mail 2.5's to_yaml to prevent an exception with Ruby 1.8 | Henare Degan | 2013-03-02 | -0/+22 | |
| | | | |||||
* | | | Backport newer Mail code to fix decoding problems. #850 | Henare Degan | 2013-03-02 | -0/+38 | |
| | | | |||||
* | | | Remove Tmail and use the Mail gem under Ruby 1.8.7 as well | Henare Degan | 2013-02-27 | -437/+4 | |
| | | | |||||
* | | | create_ is deprecated | Henare Degan | 2013-02-25 | -22/+22 | |
| | | | |||||
* | | | Our older version of Mail returns a different class so cast it to a String | Henare Degan | 2013-02-21 | -1/+1 | |
| | | | |||||
* | | | We're using an older version of Mail that returns a different class | Henare Degan | 2013-02-21 | -3/+3 | |
| | | | |||||
* | | | Merge branch 'develop' into rails-3-spike | Henare Degan | 2013-02-15 | -3/+12 | |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: Gemfile Gemfile.lock app/controllers/general_controller.rb app/controllers/track_controller.rb app/models/outgoing_message.rb app/models/public_body.rb app/models/user.rb app/views/general/frontpage.rhtml config/environment.rb config/initializers/inflections.rb config/initializers/mime_types.rb db/migrate/094_remove_old_tags_foreign_key.rb lib/timezone_fixes.rb spec/models/request_mailer_spec.rb spec/views/request/list.rhtml_spec.rb | ||||
| * | | Simple task for converting .po files to a standard msgmerge format. | Louise Crow | 2013-02-08 | -3/+12 | |
| | | | |||||
| * | | Merge remote-tracking branch ↵ | Louise Crow | 2013-02-01 | -1/+1 | |
| |\ \ | | | | | | | | | | | | | 'openaustralia_github/backport_rails_3_mailer_fix' into develop | ||||
| | * | | Rename mailer method to avoid naming conflict in Rails 3 | Matthew Landauer | 2013-01-25 | -1/+1 | |
| | |/ | |||||
| * / | Calling TMail::Mail#base64_decode does not modify the mail object so doesn't ↵ | Matthew Landauer | 2013-01-28 | -10/+7 | |
| |/ | | | | | | | do anything as used here | ||||
| * | Merge remote-tracking branch 'openaustralia_github/rails_xss' into develop | Louise Crow | 2013-01-16 | -25/+21 | |
| |\ | |||||
| * | | Small comment edit in timezone_fixes to remind that this can be removed in ↵ | Matthew Landauer | 2013-01-16 | -1/+3 | |
| | | | | | | | | | | | | Rails 3.x | ||||
* | | | Update this to match the older version of the mail gem we're using | Henare Degan | 2013-02-10 | -3/+2 | |
| | | | |||||
* | | | Remove rack_quote_monkeypatch because it should not be needed in Rails 3 | Matthew Landauer | 2013-01-29 | -65/+0 | |
| | | | |||||
* | | | Calling TMail::Mail#base64_decode does not modify the mail object so doesn't ↵ | Matthew Landauer | 2013-01-28 | -10/+7 | |
| | | | | | | | | | | | | do anything as used here | ||||
* | | | Merge branch 'rails_xss' into rails-3-spike | Matthew Landauer | 2013-01-25 | -27/+20 | |
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | Conflicts: Gemfile Gemfile.lock config/environment.rb lib/i18n_fixes.rb | ||||
| * | | Merge remote-tracking branch 'mysociety/develop' into rails_xss | Matthew Landauer | 2013-01-15 | -9/+710 | |
| |\| | |||||
| | * | If we're not going to run the commonlib tests (and I think that's correct - ↵ | Louise Crow | 2012-12-18 | -2/+0 | |
| | | | | | | | | | | | | they belong in commonlib and should only be run when commonlib is changed), then don't load them. Allows us not to include the rspec gem in production. | ||||
| | * | Include Rake::DSL module manually to avoid deprecation warnings as per | Louise Crow | 2012-12-18 | -0/+3 | |
| | | | | | | | | | | | | https://github.com/dchelimsky/rspec-rails/commit/be52a9841dde0292c7bc7ecfe39e7214b4db1cab | ||||
| * | | Removed reserved keys in gettext_interpolation because they were unused and ↵ | Matthew Landauer | 2013-01-15 | -4/+1 | |
| | | | | | | | | | | | | untested | ||||
| * | | There's no way that gettext_interpolate would work when not passed a hash - ↵ | Matthew Landauer | 2013-01-15 | -25/+15 | |
| | | | | | | | | | | | | untested and unused. So removing. | ||||
| * | | Remove escaping of code in gettext_interpolation because it's not used and ↵ | Matthew Landauer | 2013-01-15 | -5/+3 | |
| | | | | | | | | | | | | not tested | ||||
| * | | Fix translations with interpolations to correctly handle safe_html | Matthew Landauer | 2013-01-15 | -3/+11 | |
| | | | |||||
| * | | Added comment about the syntax of the interpolations in the translations | Matthew Landauer | 2013-01-15 | -0/+4 | |
| | | | |||||
| * | | Revert "Assume the result of doing any translation is html_safe" | Matthew Landauer | 2013-01-14 | -3/+1 | |
| | | | | | | | | | | | | This reverts commit 493e8e7ec43351952e2d7876afaede0cdb5d3644. | ||||
* | | | In rails 3 sendmail is passed the destination of the email on the ↵ | Matthew Landauer | 2013-01-25 | -21/+0 | |
| | | | | | | | | | | | | commandline. Also, monkeypatch not needed anymore | ||||
* | | | Rename mailer method to avoid naming conflict in Rails 3 | Matthew Landauer | 2013-01-25 | -1/+1 | |
| | | | |||||
* | | | Remove timezone monkeypatch fixes because they're not necessary in Rails 3 ↵ | Matthew Landauer | 2013-01-25 | -26/+0 | |
| | | | | | | | | | | | | anymore | ||||
* | | | Small comment edit in timezone_fixes to remind that this can be removed in ↵ | Matthew Landauer | 2013-01-25 | -1/+3 | |
| | | | | | | | | | | | | Rails 3.x | ||||
* | | | Fix path to main configuration file. How did this ever work before? | Matthew Landauer | 2013-01-25 | -2/+2 | |
| | | | |||||
* | | | Merge branch 'rails_xss' into rails-3-spike | Matthew Landauer | 2013-01-04 | -3/+2 | |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: Gemfile Gemfile.lock app/views/request/_hidden_correspondence.rhtml app/views/request/hidden.rhtml app/views/request/new_please_describe.rhtml app/views/user/show.rhtml lib/i18n_fixes.rb | ||||
| * | | Make use_spans_for_errors monkey patch output html safe string | Matthew Landauer | 2013-01-03 | -1/+1 | |
| | | | |||||
| * | | Assume the result of doing any translation is html_safe | Matthew Landauer | 2013-01-02 | -1/+3 | |
| | | | |||||
| * | | Bring tag monkeypatch up to date with latest rails 2.3 | Matthew Landauer | 2013-01-02 | -2/+1 | |
| | | | |||||
* | | | RSpec Rake tasks now live in the gem | Henare Degan | 2012-12-11 | -147/+0 | |
| | | | |||||
* | | | Mark translations as html_safe | Henare Degan | 2012-12-11 | -1/+5 | |
| | | | |||||
* | | | Move Rails config over | Henare Degan | 2012-12-11 | -0/+10 | |
| | | | |||||
* | | | I don't think we need to support Lenny any more | Henare Degan | 2012-12-11 | -46/+0 | |
| | | | |||||
* | | | Run the Rails 3 generator | Henare Degan | 2012-12-11 | -0/+0 | |
| |/ |/| | |||||
* | | Patch the parameter hash used in Mail to handle nil values. | Louise Crow | 2012-12-06 | -0/+19 | |
| | | |||||
* | | Convert url in comment to spec. | Louise Crow | 2012-12-06 | -0/+1 | |
| | | | | | | | | | | | | Conflicts: lib/mail_handler/backends/tmail_backend.rb | ||||
* | | Explicitly require the mail gem when using it as a backend. | Louise Crow | 2012-12-06 | -0/+1 | |
| | | |||||
* | | Add functions for basic mail handling to the mail backend of mail handler. | Louise Crow | 2012-12-06 | -0/+199 | |
| | | |||||
* | | Remove url in comment - has been converted to spec. | Louise Crow | 2012-12-06 | -2/+0 | |
| | | |||||
* | | Convert example URL to spec. | Louise Crow | 2012-12-06 | -3/+1 | |
| | |