aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeLines
* Merge branch 'hotfix/0.8.0.1' into wdtkLouise Crow2013-04-02-10/+33
|\
| * Merge remote-tracking branch 'openaustralia_github/https_in_emails' into ↵hotfix/0.8.0.1Louise Crow2013-04-02-7/+30
| |\ | | | | | | | | | hotfix/0.8.0.1
| | * When force_ssl is true make links in emails httpsMatthew Landauer2013-04-02-7/+30
| | |
| * | Merge remote-tracking branch 'openaustralia_github/email_alert_path_fixes' ↵Louise Crow2013-04-02-3/+3
| |\ \ | | | | | | | | | | | | into hotfix/0.8.0.1
| | * | Use full urls in outgoing_message_url as the name impliesMatthew Landauer2013-04-02-2/+2
| | |/
| | * Follow alphabetical ordering.Louise Crow2013-03-19-1/+1
| | |
| | * Merge branch 'release/0.8' into developLouise Crow2013-03-19-103/+140
| | |\ | | | | | | | | | | | | | | | | | | | | Conflicts: locale/he_IL/app.po locale/id/app.po
| | * \ Merge branch 'hotfix/0.7.0.5' into developLouise Crow2013-03-18-19/+19
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: Gemfile.lock locale/cy/app.po locale/fr/app.po locale/he_IL/app.po locale/id/app.po locale/pt_BR/app.po locale/ro_RO/app.po locale/sr@latin/app.po locale/uk/app.po
| * | \ \ Merge branch 'release/0.8'0.8Louise Crow2013-03-19-6/+8
| |\ \ \ \ | | | |_|/ | | |/| |
| * | | | Merge branch 'release/0.8'Louise Crow2013-03-19-2235/+10709
| |\ \ \ \
| * \ \ \ \ Merge branch 'hotfix/0.7.0.5'Louise Crow2013-03-18-20/+20
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
* | | | | | Merge branch 'release/0.8' into wdtkLouise Crow2013-03-19-6/+8
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | |
| * | | | | Supply info request id in an HTML 5 data attributerelease/0.8Louise Crow2013-03-19-6/+8
| | |_|/ / | |/| | |
* | | | | Merge branch 'release/0.8' into wdtkLouise Crow2013-03-19-2189/+10663
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: app/controllers/admin_request_controller.rb app/views/contact_mailer/from_admin_message.rhtml
| * | | | Bump version number to 0.8Louise Crow2013-03-19-1/+1
| | | | |
| * | | | Allow the emergency user account to be disabled.Louise Crow2013-03-19-4/+22
| | | | |
| * | | | Latest translations from Transifex.Louise Crow2013-03-19-93/+92
| | | | |
| * | | | Merge branch 'hotfix/0.7.0.5' into release/0.8Louise Crow2013-03-18-19/+20
| |\ \ \ \ | | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: Gemfile.lock locale/cy/app.po locale/fr/app.po locale/he_IL/app.po locale/id/app.po locale/pt_BR/app.po locale/ro_RO/app.po locale/sr@latin/app.po locale/uk/app.po
| * | | | Merge branch 'develop' into release/0.8Louise Crow2013-03-14-8/+14
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | Move Gemfile to httpsLouise Crow2013-03-14-2/+2
| | | | |
| | * | | Update to specific commit in webrat for launchy fix without other breaking ↵Louise Crow2013-03-14-3/+4
| | | | | | | | | | | | | | | | | | | | changes.
| | * | | And now latest version of launchy.Louise Crow2013-03-14-4/+3
| | | | |
| | * | | Pull more up-to-date version of webrat from git - trying to resolve travis ↵Louise Crow2013-03-14-8/+13
| | | | | | | | | | | | | | | | | | | | issues with launchy dependency.
| | * | | Fix bad merge of d88b79d1aa24a78ed95255a37a0403d7e3c0117eLouise Crow2013-03-14-3/+3
| | | | |
| | * | | Downgrade launchy to avoid deprecation warning.Louise Crow2013-03-14-5/+6
| | | | |
| * | | | Fix bad merge of d88b79d1aa24a78ed95255a37a0403d7e3c0117eLouise Crow2013-03-14-3/+3
| | | | |
| * | | | Add some release notes.Louise Crow2013-03-14-0/+17
| |/ / /
| * | | New strings for translation.Louise Crow2013-03-14-333/+3983
| | | |
| * | | Cleanup whitespace.Louise Crow2013-03-14-57/+57
| | | |
| * | | Latest translations from Transifex.Louise Crow2013-03-14-1951/+1977
| | | |
| * | | Try adding launchy as a gem - webrat seems to have a dependency on it.Louise Crow2013-03-13-0/+5
| | | |
| * | | Consistent syntax for X-Forwarded-ProtoLouise Crow2013-03-13-23/+23
| | | |
| * | | 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
| | | | |
| | * | | Fix bug when user not owner of request changing state to requires_admin ↵Matthew Landauer2013-03-04-4/+13
| | | | | | | | | | | | | | | | | | | | 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/+3
| | | | |
| | * | | No need for instance variables in action without viewMatthew Landauer2013-03-04-34/+34
| | | | |
| | * | | Simplify controller test by mock behaviour in AbilityMatthew Landauer2013-03-03-45/+13
| | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-31 01:20:13 +0000