Commit message (Collapse) | Author | Age | Lines | ||
---|---|---|---|---|---|
... | |||||
* | | We've added a new fixture since the last merge | Henare Degan | 2013-03-15 | -3/+6 | |
| | | |||||
* | | Use a real example instead of a helper | Henare Degan | 2013-03-15 | -1/+1 | |
| | | |||||
* | | Changed in 166b6d90bc2dc79536d8d2d145281fa340075735 | Henare Degan | 2013-03-15 | -1/+1 | |
| | | |||||
* | | Update to current matcher API | Henare Degan | 2013-03-15 | -2/+2 | |
| | | |||||
* | | Merge remote-tracking branch 'mysociety/develop' into rails-3-develop | Henare Degan | 2013-03-14 | -26/+87 | |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | ||||
| * | Update URLs in spec now that custom url methods have been removed. | Louise Crow | 2013-03-13 | -3/+3 | |
| | | |||||
| * | Merge remote-tracking branch ↵ | Louise Crow | 2013-03-13 | -22/+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 | ||||
| | * | Now direct changes of state to error_message and requires_admin to a new ↵ | Matthew Landauer | 2013-03-06 | -15/+19 | |
| | | | | | | | | | | | | page asking for more info | ||||
| | * | Can also record a message when posting to RequestController#describe_state | Matthew Landauer | 2013-03-05 | -3/+21 | |
| | | | |||||
| | * | Remove code added previously because on the wrong track | Matthew Landauer | 2013-03-05 | -62/+0 | |
| | | | |||||
| | * | Don't allow external requests to have their state changed | Matthew Landauer | 2013-03-04 | -0/+14 | |
| | | | |||||
| | * | Record who changes the state | Matthew Landauer | 2013-03-04 | -1/+1 | |
| | | | |||||
| | * | Fix bug when user not owner of request changing state to requires_admin ↵ | Matthew Landauer | 2013-03-04 | -3/+12 | |
| | | | | | | | | | | | | email should come from user making the change | ||||
| | * | Inline temporary variables | Matthew Landauer | 2013-03-04 | -0/+1 | |
| | | | |||||
| | * | Simplify controller test by mock behaviour in Ability | Matthew Landauer | 2013-03-03 | -45/+13 | |
| | | | |||||
| | * | Can update status when request is old and unclassified | Matthew Landauer | 2013-03-03 | -0/+24 | |
| | | | |||||
| | * | admin user can change status | Matthew Landauer | 2013-03-03 | -2/+16 | |
| | | | |||||
| | * | Refactor tests a little | Matthew Landauer | 2013-03-03 | -19/+21 | |
| | | | |||||
| | * | only can make the change as the owner of a request | Matthew Landauer | 2013-03-03 | -0/+14 | |
| | | | |||||
| | * | Add basic authentication to new action | Matthew Landauer | 2013-03-03 | -16/+26 | |
| | | | |||||
| | * | Switch to pretty urls | Matthew Landauer | 2013-03-02 | -1/+1 | |
| | | | |||||
| | * | New request controller action for requires_admin state with message | Matthew Landauer | 2013-03-02 | -0/+16 | |
| | | | |||||
| | * | Use routes to only allow post to RequestController#describe_state | Matthew Landauer | 2013-03-02 | -9/+5 | |
| | | | |||||
| | * | Test for what happens when user is playing the classification game | Matthew Landauer | 2013-03-02 | -0/+11 | |
| | | | |||||
| | * | Test for situation where request changes while user is looking at it and ↵ | Matthew Landauer | 2013-03-02 | -0/+10 | |
| | | | | | | | | | | | | they change the status | ||||
| | * | Test for forgetting to select the status | Matthew Landauer | 2013-03-02 | -0/+8 | |
| | | | |||||
| * | | Merge remote-tracking branch 'openaustralia_github/make-links-relative' into ↵ | Louise Crow | 2013-03-06 | -2/+1 | |
| |\ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | ||||
| | * | Stop using main_url to generate absolute urls for the main site | Matthew Landauer | 2013-02-15 | -2/+1 | |
| | | | |||||
| * | | Clear purge requests in the setup of tests that count them. | Louise Crow | 2013-02-16 | -3/+7 | |
| | | | |||||
| * | | Don't integrate views here - we're not looking at a controller. | Louise Crow | 2013-02-16 | -1/+0 | |
| | | | |||||
| * | | Clear the purge requests in the setup for these tests so they are isolated ↵ | Louise Crow | 2013-02-16 | -0/+3 | |
| | | | | | | | | | | | | from the behaviour of other tests. | ||||
| * | | Retain filter settings when redirecting a public body to its canonical url | Matthew Landauer | 2013-02-12 | -0/+5 | |
| |/ | |||||
| * | modernise redirect tests by converting to using url helpers | Matthew Landauer | 2013-01-29 | -7/+7 | |
| | | |||||
| * | Remove interlock as it's not compatible with Rails 3 and is unmaintained | Henare Degan | 2013-01-18 | -13/+0 | |
| | | |||||
* | | Be a bit more exact | Henare Degan | 2013-03-05 | -1/+1 | |
| | | |||||
* | | Fix track searches by changing the way the routing works | Henare Degan | 2013-03-05 | -1/+1 | |
| | | |||||
* | | Surely we expect the modified body here | Henare Degan | 2013-03-04 | -1/+1 | |
| | | |||||
* | | Reload the object after reparsing (Rails 3.1 caching) | Henare Degan | 2013-03-04 | -0/+1 | |
| | | |||||
* | | Use built in fixture_file_upload | Henare Degan | 2013-03-04 | -5/+2 | |
| | | |||||
* | | This is cast to a string in Rails 3.1 | Henare Degan | 2013-03-04 | -1/+1 | |
| | | |||||
* | | Params are passed through as strings in Rails 3.1 | Henare Degan | 2013-03-03 | -1/+1 | |
| | | |||||
* | | We can't mock this in Rails 3.1 so switch to using fixture_file_upload instead | Henare Degan | 2013-03-03 | -3/+2 | |
| | | |||||
* | | We use info_request_id in the view so we should use it in the test | Henare Degan | 2013-03-03 | -1/+1 | |
| | | |||||
* | | Rename Configuration class to avoid conflict with ActiveSupport::Configurable | Henare Degan | 2013-03-03 | -9/+9 | |
| | | |||||
* | | response.redirected_to is deprecated | Henare Degan | 2013-03-03 | -1/+1 | |
| | | |||||
* | | Rename ALL THE TEMPLATES!!1!!!one!!1!! | Henare Degan | 2013-02-27 | -1/+1 | |
| | | | | | | | | .rhtml is deprecated in favour of .erb in Rails 3 | ||||
* | | file_name is passed as a string not an array | Henare Degan | 2013-02-26 | -22/+21 | |
| | | |||||
* | | Update to new mail sending API | Henare Degan | 2013-02-25 | -5/+9 | |
| | | |||||
* | | Update to new mail sending API | Henare Degan | 2013-02-25 | -1/+1 | |
| | | |||||
* | | response.flash has been deprecated | Henare Degan | 2013-02-25 | -6/+6 | |
| | |