Commit message (Collapse) | Author | Age | Lines | |
---|---|---|---|---|
* | Looks like this is different in the older version of Mail too | Henare Degan | 2013-02-10 | -1/+1 |
| | ||||
* | #errors always returns an array now so check for an empty one instead | Henare Degan | 2013-02-07 | -2/+2 |
| | ||||
* | Update to globalize3 method | Henare Degan | 2013-02-07 | -1/+1 |
| | ||||
* | Move over to rails 3 mail api because there appear to be problems with ↵ | Matthew Landauer | 2013-02-01 | -10/+10 |
| | | | | sending attachments | |||
* | Added a bit of a safety net. It's an ugly temporary hack to make debugging ↵ | Matthew Landauer | 2013-01-31 | -0/+8 |
| | | | | easier | |||
* | Merge branch 'i18n_rails3_preparation' into rails-3-spike | Matthew Landauer | 2013-01-31 | -10/+4 |
|\ | | | | | | | | | | | | | | | Conflicts: Gemfile.lock app/controllers/general_controller.rb app/controllers/public_body_controller.rb spec/controllers/public_body_controller_spec.rb | |||
| * | As much as possible use I18n.locale for getting the locale | Matthew Landauer | 2013-01-17 | -2/+2 |
| | | ||||
| * | Small refactor | Matthew Landauer | 2013-01-17 | -6/+1 |
| | | ||||
| * | Refactor using I18.with_locale | Matthew Landauer | 2013-01-17 | -4/+3 |
| | | ||||
| * | Set locale with I18n rather than through globalize | Matthew Landauer | 2013-01-17 | -4/+4 |
| | | ||||
| * | Small refactoring in PublicBody.self.find_by_url_name_with_historic just use ↵ | Matthew Landauer | 2013-01-16 | -22/+19 |
| | | | | | | | | the current locale | |||
| * | Set locale in controller test by passing parameter in get | Matthew Landauer | 2013-01-16 | -1/+1 |
| | | | | | | | | Also using I18n.locale to pass the current locale around. | |||
* | | Workaround for setting default value on attribute when exists? is called | Matthew Landauer | 2013-01-29 | -2/+7 |
| | | ||||
* | | Don't need both url_helpers | Henare Degan | 2013-01-25 | -1/+0 |
| | | ||||
* | | Overwriting validate has been deprecated | Henare Degan | 2013-01-25 | -9/+12 |
| | | ||||
* | | Merge branch 'rails_xss' into rails-3-spike | Matthew Landauer | 2013-01-25 | -5/+8 |
|\ \ | | | | | | | | | | | | | | | | | | | | | | 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 | -412/+142 |
| |\| | ||||
| | * | As we're validating filename with validates_presence_of, which doesn't allow ↵ | Louise Crow | 2013-01-14 | -1/+1 |
| | | | | | | | | | | | | blanks, ensure_filename! should populate a default filename on a blank filename, as well as on nil. | |||
| | * | Don't export the fake authorities that we use for admin. | Louise Crow | 2013-01-08 | -0/+2 |
| | | | ||||
| | * | Handle case where info request doesn't have a user_name | Louise Crow | 2013-01-07 | -0/+1 |
| | | | ||||
| * | | More escaping fixes | Matthew Landauer | 2013-01-15 | -4/+4 |
| | | | ||||
* | | | Rename mailer method to avoid naming conflict in Rails 3 | Matthew Landauer | 2013-01-25 | -1/+1 |
| | | | ||||
* | | | Change method name as it conflicts with globalize3 method name | Henare Degan | 2013-01-24 | -1/+1 |
| | | | ||||
* | | | Update one method in RequestMailer to new mailer rails 3 api | Matthew Landauer | 2013-01-04 | -6/+8 |
| | | | ||||
* | | | PublicBody.locale doesn't exist anymore | Matthew Landauer | 2013-01-04 | -2/+2 |
| | | | ||||
* | | | Temporary hack to disable mailer monkeypatch for overriding multipart mail ↵ | Matthew Landauer | 2013-01-04 | -7/+9 |
| | | | | | | | | | | | | templates in themes | |||
* | | | Activerecord 3 small api change for find_or_create_by | Matthew Landauer | 2013-01-04 | -1/+1 |
| | | | ||||
* | | | Merge branch 'rails_xss' into rails-3-spike | Matthew Landauer | 2013-01-04 | -4/+4 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | |||
| * | | html content of messages and comments are html safe | Matthew Landauer | 2013-01-03 | -3/+3 |
| | | | ||||
| * | | Escaping fixes | Matthew Landauer | 2013-01-03 | -1/+1 |
| | | | ||||
* | | | Overwriting validate_on_create in your models has been deprecated | Henare Degan | 2012-12-12 | -13/+15 |
| | | | ||||
* | | | We don't need to specify the attribute again | Henare Degan | 2012-12-12 | -1/+1 |
| | | | | | | | | | | | | Makes FoiAttachment model specs pass | |||
* | | | Overwriting validate in your models has been deprecated | Henare Degan | 2012-12-12 | -3/+5 |
| | | | | | | | | | | | | User model specs now pass with no deprecation warnings | |||
* | | | Errors#add_to_base(msg) has been deprecated, use Errors#add(:base, msg) instead | Henare Degan | 2012-12-12 | -2/+2 |
| | | | ||||
* | | | Overwriting validate in your models has been deprecated | Henare Degan | 2012-12-12 | -9/+11 |
| | | | ||||
* | | | Add the error to each attribute which would display the error next to each ↵ | Henare Degan | 2012-12-11 | -1/+3 |
| | | | | | | | | | | | | input field | |||
* | | | REVERT ME: Disabling some things during the upgrade so the test server can boot | Henare Degan | 2012-12-11 | -4/+5 |
| | | | ||||
* | | | Method-style callbacks are deprecated for after_initialize | Henare Degan | 2012-12-11 | -57/+74 |
| | | | ||||
* | | | include ActionController::UrlWriter is deprecated | Henare Degan | 2012-12-11 | -1/+1 |
| | | | ||||
* | | | named_scope has been renamed to scope | Henare Degan | 2012-12-11 | -5/+5 |
| | | | ||||
* | | | The with_locale has been removed in Globalize3 | Henare Degan | 2012-12-11 | -26/+23 |
| | | | | | | | | | | | | | | | | | | I think Globalize is supposed to pick up the locale from I18n anyway so I don't know if these are needed. I think I still haven't done the right thing but it's time to move on. | |||
* | | | Switch to new method name | Henare Degan | 2012-12-11 | -5/+5 |
| |/ |/| | ||||
* | | Add alternative sanitization for Ruby 1.9 | Louise Crow | 2012-12-06 | -23/+57 |
| | | ||||
* | | Convert url in comment to spec. | Louise Crow | 2012-12-06 | -1/+0 |
| | | | | | | | | | | | | Conflicts: lib/mail_handler/backends/tmail_backend.rb | |||
* | | Update comments to reflect the fact that text is coming from an foi ↵ | Louise Crow | 2012-12-06 | -3/+4 |
| | | | | | | | | attachment model, and hasn't necessarily been handled by TMail. | |||
* | | Reformat for line length. | Louise Crow | 2012-12-06 | -1/+3 |
| | | ||||
* | | Rename _get_attachment_text_internal_one_file to ↵ | Louise Crow | 2012-12-06 | -2/+3 |
| | | | | | | | | get_attachment_text_one_file as it is now an externally-accessed method of the mail handler module. | |||
* | | Move methods for getting the text out of attachments to the mail handler module. | Louise Crow | 2012-12-06 | -100/+2 |
| | | ||||
* | | Only make a tempfile etc if we're actually going to use it. Keep the body ↵ | Louise Crow | 2012-12-06 | -20/+30 |
| | | | | | | | | | | | | | | | | call outside the Chdir block - sometimes getting the body may involve opening files too. Conflicts: app/models/foi_attachment.rb | |||
* | | Standard indent. | Louise Crow | 2012-12-06 | -4/+4 |
| | |