Commit message (Collapse) | Author | Age | Lines | |
---|---|---|---|---|
* | Merge branch 'develop' into rails-3-spike | Henare Degan | 2013-02-15 | -117/+134 |
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | |||
| * | Add a check for a request user so that external requests (which have no ↵ | Louise Crow | 2013-02-12 | -1/+1 |
| | | | | | | | | associated user object) don't result in the text 'this is your own request' when viewed by a user who isn't logged in (no user in the session). | |||
| * | Don't escape link html on foi email display page | Matthew Landauer | 2013-02-11 | -2/+2 |
| | | ||||
| * | Don't escape links that are automatically added in user bios | Matthew Landauer | 2013-02-11 | -1/+2 |
| | | ||||
| * | Restore old trailing whitespace so no need for any change to translation files. | Louise Crow | 2013-02-08 | -2/+2 |
| | | ||||
| * | Use helper method which handles external requests without user accounts when ↵ | Louise Crow | 2013-02-08 | -5/+5 |
| | | | | | | | | displaying lists of info request events on a user's wall. | |||
| * | Mark constructed URL strings which have been escaped as safe, so that they ↵ | Louise Crow | 2013-02-08 | -4/+5 |
| | | | | | | | | aren't escaped when shown in flash notices. | |||
| * | Mark popup banner as html_safe | Louise Crow | 2013-02-08 | -1/+1 |
| | | ||||
| * | Mark flash string with markup in it as html safe. | Louise Crow | 2013-02-08 | -1/+1 |
| | | ||||
| * | Use raw on text with markup in it. | Louise Crow | 2013-02-08 | -3/+3 |
| | | ||||
| * | Mark flash with markup in it as html safe. | Louise Crow | 2013-02-08 | -1/+1 |
| | | ||||
| * | Merge remote-tracking branch 'openaustralia_github/more_escaping_fixes' into ↵ | Louise Crow | 2013-02-07 | -6/+6 |
| |\ | | | | | | | | | | develop | |||
| | * | Fix escaping of raw email display in admin interface | Matthew Landauer | 2013-02-07 | -1/+1 |
| | | | ||||
| | * | Fix calendar picker on request search page | Matthew Landauer | 2013-02-07 | -5/+5 |
| | | | ||||
| * | | Merge remote-tracking branch ↵ | Louise Crow | 2013-02-07 | -1/+0 |
| |\ \ | | |/ | |/| | | | | 'openaustralia_github/email_fix_on_contact_page' into develop | |||
| | * | Fix email link on contact page after escaping changes | Matthew Landauer | 2013-02-07 | -1/+0 |
| | | | ||||
| * | | Rescue an invalid character exception when handling what appears to be badly ↵ | Louise Crow | 2013-02-06 | -1/+1 |
| | | | | | | | | | | | | encoded data. | |||
| * | | Merge remote-tracking branch ↵ | Louise Crow | 2013-02-01 | -2/+2 |
| |\ \ | | | | | | | | | | | | | 'openaustralia_github/backport_rails_3_mailer_fix' into develop | |||
| | * | | Rename mailer method to avoid naming conflict in Rails 3 | Matthew Landauer | 2013-01-25 | -2/+2 |
| | | | | ||||
| * | | | Merge remote-tracking branch 'openaustralia_github/model-deprecations' into ↵ | Louise Crow | 2013-02-01 | -66/+85 |
| |\ \ \ | | | | | | | | | | | | | | | | develop | |||
| | * | | | AboutMeValidator model - Overwriting validate is deprecated in Rails 3 | Henare Degan | 2013-01-25 | -2/+6 |
| | | | | | ||||
| | * | | | PublicBody model - Overwriting validate is deprecated in Rails 3 | Henare Degan | 2013-01-25 | -9/+10 |
| | | | | | ||||
| | * | | | OutgoingMessage model - Overwriting validate is deprecated in Rails 3 | Henare Degan | 2013-01-25 | -26/+28 |
| | | | | | ||||
| | * | | | Indentation and spacing fixes only | Henare Degan | 2013-01-25 | -4/+6 |
| | | | | | ||||
| | * | | | Formatting only: Group associations and validations | Henare Degan | 2013-01-25 | -4/+3 |
| | | | | | ||||
| | * | | | Comment model - Overwriting validate is deprecated in Rails 3 | Henare Degan | 2013-01-25 | -10/+12 |
| | | | | | ||||
| | * | | | ChangeEmailValidator model - Overwriting validate is deprecated in Rails 3 | Henare Degan | 2013-01-25 | -1/+4 |
| | | | | | ||||
| | * | | | ProfilePhoto model - Overwriting validate is deprecated in Rails 3 | Henare Degan | 2013-01-25 | -1/+5 |
| | | | | | ||||
| | * | | | User model - Overwriting validate is deprecated in Rails 3 | Henare Degan | 2013-01-25 | -9/+11 |
| | | | | | ||||
| * | | | | Try to be a little nicer by setting the correct content_type for the atom feed | Matthew Landauer | 2013-02-01 | -1/+1 |
| | | | | | ||||
| * | | | | Replace use of builder with plain erb because builder is escaping ↵ | Matthew Landauer | 2013-02-01 | -25/+30 |
| | | | | | | | | | | | | | | | | | | | | *everything* with rails_xss | |||
| * | | | | Mark output of highlight_words helper as html_safe | Matthew Landauer | 2013-02-01 | -1/+1 |
| | | | | | ||||
| * | | | | Small refactor to make method more concise | Matthew Landauer | 2013-02-01 | -6/+3 |
| | |_|/ | |/| | | ||||
| * | | | Don't depend on javascript for button to do a post. More semantic | Matthew Landauer | 2013-01-28 | -1/+1 |
| |/ / | ||||
| * / | Add some notes about the contexts in which this fragment for translation ↵ | Louise Crow | 2013-01-23 | -11/+16 |
| |/ | | | | | | | | | | | will be used. N.B. Any comment before a translated string that starts with will be included in the .po files (and visible under the 'Details' heading for the string in Transifex), so we should use these comments liberally to help translators understand the context in which text appears. In the longer term, we should move to using whole sentences rather than fragments - the effects of context will vary across languages, and what will work in English as an independent phrase will require sentence context in another language. | |||
| * | Remove leading space - seems to be causing test failures, although not a ↵ | Louise Crow | 2013-01-17 | -1/+1 |
| | | | | | | | | problem in app itself. | |||
| * | Fix typo. | Louise Crow | 2013-01-17 | -1/+1 |
| | | ||||
| * | Remove interlock as it's not compatible with Rails 3 and is unmaintained | Henare Degan | 2013-01-18 | -84/+74 |
| | | ||||
* | | Remove RSpec version from debug page as it's not available in production | Henare Degan | 2013-02-14 | -2/+0 |
| | | ||||
* | | Looks like this is different in the older version of Mail too | Henare Degan | 2013-02-10 | -1/+1 |
| | | ||||
* | | Use path to partial so it works in view tests | Henare Degan | 2013-02-07 | -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 | |||
* | | Another hack to manually stitch together a fake email using tmail | Matthew Landauer | 2013-02-01 | -1/+27 |
| | | ||||
* | | Handling of globbed parameters in routes has changed | Matthew Landauer | 2013-02-01 | -0/+1 |
| | | ||||
* | | Directly construct tmail object from body and attachments. Ugh. Because ↵ | Matthew Landauer | 2013-01-31 | -2/+22 |
| | | | | | | | | actionmailer uses mail under the hood | |||
* | | Added a bit of a safety net. It's an ugly temporary hack to make debugging ↵ | Matthew Landauer | 2013-01-31 | -0/+8 |
| | | | | | | | | easier | |||
* | | Globbing in routes is slightly different in Rails 3 | Matthew Landauer | 2013-01-31 | -1/+1 |
| | | ||||
* | | There's really no need to test the internals of Rails | Matthew Landauer | 2013-01-31 | -3/+7 |
| | |