aboutsummaryrefslogtreecommitdiffstats
path: root/app
Commit message (Collapse)AuthorAgeLines
* Merge branch 'hotfix/0.8.0.1' into wdtkLouise Crow2013-04-02-2/+2
|\
| * Use full urls in outgoing_message_url as the name impliesMatthew Landauer2013-04-02-2/+2
| |
* | Merge branch 'release/0.8' into wdtkLouise Crow2013-03-19-4/+6
|\|
| * Supply info request id in an HTML 5 data attributerelease/0.8Louise Crow2013-03-19-4/+6
| |
* | Merge branch 'release/0.8' into wdtkLouise Crow2013-03-19-1494/+2229
|\| | | | | | | | | | | Conflicts: app/controllers/admin_request_controller.rb app/views/contact_mailer/from_admin_message.rhtml
| * Allow the emergency user account to be disabled.Louise Crow2013-03-19-3/+4
| |
| * Fix bad merge of d88b79d1aa24a78ed95255a37a0403d7e3c0117eLouise Crow2013-03-14-3/+3
| |
| * Merge remote-tracking branch ↵Louise Crow2013-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 actionsMatthew Landauer2013-03-06-2/+2
| | |
| | * Now direct changes of state to error_message and requires_admin to a new ↵Matthew Landauer2013-03-06-9/+60
| | | | | | | | | | | | page asking for more info
| | * Can also record a message when posting to RequestController#describe_stateMatthew Landauer2013-03-05-2/+3
| | |
| | * Remove code added previously because on the wrong trackMatthew Landauer2013-03-05-22/+0
| | |
| | * Don't allow external requests to have their state changedMatthew Landauer2013-03-04-0/+7
| | |
| | * Record who changes the stateMatthew Landauer2013-03-04-1/+1
| | |
| | * Refactor functionality from controller to modelMatthew Landauer2013-03-04-12/+15
| | |
| | * Fix bug when user not owner of request changing state to requires_admin ↵Matthew Landauer2013-03-04-1/+1
| | | | | | | | | | | | email should come from user making the change
| | * Use Ability::can_update_request_state? in RequestController#describe_stateMatthew Landauer2013-03-04-5/+4
| | |
| | * Inline temporary variablesMatthew Landauer2013-03-04-6/+2
| | |
| | * No need for instance variables in action without viewMatthew Landauer2013-03-04-34/+34
| | |
| | * Extract method that knows who can update the state of a requestMatthew Landauer2013-03-03-4/+6
| | |
| | * Can update status when request is old and unclassifiedMatthew Landauer2013-03-03-1/+1
| | |
| | * admin user can change statusMatthew Landauer2013-03-03-1/+1
| | |
| | * only can make the change as the owner of a requestMatthew Landauer2013-03-03-1/+1
| | |
| | * Add basic authentication to new actionMatthew Landauer2013-03-03-9/+4
| | |
| | * Switch to pretty urlsMatthew Landauer2013-03-02-1/+1
| | |
| | * Add authenticationMatthew Landauer2013-03-02-2/+15
| | |
| | * New request controller action for requires_admin state with messageMatthew Landauer2013-03-02-0/+5
| | |
| | * When setting a state optionally pass a messsageMatthew Landauer2013-03-02-2/+2
| | |
| | * Add optional message to requires_admin emailMatthew Landauer2013-03-02-2/+4
| | |
| | * Avoid using return in the middle of methodsMatthew Landauer2013-03-02-7/+8
| | |
| | * Simplify method by using array to store mappingMatthew Landauer2013-03-02-39/+24
| | |
| | * InfoRequestEvent should know about its event typesMatthew Landauer2013-03-02-2/+10
| | |
| | * Simplify methodsMatthew Landauer2013-03-02-8/+3
| | |
| | * Extract methodMatthew Landauer2013-03-02-6/+5
| | |
| | * Simplify methodsMatthew Landauer2013-03-02-19/+7
| | |
| | * Simplify logic in methodMatthew Landauer2013-03-02-7/+2
| | |
| | * Inline methodMatthew Landauer2013-03-02-15/+5
| | |
| | * Inline methodMatthew Landauer2013-03-02-6/+1
| | |
| | * Small refactor.Matthew Landauer2013-03-02-5/+1
| | |
| | * Refactor state logicMatthew Landauer2013-03-02-35/+36
| | |
| | * Use routes to only allow post to RequestController#describe_stateMatthew Landauer2013-03-02-8/+0
| | |
| * | Merge remote-tracking branch ↵Louise Crow2013-03-11-180/+156
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'openaustralia_github/make_ui_for_links_in_admin_interface_consistent' into develop Conflicts: app/views/admin_censor_rule/new.rhtml app/views/admin_general/index.rhtml app/views/admin_general/timeline.rhtml app/views/admin_request/_some_requests.rhtml app/views/admin_request/show.rhtml app/views/admin_track/_some_tracks.rhtml
| | * | Fix bug where current user was always shown when creating censor rule for a ↵Matthew Landauer2013-03-08-2/+2
| | | | | | | | | | | | | | | | request
| | * | Use consistent link formattingMatthew Landauer2013-03-08-4/+2
| | | |
| | * | Inline helperMatthew Landauer2013-03-08-5/+1
| | | |
| | * | Simplify by using helpersMatthew Landauer2013-03-08-6/+3
| | | |
| | * | Use helpers for iconsMatthew Landauer2013-03-08-24/+36
| | | |
| | * | Configuration::admin_public_url doesn't exist anymoreMatthew Landauer2013-03-08-3/+3
| | | |
| | * | New helper for showing two links for a userMatthew Landauer2013-03-08-3/+3
| | | |
| | * | Inline helper methodMatthew Landauer2013-03-08-1/+1
| | | |
generated by cgit v1.2.3 (git 2.25.1) at 2025-09-18 18:27:42 +0000