Commit message (Collapse) | Author | Age | Lines | |
---|---|---|---|---|
* | Merge remote-tracking branch ↵ | Louise Crow | 2013-03-08 | -13/+43 |
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'openaustralia_github/feature_more_info_guessed_requests_in_holding_pen' into develop Conflicts: app/views/admin_general/_admin_navbar.rhtml app/views/admin_general/admin.coffee app/views/admin_general/admin.js app/views/admin_general/admin_js.erb app/views/admin_general/index.rhtml app/views/admin_general/stats.rhtml app/views/admin_general/timeline.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/_some_requests.rhtml app/views/admin_request/show.rhtml app/views/admin_track/_some_tracks.rhtml app/views/admin_track/list.rhtml app/views/admin_user/_user_table.rhtml app/views/admin_user/show.rhtml | |||
| * | Add url_title to make it easy to double-check the redelivery action | Matthew Landauer | 2013-02-25 | -0/+4 |
| | | ||||
| * | Add more information about matched request in admin interface to make ↵ | Matthew Landauer | 2013-02-25 | -5/+33 |
| | | | | | | | | checking easier | |||
| * | Refactor view | Matthew Landauer | 2013-02-25 | -5/+5 |
| | | ||||
| * | Don't try to html validate the new default admin interface. It won't work | Matthew Landauer | 2013-02-25 | -0/+3 |
| | | ||||
| * | Move serving of js for admin interface from general to admin_general controller | Matthew Landauer | 2013-02-25 | -9/+8 |
| | | ||||
| * | Updated docs for compiling css for admin interface | Matthew Landauer | 2013-02-25 | -8/+3 |
| | | ||||
| * | Don't try to install adminbootstraptheme anymore as it's now the default | Matthew Landauer | 2013-02-25 | -1/+0 |
| | | ||||
| * | Rename assets for admin interface directory | Matthew Landauer | 2013-02-25 | -8/+8 |
| | | ||||
| * | Update paths in compass config to sass and compiled stylesheets, js & images | Matthew Landauer | 2013-02-25 | -4/+4 |
| | | ||||
| * | No need to set the admin icon paths | Matthew Landauer | 2013-02-25 | -6/+4 |
| | | ||||
| * | Merge in adminbootstraptheme 323d704ab4f1ffe31f20fcabeaf030c462dfbadf into ↵ | Matthew Landauer | 2013-02-25 | -858/+3276 |
| | | | | | | | | main project | |||
* | | Reignore schema.rb | Louise Crow | 2013-03-08 | -0/+1 |
| | | ||||
* | | Merge remote-tracking branch 'openaustralia_github/checkin_current_sql' into ↵ | Louise Crow | 2013-03-08 | -3/+2095 |
|\ \ | | | | | | | | | | develop | |||
| * | | Checkin current snapshot of sql as per standard Rails good practise. | Matthew Landauer | 2013-02-26 | -3/+2095 |
| |/ | | | | | | | | | | | Also has the advantage that it makes it easier to switch between branches with different schemas as the test db schema will be generated from the checked in file. | |||
* | | Merge remote-tracking branch 'openaustralia_github/add_coverage_testing' ↵ | Louise Crow | 2013-03-08 | -1/+31 |
|\ \ | | | | | | | | | | into develop | |||
| * | | Run local coverage tests as well as those on coveralls.io and exclude ↵ | Matthew Landauer | 2013-03-02 | -1/+11 |
| | | | | | | | | | | | | plugins and commonlib directories | |||
| * | | Add coveralls.io. Think travis.ci for coverage testing | Matthew Landauer | 2013-03-01 | -1/+21 |
| |/ | ||||
* | | Merge remote-tracking branch ↵ | Louise Crow | 2013-03-08 | -0/+0 |
|\ \ | | | | | | | | | | 'openaustralia_github/quoting_contact_email_fix' into develop | |||
| * | | Don't quote plain text message for text email. Fixes #828 | Matthew Landauer | 2013-02-25 | -3/+3 |
| |/ | | | | | | | | | This is fixed for emails to the admin via the contact form, emails between users and emails from the admins to a user | |||
* | | Use relative urls. | Louise Crow | 2013-03-06 | -5/+5 |
| | | ||||
* | | Relative URL | Louise Crow | 2013-03-06 | -1/+1 |
| | | ||||
* | | Use relative paths. | Louise Crow | 2013-03-06 | -1/+1 |
| | | ||||
* | | Use relative paths | Louise Crow | 2013-03-06 | -5/+5 |
| | | ||||
* | | Use relative url. | Louise Crow | 2013-03-06 | -1/+1 |
| | | ||||
* | | Remove support for admin proxy setup. | Louise Crow | 2013-03-06 | -3/+3 |
| | | ||||
* | | Correct route name. | Louise Crow | 2013-03-06 | -1/+1 |
| | | ||||
* | | Clean up name conflict in admin user routes. | Louise Crow | 2013-03-06 | -9/+9 |
| | | ||||
* | | Cleanup obsolete url | Louise Crow | 2013-03-06 | -4/+4 |
| | | ||||
* | | Merge remote-tracking branch 'openaustralia_github/make-links-relative' into ↵ | Louise Crow | 2013-03-06 | -406/+356 |
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | |||
| * | | Reinstate main_url and admin_url helpers with deprecation warning | Matthew Landauer | 2013-02-18 | -0/+26 |
| | | | ||||
| * | | Configurations ADMIN_BASE_URL and ADMIN_PUBLIC_URL are no longer used anywhere | Matthew Landauer | 2013-02-15 | -24/+0 |
| | | | ||||
| * | | Don't need to set asset_host anymore because we are removing the proxy admin ↵ | Matthew Landauer | 2013-02-15 | -11/+0 |
| | | | | | | | | | | | | setup | |||
| * | | Remove unused parameters from helper method | Matthew Landauer | 2013-02-15 | -19/+19 |
| | | | ||||
| * | | Make internal links relative | Matthew Landauer | 2013-02-15 | -21/+21 |
| | | | ||||
| * | | Use absolute urls when redirecting | Matthew Landauer | 2013-02-15 | -2/+2 |
| | | | ||||
| * | | Fix incoming_message_url to return an absolute path. Don't use this helper ↵ | Matthew Landauer | 2013-02-15 | -3/+3 |
| | | | | | | | | | | | | with links | |||
| * | | Remove unused helper | Matthew Landauer | 2013-02-15 | -4/+0 |
| | | | ||||
| * | | Replace use of route_url(:only_path => true) with route_path where we can | Matthew Landauer | 2013-02-15 | -3/+3 |
| | | | ||||
| * | | Inline helper method | Matthew Landauer | 2013-02-15 | -12/+8 |
| | | | ||||
| * | | Inline helper | Matthew Landauer | 2013-02-15 | -7/+3 |
| | | | ||||
| * | | Inline helper | Matthew Landauer | 2013-02-15 | -23/+19 |
| | | | ||||
| * | | Stop using admin_url to generate absolute url for the admin interface | Matthew Landauer | 2013-02-15 | -69/+25 |
| | | | ||||
| * | | Stop using main_url to generate absolute urls for the main site | Matthew Landauer | 2013-02-15 | -76/+46 |
| | | | ||||
| * | | Make links relative | Matthew Landauer | 2013-02-15 | -2/+14 |
| | | | ||||
| * | | Make link relative | Matthew Landauer | 2013-02-15 | -1/+1 |
| | | | ||||
| * | | Rename named routes for categorisation game as they clash with request_url & ↵ | Matthew Landauer | 2013-02-15 | -8/+8 |
| | | | | | | | | | | | | request_path helpers | |||
| * | | Redirects should be done with absolute urls | Matthew Landauer | 2013-02-15 | -21/+24 |
| | | | ||||
| * | | Rename helper method | Matthew Landauer | 2013-02-15 | -41/+41 |
| | | | ||||
| * | | Make links to within the site use relative urls | Matthew Landauer | 2013-02-15 | -18/+23 |
| | | |