Commit message (Collapse) | Author | Age | Lines | |
---|---|---|---|---|
* | Fix up some merge action from f60ada47d4e7aabe0dce152109cb0d91865929da | Henare Degan | 2013-03-15 | -1/+1 |
| | ||||
* | Merge remote-tracking branch 'mysociety/develop' into rails-3-develop | Henare Degan | 2013-03-14 | -76/+80 |
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | |||
| * | Refactor functionality from controller to model | Matthew Landauer | 2013-03-04 | -0/+15 |
| | | ||||
| * | When setting a state optionally pass a messsage | Matthew Landauer | 2013-03-02 | -2/+2 |
| | | ||||
| * | Simplify method by using array to store mapping | Matthew Landauer | 2013-03-02 | -39/+24 |
| | | ||||
| * | InfoRequestEvent should know about its event types | Matthew Landauer | 2013-03-02 | -2/+2 |
| | | ||||
| * | Extract method | Matthew Landauer | 2013-03-02 | -6/+5 |
| | | ||||
| * | Simplify methods | Matthew Landauer | 2013-03-02 | -19/+7 |
| | | ||||
| * | Simplify logic in method | Matthew Landauer | 2013-03-02 | -7/+2 |
| | | ||||
| * | Inline method | Matthew Landauer | 2013-03-02 | -11/+1 |
| | | ||||
| * | Inline method | Matthew Landauer | 2013-03-02 | -6/+1 |
| | | ||||
* | | Rename Configuration class to avoid conflict with ActiveSupport::Configurable | Henare Degan | 2013-03-03 | -7/+7 |
| | | ||||
* | | Remove Tmail and use the Mail gem under Ruby 1.8.7 as well | Henare Degan | 2013-02-27 | -8/+0 |
| | | ||||
* | | Update to new mail sending API | Henare Degan | 2013-02-25 | -2/+2 |
| | | ||||
* | | New way of sending an email | Henare Degan | 2013-02-25 | -1/+1 |
| | | ||||
* | | Under Ruby 1.9 this saved to the DB as a Ruby ActiveSupport::SafeBuffer ↵ | Henare Degan | 2013-02-21 | -1/+1 |
| | | | | | | | | object but we want it saved as a String | |||
* | | Remove deprecated constants - #589 | Henare Degan | 2013-02-20 | -1/+1 |
| | | ||||
* | | Looks like this is different in the older version of Mail too | Henare Degan | 2013-02-10 | -1/+1 |
| | | ||||
* | | Added a bit of a safety net. It's an ugly temporary hack to make debugging ↵ | Matthew Landauer | 2013-01-31 | -0/+8 |
| | | | | | | | | easier | |||
* | | Workaround for setting default value on attribute when exists? is called | Matthew Landauer | 2013-01-29 | -2/+7 |
| | | ||||
* | | Don't need both url_helpers | Henare Degan | 2013-01-25 | -1/+0 |
| | | ||||
* | | Merge branch 'rails_xss' into rails-3-spike | Matthew Landauer | 2013-01-25 | -2/+2 |
|\| | | | | | | | | | | | | | | | Conflicts: Gemfile Gemfile.lock config/environment.rb lib/i18n_fixes.rb | |||
| * | Merge remote-tracking branch 'mysociety/develop' into rails_xss | Matthew Landauer | 2013-01-15 | -3/+3 |
| |\ | ||||
| * | | More escaping fixes | Matthew Landauer | 2013-01-15 | -2/+2 |
| | | | ||||
* | | | Overwriting validate_on_create in your models has been deprecated | Henare Degan | 2012-12-12 | -13/+15 |
| | | | ||||
* | | | Method-style callbacks are deprecated for after_initialize | Henare Degan | 2012-12-11 | -10/+14 |
| | | | ||||
* | | | include ActionController::UrlWriter is deprecated | Henare Degan | 2012-12-11 | -1/+1 |
| | | | ||||
* | | | named_scope has been renamed to scope | Henare Degan | 2012-12-11 | -1/+1 |
| |/ |/| | ||||
* | | Delegate getting the from address of an incoming mail to the mail handler. | Louise Crow | 2012-12-03 | -2/+2 |
| | | ||||
* | | Standardize slug generation for external users so that it uses the same ↵ | Louise Crow | 2012-11-29 | -1/+1 |
|/ | | | | underlying method as other slug generation. Fixes #567. | |||
* | Merge remote-tracking branch 'origin/feature/isolate-mail-handling' into develop | Louise Crow | 2012-11-20 | -3/+3 |
|\ | ||||
| * | Move address_from_name_and_email to mail handler. | Louise Crow | 2012-11-15 | -3/+3 |
| | | ||||
* | | Handle a request for json on a an external request - return the user_name ↵ | Louise Crow | 2012-11-19 | -1/+5 |
|/ | | | | attribute instead of a full user model. Fixes #715. | |||
* | Move access to mail message id to incoming message. | Louise Crow | 2012-11-15 | -2/+1 |
| | ||||
* | Rubyise loop. | Louise Crow | 2012-11-15 | -1/+1 |
| | ||||
* | Refactor access to the mail object - only from incoming_message. | Louise Crow | 2012-11-15 | -6/+1 |
| | ||||
* | Handle the default blank string passed by Configuration module | Louise Crow | 2012-10-25 | -1/+1 |
| | ||||
* | Add an option to calls to calculate_status and display_status to specify ↵ | Louise Crow | 2012-10-23 | -7/+6 |
| | | | | that the method can return a value cached on the object by a previous call. | |||
* | In number of requests shown on home page only include requests with normal ↵ | Matthew Landauer | 2012-10-17 | -0/+2 |
| | | | | prominence | |||
* | Rename models and tables exim -> mail_server | Matthew Landauer | 2012-10-11 | -3/+3 |
| | ||||
* | Extract configuration with defaults into one module | Matthew Landauer | 2012-09-25 | -12/+7 |
| | ||||
* | Merge remote-tracking branch 'openaustralia_github/calendar_days' into develop | Louise Crow | 2012-09-24 | -3/+5 |
|\ | ||||
| * | Make the way number of days are calculated (either by calendar or working ↵ | Matthew Landauer | 2012-09-24 | -3/+5 |
| | | | | | | | | days) configurable | |||
| * | Fix: configuration for very late number of days wasn't being used | Matthew Landauer | 2012-09-24 | -2/+2 |
| | | ||||
| * | Rename method | Matthew Landauer | 2012-09-24 | -3/+3 |
| | | ||||
* | | Add an option to disable comments on a request | Robin Houston | 2012-09-19 | -0/+2 |
|/ | | | | Closes #30. | |||
* | Allow InfoRequest.find_old_unclassified to accept an offset param so it can ↵ | Louise Crow | 2012-09-13 | -2/+3 |
| | | | | be used in conjunction with pagination. | |||
* | Add a counter cache for the number of info_requests associated with public ↵ | Louise Crow | 2012-09-12 | -1/+1 |
| | | | | bodies. | |||
* | Add some more efficient methods for getting old unclassified request counts, ↵ | Louise Crow | 2012-09-11 | -9/+36 |
| | | | | and random sets of small numbers of old unclassified requests. | |||
* | Merge branch 'release/0.6.3' into develop | Louise Crow | 2012-08-22 | -10/+14 |
|\ | | | | | | | | | | | | | | | Conflicts: app/controllers/admin_public_body_controller.rb app/views/admin_public_body/import_csv.rhtml spec/controllers/admin_public_body_controller_spec.rb spec/models/info_request_spec.rb |