aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeLines
* Merge remote-tracking branch 'openaustralia_github/force-ssl' into developLouise Crow2013-03-12-0/+86
|\ | | | | | | | | Conflicts: Gemfile.lock
| * Add comment about middleware change for rails 3Matthew Landauer2013-02-19-1/+5
| |
| * Fix for incoming mailer failing with undefined method `new' for ↵Matthew Landauer2013-02-19-1/+2
| | | | | | | | "Rack::SSL":String
| * Add varnish configuration for caching http and https requests differentlyMatthew Landauer2013-02-18-0/+40
| |
| * Use different form of X-Forwarded-Proto header that is correctly recognised ↵Matthew Landauer2013-02-18-1/+1
| | | | | | | | by Varnish
| * Add a little documentation on how to set up apache as an SSL terminatorMatthew Landauer2013-02-15-0/+28
| |
| * Oops. ssl configuration should be in production environmentMatthew Landauer2013-02-15-2/+2
| |
| * Add configuration to force ssl for the whole siteMatthew Landauer2013-02-15-1/+14
| |
* | Turn off transactional fixtures and fully destroy the message we import in ↵Louise Crow2013-03-12-0/+12
| | | | | | | | order to cleanup the data created by this test.
* | Merge remote-tracking branch ↵Louise Crow2013-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 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
| | |
| * | Refactor user_admin_link_for_requestMatthew Landauer2013-03-08-3/+2
| | |
| * | Update admin timeline with new consistent link formatMatthew Landauer2013-03-08-4/+2
| | |
| * | Give explanatory titles to links which can be seen on hoverMatthew Landauer2013-03-08-4/+4
| | |
| * | Extract helper for making an iconMatthew Landauer2013-03-08-3/+11
| | |
| * | Move admin specific helpers to AdminHelperMatthew Landauer2013-03-08-18/+20
| | |
| * | Would help if I wrote that helper correctlyMatthew Landauer2013-03-08-2/+2
| | |
| * | Use new standard form of links on home page of adminMatthew Landauer2013-03-08-10/+5
| | |
| * | Update admin specific helpers with new standard form of linksMatthew Landauer2013-03-08-2/+4
| | |
| * | Removed unused admin page. This stuff is now shown on the summary pageMatthew Landauer2013-03-08-31/+0
| | |
| * | Use normal link for admin interface and eye icon for main siteMatthew Landauer2013-03-08-2/+2
| | |
* | | Add some more fixtures so that spec/script/mailin_spec.rb won't interfere ↵Louise Crow2013-03-11-5/+81
| | | | | | | | | | | | with other tests.
* | | Merge remote-tracking branch ↵Louise Crow2013-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 layoutMatthew Landauer2013-03-08-7/+9
| | | |
| * | | Replace a few instances of <a> tags with link_toMatthew Landauer2013-03-08-8/+8
| | | |
| * | | Removing unused partialMatthew Landauer2013-03-08-10/+0
| | | |
| * | | Remove commented out code in view for deleting a userMatthew Landauer2013-03-08-10/+0
| | | |
| * | | In admin interface use url helpers instead of hardcoded urlsMatthew Landauer2013-03-08-58/+58
| | | |
* | | | Merge remote-tracking branch 'openaustralia_github/add_code_climate_badge' ↵Louise Crow2013-03-11-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | into develop
| * | | | Add code climate badge to READMEMatthew Landauer2013-03-09-1/+1
| | | | |
* | | | | Merge remote-tracking branch 'vjpr_github/fix-signup-chrome' into developLouise Crow2013-03-08-3/+3
|\ \ \ \ \
| * | | | | Disable auto-complete for signup fields to fix a bug with Chrome auto-filling.Vaughan Rouesnel2012-11-18-3/+3
| | | | | |
* | | | | | Merge remote-tracking branch 'openaustralia_github/html5' into developLouise Crow2013-03-08-274/+195
|\ \ \ \ \ \ | |_|/ / / / |/| | | / / | | |_|/ / | |/| | | | | | | | Conflicts: app/views/admin_general/index.rhtml app/views/admin_request/show.rhtml
| * | | | Remove monkeypatch that makes tag helper html4 compliantMatthew Landauer2013-03-07-9/+0
| | | | |
| * | | | Make default maintenance page html5Matthew Landauer2013-03-07-1/+2
| | | | |
| * | | | Make view as html display as html5Matthew Landauer2013-03-07-2/+1
| | | | |
| * | | | Make no_chrome layout html5Matthew Landauer2013-03-07-1/+2
| | | | |
| * | | | Don't want duplicate id's on the same page. That's badMatthew Landauer2013-03-07-8/+8
| | | | |
| * | | | Generate form tags with non-empty action attributeMatthew Landauer2013-03-07-4/+4
| | | | |
| * | | | Make url in link actually be something sensibleMatthew Landauer2013-03-07-1/+1
| | | | |
| * | | | Replace use of <big> tag with <span class="big">Matthew Landauer2013-03-07-3/+7
| | | | |
| * | | | Replace two links with oneMatthew Landauer2013-03-07-4/+3
| | | | |
| * | | | Encode parameters of Twitter linkMatthew Landauer2013-03-07-1/+5
| | | | |