aboutsummaryrefslogtreecommitdiffstats
path: root/app/views
Commit message (Collapse)AuthorAgeLines
* Rename ALL THE TEMPLATES!!1!!!one!!1!!Henare Degan2013-02-27-2/+2
| | | | .rhtml is deprecated in favour of .erb in Rails 3
* Upgrade more of RequestMailer to new ActionMailer APIHenare Degan2013-02-26-2/+2
| | | | Also change name of body instance method so it doesn't collide
* <% %> style block helpers are deprecatedHenare Degan2013-02-19-65/+65
|
* Merge branch 'develop' into rails-3-spikeHenare Degan2013-02-15-51/+61
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 Crow2013-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 pageMatthew Landauer2013-02-11-2/+2
| |
| * Restore old trailing whitespace so no need for any change to translation files.Louise Crow2013-02-08-2/+2
| |
| * 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.
| * Use raw on text with markup in it.Louise Crow2013-02-08-3/+3
| |
| * 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-01-0/+0
| |\ | | | | | | | | | 'openaustralia_github/backport_rails_3_mailer_fix' into develop
| | * Rename mailer method to avoid naming conflict in Rails 3Matthew Landauer2013-01-25-0/+0
| | |
| * | Replace use of builder with plain erb because builder is escaping ↵Matthew Landauer2013-02-01-25/+30
| | | | | | | | | | | | *everything* with rails_xss
| * | 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.
| * Remove leading space - seems to be causing test failures, although not a ↵Louise Crow2013-01-17-1/+1
| | | | | | | | problem in app itself.
| * Remove interlock as it's not compatible with Rails 3 and is unmaintainedHenare Degan2013-01-18-23/+20
| |
* | Remove RSpec version from debug page as it's not available in productionHenare Degan2013-02-14-2/+0
| |
* | Use path to partial so it works in view testsHenare Degan2013-02-07-1/+1
| |
* | Objects need to be strings before they can be cast with to_strMatthew Landauer2013-01-30-2/+2
| |
* | Don't depend on javascript for button to do a post. More semanticMatthew Landauer2013-01-28-1/+1
| |
* | path helper should be html safe and fix up view test for rspec 2Matthew Landauer2013-01-25-1/+1
| |
* | Merge branch 'rails_xss' into rails-3-spikeMatthew Landauer2013-01-25-7/+7
|\| | | | | | | | | | | | | | | Conflicts: Gemfile Gemfile.lock config/environment.rb lib/i18n_fixes.rb
| * Merge remote-tracking branch 'mysociety/develop' into rails_xssMatthew Landauer2013-01-15-100/+102
| |\
| * | More small html escaping fixesMatthew Landauer2013-01-15-2/+2
| | |
| * | Don't escape text emailsMatthew Landauer2013-01-15-1/+1
| | |
| * | Layouts for text emails should not escape their contentsMatthew Landauer2013-01-15-4/+4
| | |
* | | Rename mailer method to avoid naming conflict in Rails 3Matthew Landauer2013-01-25-0/+0
| | |
* | | Change method name as it conflicts with globalize3 method nameHenare Degan2013-01-24-1/+1
| | |
* | | Merge remote-tracking branch 'mysociety/develop' into rails-3-spikeMatthew Landauer2013-01-04-10/+12
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: Gemfile.lock Rakefile app/controllers/request_controller.rb lib/tasks/rspec.rake spec/controllers/services_controller_spec.rb spec/spec_helper.rb spec/views/request/_after_actions.rhtml_spec.rb
| * | Handle the case of a comment on an external request.Louise Crow2012-12-21-1/+1
| | |
| * | Limit pagination on similar pages in line with new upper limit on page offset.Louise Crow2012-12-17-1/+1
| | |
| * | Merge branch 'hotfix/authenticate-and-expire-download-zips' into developLouise Crow2012-12-13-0/+2
| |\ \
| | * | Only offer download links on publicly visible requestsLouise Crow2012-12-13-0/+2
| | | |
| | * | Don't offer or allow viewing of an HTML version of a response attachment if ↵Louise Crow2012-12-13-8/+8
| | | | | | | | | | | | | | | | the request is hidden, or requester_only. Google docs viewer won't be able to access it, and our own conversion process currently can produce image files that will then be publicly viewable directly from the webserver (see config/httpd.conf). If necessary we can revisit this code to enable admins and requesters to view the HTML version created by our own conversion without adding these files to a path that is served directly by the web server.
| * | | Don't offer or allow viewing of an HTML version of a request if it is ↵Louise Crow2012-12-13-8/+8
| | | | | | | | | | | | | | | | hidden, or requester_only. Google docs viewer won't be able to access it, and our own conversion process currently produces image files that will then be publicly viewable. If necessary we can revisit this code to enable admins and requesters to view the HTML version created by our own conversion without adding these files to a path that is served directly by the web server.
* | | | Merge branch 'rails_xss' into rails-3-spikeMatthew Landauer2013-01-04-67/+71
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | Escaping fixesMatthew Landauer2013-01-03-2/+6
| | | |
| * | | Escaping fixes involving the unpleasant mix of translations, html and string ↵Matthew Landauer2013-01-03-53/+53
| | | | | | | | | | | | | | | | interpolation
| * | | Escaping fixesMatthew Landauer2013-01-03-1/+1
| | | |
| * | | Escaping fixesMatthew Landauer2013-01-03-4/+4
| | | |
| * | | Escaping fixesMatthew Landauer2013-01-02-2/+2
| | | |
| * | | Escaping fixesMatthew Landauer2013-01-02-3/+3
| | | |
| * | | Escaping fixMatthew Landauer2013-01-02-2/+2
| | | |
* | | | Using #request_uri is deprecatedHenare Degan2012-12-11-16/+16
| | | |
* | | | Remove interlock as it's not compatible with Rails 3 and is unmaintainedHenare Degan2012-12-11-23/+20
| |/ / |/| |
* | | Use generated urls so that they go through locale filters.Louise Crow2012-11-29-3/+3
| | |
* | | Move styling of popup close buttons to stylesheet so they can be more easily ↵Louise Crow2012-11-28-2/+2
| | | | | | | | | | | | overriden by themes.
* | | Correct help unhappy path.Louise Crow2012-11-28-2/+2
| | |