Commit message (Collapse) | Author | Age | Lines | |
---|---|---|---|---|
* | Only allow reporting a request when logged in | Matthew Landauer | 2013-03-22 | -0/+5 |
| | ||||
* | Add first pass at page for reporting a request | Matthew Landauer | 2013-03-22 | -0/+26 |
| | ||||
* | Update Configuration references to new name. | Louise Crow | 2013-03-19 | -1/+1 |
| | ||||
* | Merge branch 'develop' into rails-3-develop | Louise Crow | 2013-03-19 | -7/+10 |
|\ | | | | | | | | | | | | | | | Conflicts: Gemfile Gemfile.lock app/views/admin_request/show.html.erb config/environment.rb | |||
| * | Supply info request id in an HTML 5 data attributerelease/0.8 | Louise Crow | 2013-03-19 | -4/+6 |
| | | ||||
| * | Allow the emergency user account to be disabled. | Louise Crow | 2013-03-19 | -3/+4 |
| | | ||||
| * | Fix bad merge of d88b79d1aa24a78ed95255a37a0403d7e3c0117e | Louise Crow | 2013-03-14 | -3/+3 |
| | | ||||
* | | Fix view for admin create authority. Block form of helper needs to return value | Matthew Landauer | 2013-03-19 | -3/+2 |
| | | ||||
* | | Make search ahead pagination link to the right place. Fixes #860 | Matthew Landauer | 2013-03-19 | -1/+1 |
| | | ||||
* | | Stop pollution of params[:outgoing_message] | Matthew Landauer | 2013-03-19 | -4/+1 |
| | | ||||
* | | Merge branch 'develop' into rails-3-develop | Matthew Landauer | 2013-03-19 | -3/+3 |
|\ \ | | | | | | | | | | | | | | | | | | | Conflicts: Gemfile Gemfile.lock doc/INSTALL.md | |||
| * | | Fix bad merge of d88b79d1aa24a78ed95255a37a0403d7e3c0117e | Louise Crow | 2013-03-14 | -3/+3 |
| |/ | ||||
* | | Replace use of Iconv in Ruby 1.9 to get rid of deprecation warnings | Henare Degan | 2013-03-16 | -7/+23 |
| | | ||||
* | | Fix syntax to reinstate link to annotation | Henare Degan | 2013-03-16 | -1/+1 |
| | | ||||
* | | Add info_request_id attribute back so AJAX know which request to ask for | Henare Degan | 2013-03-16 | -1/+1 |
| | | ||||
* | | Fix syntax to reinstate link to outgoing message | Henare Degan | 2013-03-16 | -1/+1 |
| | | ||||
* | | Fix request categorisation links post merge | Henare Degan | 2013-03-16 | -1/+1 |
| | | ||||
* | | Fix syntax for calling helper post merge | Henare Degan | 2013-03-15 | -1/+1 |
| | | ||||
* | | Fix up syntax from the Rails 3 merge | Henare Degan | 2013-03-15 | -4/+4 |
| | | ||||
* | | Config name change missed in the merge | Henare Degan | 2013-03-15 | -2/+2 |
| | | ||||
* | | Fix describe_state_message from the merge | Henare Degan | 2013-03-15 | -1/+1 |
| | | ||||
* | | This was added in fef3e4ead66b49fa714cb2640998b3146c290ccd | Henare Degan | 2013-03-15 | -1/+2 |
| | | ||||
* | | Removed in eadfc265ff83524cbd54b2682f2de818bca24bf4 | Henare Degan | 2013-03-15 | -15/+0 |
| | | ||||
* | | Whoever said don't sweat the small stuff obviously never messed up a merge ↵ | Henare Degan | 2013-03-15 | -1/+1 |
| | | | | | | | | and missed changing variable scope | |||
* | | Fix up some merge action from f60ada47d4e7aabe0dce152109cb0d91865929da | Henare Degan | 2013-03-15 | -2/+1 |
| | | ||||
* | | main_url was removed in 4c9f7f7f12a47b516137bf000c3f36120033a077 | Henare Degan | 2013-03-15 | -1/+1 |
| | | ||||
* | | Some of these values are Time objects so cast them to a string. Not sure why ↵ | Henare Degan | 2013-03-15 | -1/+1 |
| | | | | | | | | we didn't run into a problem here before | |||
* | | Remove extra bit added in merge | Henare Degan | 2013-03-15 | -11/+0 |
| | | ||||
* | | Merge remote-tracking branch 'mysociety/develop' into rails-3-develop | Henare Degan | 2013-03-14 | -1469/+2280 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 Crow | 2013-03-13 | -198/+195 |
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '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 actions | Matthew Landauer | 2013-03-06 | -2/+2 |
| | | | ||||
| | * | Now direct changes of state to error_message and requires_admin to a new ↵ | Matthew Landauer | 2013-03-06 | -9/+60 |
| | | | | | | | | | | | | page asking for more info | |||
| | * | Can also record a message when posting to RequestController#describe_state | Matthew Landauer | 2013-03-05 | -2/+3 |
| | | | ||||
| | * | Remove code added previously because on the wrong track | Matthew Landauer | 2013-03-05 | -22/+0 |
| | | | ||||
| | * | Don't allow external requests to have their state changed | Matthew Landauer | 2013-03-04 | -0/+7 |
| | | | ||||
| | * | Record who changes the state | Matthew Landauer | 2013-03-04 | -1/+1 |
| | | | ||||
| | * | Refactor functionality from controller to model | Matthew Landauer | 2013-03-04 | -12/+15 |
| | | | ||||
| | * | Fix bug when user not owner of request changing state to requires_admin ↵ | Matthew Landauer | 2013-03-04 | -1/+1 |
| | | | | | | | | | | | | email should come from user making the change | |||
| | * | Use Ability::can_update_request_state? in RequestController#describe_state | Matthew Landauer | 2013-03-04 | -5/+4 |
| | | | ||||
| | * | Inline temporary variables | Matthew Landauer | 2013-03-04 | -6/+2 |
| | | | ||||
| | * | No need for instance variables in action without view | Matthew Landauer | 2013-03-04 | -34/+34 |
| | | | ||||
| | * | Extract method that knows who can update the state of a request | Matthew Landauer | 2013-03-03 | -4/+6 |
| | | | ||||
| | * | Can update status when request is old and unclassified | Matthew Landauer | 2013-03-03 | -1/+1 |
| | | | ||||
| | * | admin user can change status | Matthew Landauer | 2013-03-03 | -1/+1 |
| | | | ||||
| | * | only can make the change as the owner of a request | Matthew Landauer | 2013-03-03 | -1/+1 |
| | | | ||||
| | * | Add basic authentication to new action | Matthew Landauer | 2013-03-03 | -9/+4 |
| | | | ||||
| | * | Switch to pretty urls | Matthew Landauer | 2013-03-02 | -1/+1 |
| | | | ||||
| | * | Add authentication | Matthew Landauer | 2013-03-02 | -2/+15 |
| | | | ||||
| | * | New request controller action for requires_admin state with message | Matthew Landauer | 2013-03-02 | -0/+5 |
| | | | ||||
| | * | When setting a state optionally pass a messsage | Matthew Landauer | 2013-03-02 | -2/+2 |
| | | |