Commit message (Collapse) | Author | Age | Lines | |
---|---|---|---|---|
* | Merge branch 'feature/cleanup-popups' into release/0.16 | Louise Crow | 2014-01-14 | -34/+41 |
| | | | | | | | | Conflicts: Gemfile.lock app/views/layouts/default.html.erb config/application.rb public/admin/stylesheets/admin.css | |||
* | Switch Javascript (bar admin) to be served with the asset pipline | Mark Longair | 2013-11-19 | -0/+53 |