aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeLines
...
* | | Add info_request_id attribute back so AJAX know which request to ask forHenare Degan2013-03-16-1/+1
| | |
* | | Fix syntax to reinstate link to outgoing messageHenare Degan2013-03-16-1/+1
| | |
* | | autospec wasn't working so remove until someone complains. Closes #824Henare Degan2013-03-16-6/+0
| | |
* | | Reenable test now that we don't do HTML validation in the test suiteHenare Degan2013-03-16-9/+6
| | |
* | | Fix request categorisation links post mergeHenare Degan2013-03-16-1/+1
| | |
* | | Since we have 3 languages in test the URL should be prefixed with the localeHenare Degan2013-03-16-2/+2
| | |
* | | The PUT method is also(?) used so revert thisHenare Degan2013-03-16-1/+1
| | | | | | | | | | | | | | | | | | Revert "POST became enforced in fa624fc7f17b6b4b6710817ed63291386e525f9c" This reverts commit 210fad894c3bb2b462001a42d33f6941c4ba38bb.
* | | Fix syntax for calling helper post mergeHenare Degan2013-03-15-1/+1
| | |
* | | Ignore the webrat log fileHenare Degan2013-03-15-0/+1
| | |
* | | admin_url was removed in 902631ec4f5e1a16b8f08a2ed0ccc86ad2b72c6cHenare Degan2013-03-15-26/+0
| | |
* | | We've added a new fixture since the last mergeHenare Degan2013-03-15-3/+6
| | |
* | | Use a real example instead of a helperHenare Degan2013-03-15-1/+1
| | |
* | | Fix up syntax from the Rails 3 mergeHenare Degan2013-03-15-4/+4
| | |
* | | Fix named route conflict originally done in ↵Henare Degan2013-03-15-1/+1
| | | | | | | | | | | | 889bb7b79f16533be7c8f2c46c9463b770a25dde
* | | Config name change missed in the mergeHenare Degan2013-03-15-2/+2
| | |
* | | Fix describe_state_message from the mergeHenare Degan2013-03-15-1/+2
| | |
* | | POST became enforced in fa624fc7f17b6b4b6710817ed63291386e525f9cHenare Degan2013-03-15-1/+1
| | |
* | | These routes were renamed in 64fe099163e8b786e6c05fe05fe9cbb8c068e380Henare Degan2013-03-15-3/+3
| | |
* | | Changed in 166b6d90bc2dc79536d8d2d145281fa340075735Henare Degan2013-03-15-1/+1
| | |
* | | This was added in fef3e4ead66b49fa714cb2640998b3146c290ccdHenare Degan2013-03-15-1/+2
| | |
* | | Removed in eadfc265ff83524cbd54b2682f2de818bca24bf4Henare Degan2013-03-15-16/+0
| | |
* | | Update to current matcher APIHenare Degan2013-03-15-2/+2
| | |
* | | Whoever said don't sweat the small stuff obviously never messed up a merge ↵Henare Degan2013-03-15-1/+1
| | | | | | | | | | | | and missed changing variable scope
* | | Fix up some merge action from f60ada47d4e7aabe0dce152109cb0d91865929daHenare Degan2013-03-15-2/+1
| | |
* | | main_url was removed in 4c9f7f7f12a47b516137bf000c3f36120033a077Henare Degan2013-03-15-13/+1
| | |
* | | This was removed in f07444d80961fcd3e7bb9555f5ed4a4e0b65b5dbHenare Degan2013-03-15-2/+0
| | |
* | | Some of these values are Time objects so cast them to a string. Not sure why ↵Henare Degan2013-03-15-1/+1
| | | | | | | | | | | | we didn't run into a problem here before
* | | Remove extra bit added in mergeHenare Degan2013-03-15-11/+0
| | |
* | | Add admin JS route from 5f7d17bc2128d7de3749f65d3e9168e2fcc1a478Henare Degan2013-03-15-0/+1
| | |
* | | Don't specify an id on a new public body. Fixes problems with using named routesHenare Degan2013-03-14-1/+1
| | |
* | | HTML validation was removed in 25ad21e0c93c7e79a5324067401f6c2b0340b9d6Henare Degan2013-03-14-70/+0
| | |
* | | Add magic encoding line.Louise Crow2013-03-14-0/+1
| | |
* | | In Rails 3 we need to explicity requireHenare Degan2013-03-14-0/+1
| | |
* | | Remove Rails 2 patch from 1e958d20f674dabde9e8fc6606edc704d4f93b66Henare Degan2013-03-14-19/+0
| | |
* | | Removed in 09ce54c6c09d878015102153cd214cf1d7ad3660Henare Degan2013-03-14-1/+0
| | |
* | | Refresh Gemfile.lockHenare Degan2013-03-14-1/+15
| | |
* | | Merge remote-tracking branch 'mysociety/develop' into rails-3-developHenare Degan2013-03-14-1983/+6932
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | Lock mail gem to 2.4 series for now - there are changes in the 2.5 series ↵Louise Crow2013-03-13-3/+3
| | | | | | | | | | | | that cause test failures.
| * | Update bundle.Louise Crow2013-03-13-29/+34
| | |
| * | Update URLs in spec now that custom url methods have been removed.Louise Crow2013-03-13-3/+3
| | |
| * | Merge remote-tracking branch ↵Louise Crow2013-03-13-229/+419
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '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
| | * | Remove deleted action from list of actionsMatthew Landauer2013-03-06-2/+2
| | | |
| | * | Now direct changes of state to error_message and requires_admin to a new ↵Matthew Landauer2013-03-06-24/+121
| | | | | | | | | | | | | | | | page asking for more info
| | * | Fix bug in rails 2 cookiestore that only shows up when using integration testsMatthew Landauer2013-03-06-0/+20
| | | |
| | * | Add webrat gemMatthew Landauer2013-03-06-2/+13
| | | |
| | * | Can also record a message when posting to RequestController#describe_stateMatthew Landauer2013-03-05-5/+24
| | | |
| | * | Remove code added previously because on the wrong trackMatthew Landauer2013-03-05-85/+0
| | | |
| | * | Don't allow external requests to have their state changedMatthew Landauer2013-03-04-0/+21
| | | |
| | * | Record who changes the stateMatthew Landauer2013-03-04-2/+2
| | | |
| | * | Refactor functionality from controller to modelMatthew Landauer2013-03-04-12/+15
| | | |
generated by cgit v1.2.3 (git 2.25.1) at 2025-10-03 15:29:41 +0000