Commit message (Collapse) | Author | Age | Lines | ||
---|---|---|---|---|---|
... | |||||
| | * | | | | 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 | |
| | | |/ / | | |/| | | |||||
| * | | | | Merge remote-tracking branch ↵ | Louise Crow | 2013-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 Landauer | 2013-01-28 | -12/+9 | |
| | |/ / / | | | | | | | | | | | | | | | | do anything as used here | ||||
| * | | | | Remove backup files. @selishta has confirmed they're not in active use. | Louise Crow | 2013-02-01 | -21757/+0 | |
| | | | | | |||||
| * | | | | Merge remote-tracking branch 'openaustralia_github/xss_escaping_fixes' into ↵ | Louise Crow | 2013-02-01 | -32/+34 | |
| |\ \ \ \ | | |_|_|/ | |/| | | | | | | | | develop | ||||
| | * | | | 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 | |
| |/ / / | |||||
| * | | | 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 | |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge remote-tracking branch ↵ | Louise Crow | 2013-01-16 | -1/+3 | |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | 'openaustralia_github/timezone_fixes_comment_edit' into develop | ||||
| | * | | | | | Small comment edit in timezone_fixes to remind that this can be removed in ↵ | Matthew Landauer | 2013-01-16 | -1/+3 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rails 3.x | ||||
| * | | | | | | Merge remote-tracking branch 'openaustralia_github/remove_mongrel_proctitle' ↵ | Louise Crow | 2013-01-16 | -169/+0 | |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | into develop | ||||
| | * | | | | | | Remove mongrel_proctitle plugin because the standard configuration now uses ↵ | Matthew Landauer | 2013-01-16 | -169/+0 | |
| | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | passenger rather than mongrel | ||||
| * | | | | | | Merge branch 'feature/standalone_cap_theme_install' into develop | Louise Crow | 2013-01-15 | -1/+1 | |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | Allow cap rake:themes:install to be run standalone and in the context of a ↵ | Louise Crow | 2013-01-14 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | deploy. According to https://github.com/capistrano/capistrano/blob/master/lib/capistrano/recipes/deploy.rb#L75 'latest_release' seems to fit the bill. | ||||
| * | | | | | | | Even in development, bundle should be installed in the vendor directory. ↵ | Louise Crow | 2013-01-15 | -1/+4 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #730. Capistrano-based deploys don't use rails-post-deploy, so I don't think this will be a problem for them. | ||||
| * | | | | | | | Update lock to latest copy of rails - 2.3.15 | Louise Crow | 2013-01-15 | -2/+2 | |
| | | | | | | | | |||||
| * | | | | | | | Merge branch 'release/0.6.9' into develop | Louise Crow | 2013-01-15 | -23/+52 | |
| |\ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | / | | | |_|_|_|/ | | |/| | | | | | | | | | | | Conflicts: Gemfile.lock locale/cy/app.po | ||||
| | * | | | | | Try just specifying that rails should come from git, to avoid deprecation ↵ | Louise Crow | 2013-01-15 | -10/+0 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | warnings about "require 'actionmailer'" rather than "require 'action_mailer'" etc. | ||||
| | * | | | | | Add note on Rails security upgrades to change file. | Louise Crow | 2013-01-15 | -0/+1 | |
| | | | | | | | |||||
| | * | | | | | Add updated Gemfile.lock after running bundle install. | Louise Crow | 2013-01-15 | -10/+21 | |
| | | | | | | | |||||
| | * | | | | | Update Gemfile to use a security patched copy of rails from the mySociety ↵ | Louise Crow | 2013-01-15 | -1/+9 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | git repo | ||||
| | * | | | | | Latest translations pulled from Transifex. | Louise Crow | 2013-01-14 | -11/+12 | |
| | | | | | | | |||||
| | * | | | | | Bump Alaveteli release number. | Louise Crow | 2013-01-14 | -1/+1 | |
| | | | | | | | |||||
| | * | | | | | Latest translations pulled from Transifex to fix inadvertantly committed ↵ | Louise Crow | 2013-01-14 | -1250/+266 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | unmerged conflicted files. |