aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeLines
* Convert .po files to a standard msgmerge format - --no-wrap --sort-output ↵Louise Crow2013-02-08-19190/+8816
| | | | --no-location.
* Simple task for converting .po files to a standard msgmerge format.Louise Crow2013-02-08-3/+12
|
* Use helper method which handles external requests without user accounts when ↵Louise Crow2013-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 Crow2013-02-08-4/+5
| | | | aren't escaped when shown in flash notices.
* Mark popup banner as html_safeLouise Crow2013-02-08-1/+1
|
* Mark flash string with markup in it as html safe.Louise Crow2013-02-08-1/+1
|
* Use raw on text with markup in it.Louise Crow2013-02-08-3/+3
|
* Mark flash with markup in it as html safe.Louise Crow2013-02-08-1/+1
|
* Merge remote-tracking branch 'openaustralia_github/more_escaping_fixes' into ↵Louise Crow2013-02-07-6/+6
|\ | | | | | | develop
| * Fix escaping of raw email display in admin interfaceMatthew Landauer2013-02-07-1/+1
| |
| * Fix calendar picker on request search pageMatthew Landauer2013-02-07-5/+5
| |
* | Merge remote-tracking branch ↵Louise Crow2013-02-07-1/+0
|\ \ | |/ |/| | | 'openaustralia_github/email_fix_on_contact_page' into develop
| * Fix email link on contact page after escaping changesMatthew Landauer2013-02-07-1/+0
| |
* | Rescue an invalid character exception when handling what appears to be badly ↵Louise Crow2013-02-06-1/+1
| | | | | | | | encoded data.
* | Merge remote-tracking branch ↵Louise Crow2013-02-01-13/+8
|\ \ | | | | | | | | | 'openaustralia_github/backport_timezone_spec_rails_3_fix' into develop
| * | read_attribute does timezone conversion in rails 3. So using ↵Matthew Landauer2013-01-25-13/+8
| | | | | | | | | | | | attributes_before_type_cast instead
* | | Merge remote-tracking branch ↵Louise Crow2013-02-01-7/+7
|\ \ \ | | | | | | | | | | | | 'openaustralia_github/use_url_helpers_in_redirect_tests' into develop
| * | | modernise redirect tests by converting to using url helpersMatthew Landauer2013-01-29-7/+7
| | | |
* | | | Merge remote-tracking branch ↵Louise Crow2013-02-01-5/+5
|\ \ \ \ | | | | | | | | | | | | | | | 'openaustralia_github/backport_rails_3_mailer_fix' into develop
| * | | | Rename mailer method to avoid naming conflict in Rails 3Matthew Landauer2013-01-25-5/+5
| | |/ / | |/| |
* | | | Merge remote-tracking branch 'openaustralia_github/model-deprecations' into ↵Louise Crow2013-02-01-66/+85
|\ \ \ \ | | | | | | | | | | | | | | | develop
| * | | | AboutMeValidator model - Overwriting validate is deprecated in Rails 3Henare Degan2013-01-25-2/+6
| | | | |
| * | | | PublicBody model - Overwriting validate is deprecated in Rails 3Henare Degan2013-01-25-9/+10
| | | | |
| * | | | OutgoingMessage model - Overwriting validate is deprecated in Rails 3Henare Degan2013-01-25-26/+28
| | | | |
| * | | | Indentation and spacing fixes onlyHenare Degan2013-01-25-4/+6
| | | | |
| * | | | Formatting only: Group associations and validationsHenare Degan2013-01-25-4/+3
| | | | |
| * | | | Comment model - Overwriting validate is deprecated in Rails 3Henare Degan2013-01-25-10/+12
| | | | |
| * | | | ChangeEmailValidator model - Overwriting validate is deprecated in Rails 3Henare Degan2013-01-25-1/+4
| | | | |
| * | | | ProfilePhoto model - Overwriting validate is deprecated in Rails 3Henare Degan2013-01-25-1/+5
| | | | |
| * | | | User model - Overwriting validate is deprecated in Rails 3Henare Degan2013-01-25-9/+11
| | |/ / | |/| |
* | | | Merge remote-tracking branch ↵Louise Crow2013-02-01-12/+9
|\ \ \ \ | | | | | | | | | | | | | | | 'openaustralia_github/small_tmail_backend_refactor' into develop
| * | | | Calling TMail::Mail#base64_decode does not modify the mail object so doesn't ↵Matthew Landauer2013-01-28-12/+9
| |/ / / | | | | | | | | | | | | do anything as used here
* | | | Remove backup files. @selishta has confirmed they're not in active use.Louise Crow2013-02-01-21757/+0
| | | |
* | | | Merge remote-tracking branch 'openaustralia_github/xss_escaping_fixes' into ↵Louise Crow2013-02-01-32/+34
|\ \ \ \ | |_|_|/ |/| | | | | | | develop
| * | | Try to be a little nicer by setting the correct content_type for the atom feedMatthew Landauer2013-02-01-1/+1
| | | |
| * | | Replace use of builder with plain erb because builder is escaping ↵Matthew Landauer2013-02-01-25/+30
| | | | | | | | | | | | | | | | *everything* with rails_xss
| * | | Mark output of highlight_words helper as html_safeMatthew Landauer2013-02-01-1/+1
| | | |
| * | | Small refactor to make method more conciseMatthew Landauer2013-02-01-6/+3
|/ / /
* | | Merge branch 'hotfix/0.6.9.2' into developLouise Crow2013-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.2Louise Crow2013-01-29-20/+20
| | | |
| * | | Update lock to latest copy of rails - 2.3.150.6.9.10.6.9Louise Crow2013-01-15-2/+2
| | | |
| * | | Merge branch 'release/0.6.9'Louise Crow2013-01-15-7761/+3529
| |\ \ \
| * \ \ \ Merge branch 'hotfix/0.6.8.3'0.6.8.3Louise Crow2013-01-09-21/+22
| |\ \ \ \
* | | | | | Remove FF button padding, use linear gradient for gradient on buttons in ↵Louise Crow2013-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 Crow2013-01-28-1/+1
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | | | | | | into develop
| * | | | | Don't depend on javascript for button to do a post. More semanticMatthew Landauer2013-01-28-1/+1
|/ / / / /
* | | | | Add some notes about the contexts in which this fragment for translation ↵Louise Crow2013-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 Crow2013-01-23-0/+15
| | | | | | | | | | | | | | | | | | | | the model attribute translations at the moment.
* | | | | Merge remote-tracking branch 'njenkins_github/permalink_focus' into developLouise Crow2013-01-23-1/+2
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | WDTK-256- Link to this widget retain permalink focus Nathan Jenkins2013-01-23-1/+2
|/ / / /