Commit message (Collapse) | Author | Age | Lines | ||
---|---|---|---|---|---|
... | |||||
| * | | 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 | |
| | | |||||
* | | Write to the temp file in binary mode - we may be writing binary content, ↵ | Louise Crow | 2012-12-05 | -0/+1 | |
| | | | | | | | | such as a PDF file. | ||||
* | | Use the character set of the attachment to encode the string that we're ↵ | Louise Crow | 2012-12-05 | -0/+17 | |
| | | | | | | | | pulling out of the file before converting it to our default encoding. | ||||
* | | Move mail-specific stuff to mail handler. | Louise Crow | 2012-12-05 | -46/+1 | |
| | | |||||
* | | Separate mail-specific stuff from creation/update of model instances. | Louise Crow | 2012-12-05 | -8/+12 | |
| | | |||||
* | | Add a wrapper method for get_attachment_leaves. | Louise Crow | 2012-12-05 | -4/+1 | |
| | | |||||
* | | Move the getting of attachment leaves to the mail handler. | Louise Crow | 2012-12-05 | -90/+1 | |
| | | |||||
* | | Pass around mail object explicitly when getting attachment leaves. | Louise Crow | 2012-12-05 | -8/+8 | |
| | | |||||
* | | Move part counting to the mail handler. | Louise Crow | 2012-12-05 | -53/+7 | |
| | | |||||
* | | Pass explicit references to the mail when counting parts. | Louise Crow | 2012-12-05 | -13/+13 | |
| | | |||||
* | | Move counters to mail object. | Louise Crow | 2012-12-05 | -5/+5 | |
| | | |||||
* | | Move content type normalization to mail handler. | Louise Crow | 2012-12-05 | -27/+2 | |
| | | |||||
* | | Now that the underlying methods handle the case where there is no from field ↵ | Louise Crow | 2012-12-05 | -2/+2 | |
| | | | | | | | | content by returning nil, I don't think we need to rescue a NoMethodError - this would have originally been returned by calling spec on from_addrs[0] when it was nil. | ||||
* | | Use the binary_output option to have the strings returned by ↵ | Louise Crow | 2012-12-05 | -8/+17 | |
| | | | | | | | | AlaveteliExternalCommand be transcoded using the default internal and external encodings in Ruby 1.9. | ||||
* | | Use mail handler to get the content type of each email part. | Louise Crow | 2012-12-05 | -1/+1 | |
| | | |||||
* | | Rewrite spec to reflect delegation of low-level mail methods to mail ↵ | Louise Crow | 2012-12-04 | -6/+3 | |
| | | | | | | | | handler, use mail handler methods. | ||||
* | | Remove duplicate method that was masking what seems to be intended to be the ↵ | Louise Crow | 2012-12-04 | -30/+1 | |
| | | | | | | | | real valid_to_reply_to? method - which accesses cached values. Replacing the _calculate_valid_to_reply_to logic with the code that will have actually been running. |