| 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/+4 |
| | | ||||
| * | 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 | -2/+1 |
| |\ | | | | | | | | | | | | | | | Conflicts: Gemfile Gemfile.lock app/views/admin_request/show.html.erb config/environment.rb | |||
| | * | Allow the emergency user account to be disabled. | Louise Crow | 2013-03-19 | -2/+1 |
| | | | ||||
| * | | Stop pollution of params[:outgoing_message] | Matthew Landauer | 2013-03-19 | -4/+1 |
| | | | ||||
| * | | Config name change missed in the merge | Henare Degan | 2013-03-15 | -2/+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 | -1/+0 |
| | | | ||||
| * | | Merge remote-tracking branch 'mysociety/develop' into rails-3-develop | Henare Degan | 2013-03-14 | -155/+167 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | -84/+84 |
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '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/+30 |
| | | | | | | | | | | | | | page asking for more info | |||
| | | * | Can also record a message when posting to RequestController#describe_state | Matthew Landauer | 2013-03-05 | -1/+2 |
| | | | | ||||
| | | * | 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/+0 |
| | | | | ||||
| | | * | 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 |
| | | | | ||||
| | | * | Inline method | Matthew Landauer | 2013-03-02 | -1/+1 |
| | | | | ||||
| | | * | Refactor state logic | Matthew Landauer | 2013-03-02 | -35/+36 |
| | | | | ||||
| | | * | Use routes to only allow post to RequestController#describe_state | Matthew Landauer | 2013-03-02 | -6/+0 |
| | | | | ||||
| | * | | Fix bug where current user was always shown when creating censor rule for a ↵ | Matthew Landauer | 2013-03-08 | -1/+1 |
| | | | | | | | | | | | | | request | |||
| | * | | Removed unused admin page. This stuff is now shown on the summary page | Matthew Landauer | 2013-03-08 | -15/+0 |
| | | | | ||||
| | * | | Merge remote-tracking branch 'openaustralia_github/make-links-relative' into ↵ | Louise Crow | 2013-03-06 | -44/+44 |
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | |||
| | | * | | Use absolute urls when redirecting | Matthew Landauer | 2013-02-15 | -2/+2 |
| | | | | | ||||
| | | * | | Inline helper method | Matthew Landauer | 2013-02-15 | -4/+4 |
| | | | | | ||||
| | | * | | Inline helper | Matthew Landauer | 2013-02-15 | -15/+15 |
| | | | | | ||||
| | | * | | Stop using admin_url to generate absolute url for the admin interface | Matthew Landauer | 2013-02-15 | -9/+9 |
| | | | | | ||||
| | | * | | Stop using main_url to generate absolute urls for the main site | Matthew Landauer | 2013-02-15 | -9/+9 |
| | | | | | ||||
| | | * | | Rename named routes for categorisation game as they clash with request_url & ↵ | Matthew Landauer | 2013-02-15 | -1/+1 |
| | | | | | | | | | | | | | | | | | request_path helpers | |||
| | | * | | Redirects should be done with absolute urls | Matthew Landauer | 2013-02-15 | -18/+18 |
| | | | | | ||||
| | | * | | Rename helper method | Matthew Landauer | 2013-02-15 | -23/+23 |
| | | | | | ||||
| | | * | | Redirects should be done with absolute urls | Matthew Landauer | 2013-02-15 | -9/+9 |
| | | | | | ||||
| | | * | | Rename helper method | Matthew Landauer | 2013-02-15 | -12/+12 |
| | | | | | ||||
| | | * | | Redirects should be done with absolute urls | Matthew Landauer | 2013-02-15 | -2/+2 |
| | | | | | ||||
| | | * | | Rename helper method | Matthew Landauer | 2013-02-15 | -2/+2 |
| | | | | | ||||
| | * | | | Merge remote-tracking branch ↵ | Louise Crow | 2013-03-06 | -2/+19 |
| | |\ \ \ | | | | | | | | | | | | | | | | 'openaustralia_github/merge_adminbootstrap_theme' into develop | |||
 |
index : alaveteli | |
| Unnamed repository; edit this file 'description' to name the repository. | MimesBrønn |
| aboutsummaryrefslogtreecommitdiffstats |