aboutsummaryrefslogtreecommitdiffstats
path: root/app/controllers
Commit message (Collapse)AuthorAgeLines
* Rename ALL THE TEMPLATES!!1!!!one!!1!!Henare Degan2013-02-27-8/+8
| | | | .rhtml is deprecated in favour of .erb in Rails 3
* file_name is passed as a string not an arrayHenare Degan2013-02-26-3/+3
|
* create_ is deprecatedHenare Degan2013-02-25-2/+2
|
* Update to new mail sending APIHenare Degan2013-02-25-1/+1
|
* Update to new mail sending APIHenare Degan2013-02-25-11/+11
|
* Cast to a string so it's not saved to the DB as an object under Ruby 1.9.3Henare Degan2013-02-21-1/+1
|
* Remove deprecated constants - #589Henare Degan2013-02-20-1/+1
|
* Merge branch 'develop' into rails-3-spikeHenare Degan2013-02-15-5/+3
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * 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
| |
| * Mark flash with markup in it as html safe.Louise Crow2013-02-08-1/+1
| |
| * 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
| | |
| * | Merge remote-tracking branch ↵Louise Crow2013-02-01-1/+1
| |\ \ | | | | | | | | | | | | 'openaustralia_github/backport_rails_3_mailer_fix' into develop
| | * | Rename mailer method to avoid naming conflict in Rails 3Matthew Landauer2013-01-25-1/+1
| | |/
| * / Try to be a little nicer by setting the correct content_type for the atom feedMatthew Landauer2013-02-01-1/+1
| |/
| * Fix typo.Louise Crow2013-01-17-1/+1
| |
| * Remove interlock as it's not compatible with Rails 3 and is unmaintainedHenare Degan2013-01-18-61/+54
| |
* | Another hack to manually stitch together a fake email using tmailMatthew Landauer2013-02-01-1/+27
| |
* | Handling of globbed parameters in routes has changedMatthew Landauer2013-02-01-0/+1
| |
* | Directly construct tmail object from body and attachments. Ugh. Because ↵Matthew Landauer2013-01-31-2/+22
| | | | | | | | actionmailer uses mail under the hood
* | Globbing in routes is slightly different in Rails 3Matthew Landauer2013-01-31-1/+1
| |
* | There's really no need to test the internals of RailsMatthew Landauer2013-01-31-3/+7
| |
* | Access view helper from controller using view_contextMatthew Landauer2013-01-31-1/+1
| |
* | Fix rendering of atom feed and set correct content typeMatthew Landauer2013-01-31-1/+1
| |
* | Change that should have been merged in from develop when one form of caching ↵Matthew Landauer2013-01-31-22/+20
| | | | | | | | was removed
* | Convert query to more activerecord 3 formMatthew Landauer2013-01-31-2/+2
| |
* | Merge branch 'i18n_rails3_preparation' into rails-3-spikeMatthew Landauer2013-01-31-20/+22
|\ \ | | | | | | | | | | | | | | | | | | | | | Conflicts: Gemfile.lock app/controllers/general_controller.rb app/controllers/public_body_controller.rb spec/controllers/public_body_controller_spec.rb
| * | Set locale with I18n rather than through globalizeMatthew Landauer2013-01-17-11/+11
| | |
| * | Set locale in controller test by passing parameter in getMatthew Landauer2013-01-16-1/+1
| | | | | | | | | | | | Also using I18n.locale to pass the current locale around.
* | | Convert query to more activerecord 3 formMatthew Landauer2013-01-31-4/+2
| | |
* | | Convert query to more activerecord 3 formMatthew Landauer2013-01-30-4/+2
| | |
* | | Convert query to more activerecord 3 formMatthew Landauer2013-01-30-7/+5
| | |
* | | Convert query to more activerecord 3 formMatthew Landauer2013-01-30-2/+6
| | |
* | | Convert query to more activerecord 3 formMatthew Landauer2013-01-30-3/+7
| | |
* | | If now query is supplied get all the requestsMatthew Landauer2013-01-30-4/+10
| | |
* | | render_for_text doesn't exist anymore. Replace with render :textMatthew Landauer2013-01-29-3/+2
| | |
* | | Fixup up test_code_redirect_by_email_token for rspec 2Matthew Landauer2013-01-29-1/+2
| | |
* | | Time doesn't need to be converted from string to time anymoreMatthew Landauer2013-01-28-7/+1
| | |
* | | Merge branch 'rails_xss' into rails-3-spikeMatthew Landauer2013-01-25-1/+1
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | Conflicts: Gemfile Gemfile.lock config/environment.rb lib/i18n_fixes.rb
| * | html escaping fixMatthew Landauer2013-01-15-1/+1
| | |
| * | Merge remote-tracking branch 'mysociety/develop' into rails_xssMatthew Landauer2013-01-15-50/+94
| |\|
* | | Rename mailer method to avoid naming conflict in Rails 3Matthew Landauer2013-01-25-1/+1
| | |
* | | Merge remote-tracking branch 'mysociety/develop' into rails-3-spikeMatthew Landauer2013-01-04-11/+50
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | Limit pagination on similar pages in line with new upper limit on page offset.Louise Crow2012-12-17-0/+2
| | |
| * | Only serve up 'similar' pages up to the offset we use for list.Louise Crow2012-12-17-0/+5
| | |
| * | Merge branch 'hotfix/authenticate-and-expire-download-zips' into developLouise Crow2012-12-13-11/+37
| |\ \
| | * | Remove any download zip files when a request's cached files are expired.Louise Crow2012-12-13-0/+8
| | | |
| | * | Put download zips in a predictable location - sharded folders based on ↵Louise Crow2012-12-13-1/+9
| | | | | | | | | | | | | | | | request ID, rather than distributing them across the download directories by the generated SHA. Preserve the uniqueness of the subdirectory.
| | * | Use helper method for download path, and use Rails.root instead of file ↵Louise Crow2012-12-13-1/+5
| | | | | | | | | | | | | | | | location.