aboutsummaryrefslogtreecommitdiffstats
path: root/app/models
Commit message (Collapse)AuthorAgeLines
* Replace use of Iconv in Ruby 1.9 to get rid of deprecation warningsHenare Degan2013-03-16-7/+23
|
* Fix up some merge action from f60ada47d4e7aabe0dce152109cb0d91865929daHenare Degan2013-03-15-1/+1
|
* Merge remote-tracking branch 'mysociety/develop' into rails-3-developHenare Degan2013-03-14-93/+102
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: Gemfile Gemfile.lock app/controllers/admin_request_controller.rb app/controllers/admin_track_controller.rb app/controllers/request_controller.rb app/controllers/services_controller.rb app/helpers/link_to_helper.rb app/mailers/request_mailer.rb app/models/application_mailer.rb app/models/info_request.rb app/views/admin_censor_rule/edit.html.erb app/views/admin_censor_rule/new.html.erb app/views/admin_public_body/_form.html.erb app/views/admin_public_body/_locale_selector.html.erb app/views/admin_public_body/_one_list.html.erb app/views/admin_public_body/edit.html.erb app/views/admin_public_body/list.html.erb app/views/admin_public_body/new.html.erb app/views/admin_request/_incoming_message_actions.html.erb app/views/admin_request/edit.html.erb app/views/admin_request/edit_comment.html.erb app/views/admin_request/edit_outgoing.html.erb app/views/admin_request/list.html.erb app/views/admin_request/list_old_unclassified.html.erb app/views/admin_request/show.html.erb app/views/admin_track/_some_tracks.html.erb app/views/admin_track/list.html.erb app/views/admin_user/edit.html.erb app/views/admin_user/list.html.erb app/views/admin_user/show.html.erb app/views/general/_footer.html.erb app/views/general/exception_caught.html.erb app/views/help/contact.html.erb app/views/layouts/default.html.erb app/views/public_body/_alphabet.html.erb app/views/request/_request_listing_single.html.erb app/views/request/_sidebar.html.erb app/views/request/new.html.erb app/views/request/show.html.erb app/views/request_mailer/external_response.rhtml app/views/request_mailer/fake_response.rhtml config/environment.rb config/environments/production.rb config/routes.rb spec/controllers/admin_censor_rule_controller_spec.rb spec/controllers/request_controller_spec.rb spec/controllers/track_controller_spec.rb spec/helpers/link_to_helper_spec.rb spec/mailers/request_mailer_spec.rb spec/models/info_request_spec.rb spec/spec_helper.rb spec/views/public_body/show.html.erb_spec.rb spec/views/request/show.html.erb_spec.rb vendor/plugins/rails_xss/lib/rails_xss/erubis.rb
| * Merge remote-tracking branch ↵Louise Crow2013-03-13-112/+79
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'openaustralia_github/one_support_email_on_admin_attention_state' into develop Conflicts: Gemfile.lock app/controllers/request_controller.rb app/models/request_mailer.rb app/views/admin_general/index.rhtml spec/models/request_mailer_spec.rb
| | * Refactor functionality from controller to modelMatthew Landauer2013-03-04-0/+15
| | |
| | * When setting a state optionally pass a messsageMatthew Landauer2013-03-02-2/+2
| | |
| | * Add optional message to requires_admin emailMatthew Landauer2013-03-02-2/+2
| | |
| | * Avoid using return in the middle of methodsMatthew Landauer2013-03-02-7/+8
| | |
| | * Simplify method by using array to store mappingMatthew Landauer2013-03-02-39/+24
| | |
| | * InfoRequestEvent should know about its event typesMatthew Landauer2013-03-02-2/+10
| | |
| | * Simplify methodsMatthew Landauer2013-03-02-8/+3
| | |
| | * Extract methodMatthew Landauer2013-03-02-6/+5
| | |
| | * Simplify methodsMatthew Landauer2013-03-02-19/+7
| | |
| | * Simplify logic in methodMatthew Landauer2013-03-02-7/+2
| | |
| | * Inline methodMatthew Landauer2013-03-02-11/+1
| | |
| | * Inline methodMatthew Landauer2013-03-02-6/+1
| | |
| | * Small refactor.Matthew Landauer2013-03-02-5/+1
| | |
| * | Make view as html display as html5Matthew Landauer2013-03-07-2/+1
| | |
| * | Merge remote-tracking branch 'openaustralia_github/make-links-relative' into ↵Louise Crow2013-03-06-8/+10
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | develop Conflicts: app/controllers/admin_request_controller.rb app/models/request_mailer.rb app/views/admin_general/index.rhtml app/views/admin_general/stats.rhtml app/views/admin_public_body/_one_list.rhtml app/views/admin_public_body/_tags.rhtml app/views/admin_public_body/show.rhtml app/views/admin_request/show.rhtml app/views/admin_user/show.rhtml app/views/layouts/admin.rhtml app/views/public_body/show.rhtml app/views/request/new.rhtml
| | * | Inline helperMatthew Landauer2013-02-15-1/+1
| | | |
| | * | Stop using main_url to generate absolute urls for the main siteMatthew Landauer2013-02-15-7/+7
| | | |
| | * | Rename helper methodMatthew Landauer2013-02-15-3/+3
| | | |
| | * | Rename helper methodMatthew Landauer2013-02-15-1/+1
| | | |
| | * | Make tracking links relativeMatthew Landauer2013-02-13-0/+2
| | | |
| * | | Mark subjects of emails as html_safeMatthew Landauer2013-03-06-6/+6
| | |/ | |/|
| * | Move test runner disabling to request mailer in order to have access to ↵Louise Crow2013-02-19-1/+5
| | | | | | | | | | | | rails environment and make hack specific to ruby 1.9.
| * | Handle the case where the subject is not setLouise Crow2013-02-15-2/+2
| | |
| * | Fix for #808. SafeBuffer and ActionMailer::Quoting.quoted_printable don't ↵Louise Crow2013-02-15-0/+14
| |/ | | | | | | play well together, so convert all subject lines to strings before passing them off to actionmailer.
* | Remove schema information as this won't be updated any moreHenare Degan2013-03-04-30/+0
| |
* | Convert validators to newer, more Railsy ActiveModelHenare Degan2013-03-04-19/+29
| |
* | We need to reload here in Rails 3.1 (caching?)Henare Degan2013-03-03-0/+3
| |
* | Rename Configuration class to avoid conflict with ActiveSupport::ConfigurableHenare Degan2013-03-03-26/+26
| |
* | In Ruby 1.9.3 we need to explicitly require iconv because it's not ↵Henare Degan2013-02-28-1/+1
| | | | | | | | implicitly loaded via Mail
* | Remove Tmail and use the Mail gem under Ruby 1.8.7 as wellHenare Degan2013-02-27-8/+0
| |
* | Fix calculation of attachment sizes in Ruby 1.9.3Henare Degan2013-02-27-17/+0
| | | | | | | | | | | | | | | | force_encoding is generally not a good idea and I can't see what it's trying to achieve here so... Revert "Use the character set of the attachment to encode the string that we're pulling out of the file before converting it to our default encoding." This reverts commit 3729f2053d4c04396d440a9c368bed174e9c9605.
* | Rename ALL THE TEMPLATES!!1!!!one!!1!!Henare Degan2013-02-27-1/+1
| | | | | | | | .rhtml is deprecated in favour of .erb in Rails 3
* | Overwriting validate is deprecatedHenare Degan2013-02-25-2/+4
| |
* | Update to new mail sending APIHenare Degan2013-02-25-4/+4
| |
* | Mailers have their own home in Rails 3Henare Degan2013-02-25-948/+0
| |
* | New way of sending an emailHenare Degan2013-02-25-1/+1
| |
* | Under Ruby 1.9 this saved to the DB as a Ruby ActiveSupport::SafeBuffer ↵Henare Degan2013-02-21-1/+1
| | | | | | | | object but we want it saved as a String
* | Rails.env should never not be set, I think this is a relic of RAILS_ENVHenare Degan2013-02-20-5/+1
| |
* | Remove deprecated constants - #589Henare Degan2013-02-20-2/+2
| |
* | Merge branch 'develop' into rails-3-spikeHenare Degan2013-02-15-55/+67
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * Don't escape links that are automatically added in user biosMatthew Landauer2013-02-11-1/+2
| |
| * 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.
| * 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-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
| | |
| * | AboutMeValidator model - Overwriting validate is deprecated in Rails 3Henare Degan2013-01-25-2/+6
| | |
generated by cgit v1.2.3 (git 2.25.1) at 2025-09-01 21:14:47 +0000