aboutsummaryrefslogtreecommitdiffstats
path: root/lib
Commit message (Collapse)AuthorAgeLines
* Merge branch 'hotfix/0.8.0.1' into wdtkLouise Crow2013-04-02-1/+1
|\
| * Follow alphabetical ordering.Louise Crow2013-03-19-1/+1
| |
* | Merge branch 'release/0.8' into wdtkLouise Crow2013-03-19-10/+26
|\| | | | | | | | | | | Conflicts: app/controllers/admin_request_controller.rb app/views/contact_mailer/from_admin_message.rhtml
| * Allow the emergency user account to be disabled.Louise Crow2013-03-19-0/+1
| |
| * Merge remote-tracking branch ↵Louise Crow2013-03-13-0/+24
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'openaustralia_github/one_support_email_on_admin_attention_state' into develop Conflicts: Gemfile.lock app/controllers/request_controller.rb app/models/request_mailer.rb app/views/admin_general/index.rhtml spec/models/request_mailer_spec.rb
| | * Fix bug in rails 2 cookiestore that only shows up when using integration testsMatthew Landauer2013-03-06-0/+19
| | |
| | * Extract method that knows who can update the state of a requestMatthew Landauer2013-03-03-0/+5
| | |
| * | Merge remote-tracking branch 'openaustralia_github/force-ssl' into developLouise Crow2013-03-12-0/+1
| |\ \ | | | | | | | | | | | | | | | | Conflicts: Gemfile.lock
| | * | Add configuration to force ssl for the whole siteMatthew Landauer2013-02-15-0/+1
| | |/
| * | Remove monkeypatch that makes tag helper html4 compliantMatthew Landauer2013-03-07-8/+0
| | |
| * | Configurations ADMIN_BASE_URL and ADMIN_PUBLIC_URL are no longer used anywhereMatthew Landauer2013-02-15-2/+0
| |/
* | Merge branch 'release/0.7' into wdtkLouise Crow2013-02-14-42/+47
|\|
| * Simple task for converting .po files to a standard msgmerge format.Louise Crow2013-02-08-3/+12
| |
| * Merge remote-tracking branch ↵Louise Crow2013-02-01-1/+1
| |\ | | | | | | | | | 'openaustralia_github/backport_rails_3_mailer_fix' into develop
| | * Rename mailer method to avoid naming conflict in Rails 3Matthew Landauer2013-01-25-1/+1
| | |
| * | Calling TMail::Mail#base64_decode does not modify the mail object so doesn't ↵Matthew Landauer2013-01-28-10/+7
| |/ | | | | | | do anything as used here
| * Merge remote-tracking branch 'openaustralia_github/rails_xss' into developLouise Crow2013-01-16-25/+21
| |\
| | * Merge remote-tracking branch 'mysociety/develop' into rails_xssMatthew Landauer2013-01-15-9/+710
| | |\
| | * | 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
| | * | Fix translations with interpolations to correctly handle safe_htmlMatthew Landauer2013-01-15-3/+11
| | | |
| | * | Added comment about the syntax of the interpolations in the translationsMatthew Landauer2013-01-15-0/+4
| | | |
| | * | Revert "Assume the result of doing any translation is html_safe"Matthew Landauer2013-01-14-3/+1
| | | | | | | | | | | | | | | | This reverts commit 493e8e7ec43351952e2d7876afaede0cdb5d3644.
| | * | Make use_spans_for_errors monkey patch output html safe stringMatthew Landauer2013-01-03-1/+1
| | | |
| | * | 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
| | | |
| * | | Small comment edit in timezone_fixes to remind that this can be removed in ↵Matthew Landauer2013-01-16-1/+3
| | |/ | |/| | | | | | | Rails 3.x
| * | If we're not going to run the commonlib tests (and I think that's correct - ↵Louise Crow2012-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 perLouise Crow2012-12-18-0/+3
| | | | | | | | | | | | https://github.com/dchelimsky/rspec-rails/commit/be52a9841dde0292c7bc7ecfe39e7214b4db1cab
* | | Merge branch 'release/0.6.9' into wdtkLouise Crow2013-01-15-7/+707
|\| |
| * | Patch the parameter hash used in Mail to handle nil values.Louise Crow2012-12-06-0/+19
| | |
| * | Convert url in comment to spec.Louise Crow2012-12-06-0/+1
| | | | | | | | | | | | | | | | | | Conflicts: lib/mail_handler/backends/tmail_backend.rb
| * | Explicitly require the mail gem when using it as a backend.Louise Crow2012-12-06-0/+1
| | |
| * | Add functions for basic mail handling to the mail backend of mail handler.Louise Crow2012-12-06-0/+199
| | |
| * | Remove url in comment - has been converted to spec.Louise Crow2012-12-06-2/+0
| | |
| * | Convert example URL to spec.Louise Crow2012-12-06-3/+1
| | |
| * | Rename _get_attachment_text_internal_one_file to ↵Louise Crow2012-12-06-2/+2
| | | | | | | | | | | | get_attachment_text_one_file as it is now an externally-accessed method of the mail handler module.
| * | No real need for this to be an internal function.Louise Crow2012-12-06-2/+2
| | |
| * | Move methods for getting the text out of attachments to the mail handler module.Louise Crow2012-12-06-0/+101
| | |
| * | Patch the Message initialize method so that it doesn't strip the initial ↵Louise Crow2012-12-06-0/+39
| | | | | | | | | | | | input - trailing spaces can be meaningful.
| * | Convert address to string in the case where there's just an address.Louise Crow2012-12-05-1/+1
| | |
| * | Standardise on part as a param name, not mail_part.Louise Crow2012-12-05-4/+4
| | |
| * | Read and write to the file in binary mode during a TNEF conversion operation.Louise Crow2012-12-05-2/+2
| | |
| * | Remove redundant references to MailHandlerLouise Crow2012-12-05-3/+3
| | |
| * | Move mail-specific stuff to mail handler.Louise Crow2012-12-05-1/+46
| | |
| * | Add a wrapper method for get_attachment_leaves.Louise Crow2012-12-05-0/+8
| | |
| * | Fix typo.Louise Crow2012-12-05-1/+1
| | |
| * | Remove redundant references to MailHandler.Louise Crow2012-12-05-11/+11
| | |
| * | Move the getting of attachment leaves to the mail handler.Louise Crow2012-12-05-0/+88
| | |