Commit message (Collapse) | Author | Age | Lines | |
---|---|---|---|---|
* | Fix email link on contact page after escaping changes | Matthew Landauer | 2013-02-07 | -1/+0 |
| | ||||
* | Merge branch 'hotfix/0.6.9.2' into develop | Louise Crow | 2013-01-29 | -20/+20 |
|\ | | | | | | | | | Conflicts: Gemfile.lock | |||
| * | Upgrade Rails to version 2.3.16 to get fix for CVE-2013-0333.hotfix/0.6.9.2 | Louise Crow | 2013-01-29 | -20/+20 |
| | | ||||
| * | Update lock to latest copy of rails - 2.3.150.6.9.10.6.9 | Louise Crow | 2013-01-15 | -2/+2 |
| | | ||||
| * | Merge branch 'release/0.6.9' | Louise Crow | 2013-01-15 | -7761/+3529 |
| |\ | ||||
| * \ | Merge branch 'hotfix/0.6.8.3'0.6.8.3 | Louise Crow | 2013-01-09 | -21/+22 |
| |\ \ | ||||
* | | | | Remove FF button padding, use linear gradient for gradient on buttons in ↵ | Louise Crow | 2013-01-28 | -2/+21 |
| | | | | | | | | | | | | | | | | browsers that support it - with image backgrounds, we get tied up in issues about the line-height of input elements, which FF sets using !important. Fixes https://github.com/mysociety/whatdotheyknow-theme/issues/53 | |||
* | | | | Merge remote-tracking branch 'openaustralia_github/more_semantic_button' ↵ | Louise Crow | 2013-01-28 | -1/+1 |
|\ \ \ \ | | | | | | | | | | | | | | | | into develop | |||
| * | | | | 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. | |||
* | | | | Add some general tips for translation, note that we're not actually using ↵ | Louise Crow | 2013-01-23 | -0/+15 |
| | | | | | | | | | | | | | | | | the model attribute translations at the moment. | |||
* | | | | Merge remote-tracking branch 'njenkins_github/permalink_focus' into develop | Louise Crow | 2013-01-23 | -1/+2 |
|\ \ \ \ | ||||
| * | | | | WDTK-256- Link to this widget retain permalink focus | Nathan Jenkins | 2013-01-23 | -1/+2 |
|/ / / / | ||||
* | | | | Merge branch 'feature/db-migration-rails-3-prep' into develop | Louise Crow | 2013-01-22 | -4/+3 |
|\ \ \ \ | ||||
| * | | | | Drop the obsolete indexes explicitly by name - the 'remove_index' calls ↵ | Louise Crow | 2013-01-17 | -4/+2 |
| | | | | | | | | | | | | | | | | | | | | don't work as the table has been renamed, and they automatically generate the index name from the table name. Apply custom index name from a5e90e2b7ea6adedbf80c05bbb84425a02c63da0. | |||
| * | | | | Merge remote-tracking branch 'openaustralia_github/db_migration' into develop | Louise Crow | 2013-01-17 | -3/+4 |
| |\ \ \ \ | ||||
| | * | | | | Fix up some DB migration issues with Rails 3 | Henare Degan | 2013-01-18 | -3/+4 |
| |/ / / / | | | | | | | | | | | | | | | | | | | | | * The public_body_tags table had already been removed * The index has_tag_string_tags generated a name longer than the Postgres maximum of 63 characters. It was ignored in earlier Rails versions, see: https://rails.lighthouseapp.com/projects/8994/tickets/6187-postgresql-and-rails-303-migrations-fail-with-index-name-length-64-chars | |||
* | | | | | Merge branch 'feature/remove-memcached-and-interlock-references' into develop | Louise Crow | 2013-01-21 | -27/+0 |
|\ \ \ \ \ | ||||
| * | | | | | Remove memcached config files, references to memcached and interlock. | Louise Crow | 2013-01-17 | -27/+0 |
|/ / / / / | ||||
* | | | | | 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 |
| | | | | | ||||
* | | | | | Merge remote-tracking branch 'openaustralia_github/interlock' into develop | Louise Crow | 2013-01-17 | -10676/+74 |
|\ \ \ \ \ | |/ / / / |/| | | | | ||||
| * | | | | Remove interlock as it's not compatible with Rails 3 and is unmaintained | Henare Degan | 2013-01-18 | -10676/+74 |
|/ / / / | ||||
* | | | | Merge remote-tracking branch 'openaustralia_github/rails_xss' into develop | Louise Crow | 2013-01-16 | -114/+3043 |
|\ \ \ \ | ||||
| * | | | | html escaping fix | Matthew Landauer | 2013-01-15 | -1/+1 |
| | | | | | ||||
| * | | | | Merge remote-tracking branch 'mysociety/develop' into rails_xss | Matthew Landauer | 2013-01-15 | -7521/+7097 |
| |\ \ \ \ | ||||
| * | | | | | 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 | |||
| * | | | | | More escaping fixes | Matthew Landauer | 2013-01-15 | -4/+4 |
| | | | | | | ||||
| * | | | | | Fix translations with interpolations to correctly handle safe_html | Matthew Landauer | 2013-01-15 | -3/+49 |
| | | | | | | ||||
| * | | | | | Added comment about the syntax of the interpolations in the translations | Matthew Landauer | 2013-01-15 | -0/+4 |
| | | | | | | ||||
| * | | | | | More small html escaping fixes | Matthew Landauer | 2013-01-15 | -2/+2 |
| | | | | | | ||||
| * | | | | | Don't escape text emails | Matthew Landauer | 2013-01-15 | -1/+1 |
| | | | | | | ||||
| * | | | | | Layouts for text emails should not escape their contents | Matthew Landauer | 2013-01-15 | -4/+4 |
| | | | | | | ||||
| * | | | | | Switch from unofficial rails_xss gem to official rails plugin for rails_xss | Matthew Landauer | 2013-01-15 | -5/+2888 |
| | | | | | | ||||
| * | | | | | Revert "Assume the result of doing any translation is html_safe" | Matthew Landauer | 2013-01-14 | -3/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 493e8e7ec43351952e2d7876afaede0cdb5d3644. | |||
| * | | | | | Revert "Switched to a forked version of rails_xss that includes a fix we need" | Matthew Landauer | 2013-01-14 | -9/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 0f0b36c8883605dbe0cfc663a7b046f3a1a8d196. | |||
| * | | | | | Switched to a forked version of rails_xss that includes a fix we need | Henare Degan | 2013-01-14 | -3/+9 |
| | | | | | | ||||
| * | | | | | html content of messages and comments are html safe | Matthew Landauer | 2013-01-03 | -3/+3 |
| | | | | | | ||||
| * | | | | | Escaping fixes | Matthew Landauer | 2013-01-03 | -2/+6 |
| | | | | | | ||||
| * | | | | | Escaping fixes involving the unpleasant mix of translations, html and string ↵ | Matthew Landauer | 2013-01-03 | -56/+56 |
| | | | | | | | | | | | | | | | | | | | | | | | | interpolation | |||
| * | | | | | Escaping fixes | Matthew Landauer | 2013-01-03 | -2/+2 |
| | | | | | | ||||
| * | | | | | Make use_spans_for_errors monkey patch output html safe string | Matthew Landauer | 2013-01-03 | -1/+1 |
| | | | | | | ||||
| * | | | | | Escape error messages in foi_error_messages_for | Matthew Landauer | 2013-01-03 | -3/+3 |
| | | | | | | ||||
| * | | | | | Escaping fixes | Matthew Landauer | 2013-01-03 | -4/+4 |
| | | | | | | ||||
| * | | | | | Escaping fixes | Matthew Landauer | 2013-01-02 | -2/+2 |
| | | | | | | ||||
| * | | | | | Escaping fixes | Matthew Landauer | 2013-01-02 | -3/+3 |
| | | | | | | ||||
| * | | | | | Escaping fix | Matthew Landauer | 2013-01-02 | -2/+2 |
| | | | | | | ||||
| * | | | | | Assume the result of doing any translation is html_safe | Matthew Landauer | 2013-01-02 | -1/+3 |
| | | | | | |