Commit message (Collapse) | Author | Age | Lines | |
---|---|---|---|---|
* | Merge remote-tracking branch 'openaustralia_github/force-ssl' into develop | Louise Crow | 2013-03-12 | -0/+86 |
|\ | | | | | | | | | Conflicts: Gemfile.lock | |||
| * | Add comment about middleware change for rails 3 | Matthew Landauer | 2013-02-19 | -1/+5 |
| | | ||||
| * | Fix for incoming mailer failing with undefined method `new' for ↵ | Matthew Landauer | 2013-02-19 | -1/+2 |
| | | | | | | | | "Rack::SSL":String | |||
| * | Add varnish configuration for caching http and https requests differently | Matthew Landauer | 2013-02-18 | -0/+40 |
| | | ||||
| * | Use different form of X-Forwarded-Proto header that is correctly recognised ↵ | Matthew Landauer | 2013-02-18 | -1/+1 |
| | | | | | | | | by Varnish | |||
| * | Add a little documentation on how to set up apache as an SSL terminator | Matthew Landauer | 2013-02-15 | -0/+28 |
| | | ||||
| * | Oops. ssl configuration should be in production environment | Matthew Landauer | 2013-02-15 | -2/+2 |
| | | ||||
| * | Add configuration to force ssl for the whole site | Matthew Landauer | 2013-02-15 | -1/+14 |
| | | ||||
* | | Turn off transactional fixtures and fully destroy the message we import in ↵ | Louise Crow | 2013-03-12 | -0/+12 |
| | | | | | | | | order to cleanup the data created by this test. | |||
* | | Merge remote-tracking branch ↵ | Louise Crow | 2013-03-11 | -181/+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 Landauer | 2013-03-08 | -2/+2 |
| | | | | | | | | | | | | request | |||
| * | | Use consistent link formatting | Matthew Landauer | 2013-03-08 | -4/+2 |
| | | | ||||
| * | | Inline helper | Matthew Landauer | 2013-03-08 | -5/+1 |
| | | | ||||
| * | | Simplify by using helpers | Matthew Landauer | 2013-03-08 | -6/+3 |
| | | | ||||
| * | | Use helpers for icons | Matthew Landauer | 2013-03-08 | -24/+36 |
| | | | ||||
| * | | Configuration::admin_public_url doesn't exist anymore | Matthew Landauer | 2013-03-08 | -3/+3 |
| | | | ||||
| * | | New helper for showing two links for a user | Matthew Landauer | 2013-03-08 | -3/+3 |
| | | | ||||
| * | | Inline helper method | Matthew Landauer | 2013-03-08 | -1/+1 |
| | | | ||||
| * | | Refactor user_admin_link_for_request | Matthew Landauer | 2013-03-08 | -3/+2 |
| | | | ||||
| * | | Update admin timeline with new consistent link format | Matthew Landauer | 2013-03-08 | -4/+2 |
| | | | ||||
| * | | Give explanatory titles to links which can be seen on hover | Matthew Landauer | 2013-03-08 | -4/+4 |
| | | | ||||
| * | | Extract helper for making an icon | Matthew Landauer | 2013-03-08 | -3/+11 |
| | | | ||||
| * | | Move admin specific helpers to AdminHelper | Matthew Landauer | 2013-03-08 | -18/+20 |
| | | | ||||
| * | | Would help if I wrote that helper correctly | Matthew Landauer | 2013-03-08 | -2/+2 |
| | | | ||||
| * | | Use new standard form of links on home page of admin | Matthew Landauer | 2013-03-08 | -10/+5 |
| | | | ||||
| * | | Update admin specific helpers with new standard form of links | Matthew Landauer | 2013-03-08 | -2/+4 |
| | | | ||||
| * | | Removed unused admin page. This stuff is now shown on the summary page | Matthew Landauer | 2013-03-08 | -31/+0 |
| | | | ||||
| * | | Use normal link for admin interface and eye icon for main site | Matthew Landauer | 2013-03-08 | -2/+2 |
| | | | ||||
* | | | Add some more fixtures so that spec/script/mailin_spec.rb won't interfere ↵ | Louise Crow | 2013-03-11 | -5/+81 |
| | | | | | | | | | | | | with other tests. | |||
* | | | Merge remote-tracking branch ↵ | Louise Crow | 2013-03-11 | -174/+156 |
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'openaustralia_github/use_url_helpers_in_admin_links' into develop Conflicts: app/views/admin_request/_incoming_message_actions.rhtml app/views/admin_request/show.rhtml | |||
| * | | | Give the editing of censor rule a bootstrap layout | Matthew Landauer | 2013-03-08 | -7/+9 |
| | | | | ||||
| * | | | Replace a few instances of <a> tags with link_to | Matthew Landauer | 2013-03-08 | -8/+8 |
| | | | | ||||
| * | | | Removing unused partial | Matthew Landauer | 2013-03-08 | -10/+0 |
| | | | | ||||
| * | | | Remove commented out code in view for deleting a user | Matthew Landauer | 2013-03-08 | -10/+0 |
| | | | | ||||
| * | | | In admin interface use url helpers instead of hardcoded urls | Matthew Landauer | 2013-03-08 | -58/+58 |
| | | | | ||||
* | | | | Merge remote-tracking branch 'openaustralia_github/add_code_climate_badge' ↵ | Louise Crow | 2013-03-11 | -1/+1 |
|\ \ \ \ | | | | | | | | | | | | | | | | into develop | |||
| * | | | | Add code climate badge to README | Matthew Landauer | 2013-03-09 | -1/+1 |
| | | | | | ||||
* | | | | | Merge remote-tracking branch 'vjpr_github/fix-signup-chrome' into develop | Louise Crow | 2013-03-08 | -3/+3 |
|\ \ \ \ \ | ||||
| * | | | | | Disable auto-complete for signup fields to fix a bug with Chrome auto-filling. | Vaughan Rouesnel | 2012-11-18 | -3/+3 |
| | | | | | | ||||
* | | | | | | Merge remote-tracking branch 'openaustralia_github/html5' into develop | Louise Crow | 2013-03-08 | -274/+195 |
|\ \ \ \ \ \ | |_|/ / / / |/| | | / / | | |_|/ / | |/| | | | | | | | | Conflicts: app/views/admin_general/index.rhtml app/views/admin_request/show.rhtml | |||
| * | | | | Remove monkeypatch that makes tag helper html4 compliant | Matthew Landauer | 2013-03-07 | -9/+0 |
| | | | | | ||||
| * | | | | Make default maintenance page html5 | Matthew Landauer | 2013-03-07 | -1/+2 |
| | | | | | ||||
| * | | | | Make view as html display as html5 | Matthew Landauer | 2013-03-07 | -2/+1 |
| | | | | | ||||
| * | | | | Make no_chrome layout html5 | Matthew Landauer | 2013-03-07 | -1/+2 |
| | | | | | ||||
| * | | | | Don't want duplicate id's on the same page. That's bad | Matthew Landauer | 2013-03-07 | -8/+8 |
| | | | | | ||||
| * | | | | Generate form tags with non-empty action attribute | Matthew Landauer | 2013-03-07 | -4/+4 |
| | | | | | ||||
| * | | | | Make url in link actually be something sensible | Matthew Landauer | 2013-03-07 | -1/+1 |
| | | | | | ||||
| * | | | | Replace use of <big> tag with <span class="big"> | Matthew Landauer | 2013-03-07 | -3/+7 |
| | | | | | ||||
| * | | | | Replace two links with one | Matthew Landauer | 2013-03-07 | -4/+3 |
| | | | | | ||||
| * | | | | Encode parameters of Twitter link | Matthew Landauer | 2013-03-07 | -1/+5 |
| | | | | |