aboutsummaryrefslogtreecommitdiffstats
path: root/app/assets/javascripts
Commit message (Collapse)AuthorAgeLines
* Merge branch 'feature/batch-requests' into rails-3-developLouise Crow2014-01-29-0/+81
|\ | | | | | | | | | | Conflicts: config/general.yml-example spec/factories.rb
| * Add list of bodies batch request will be sent to.Louise Crow2013-12-04-0/+14
| |
| * Javascript enhancements.Louise Crow2013-12-04-0/+67
| | | | | | | | Add or remove all buttons, ajax search as you type.
* | Merge branch 'feature/cleanup-popups' into release/0.16Louise Crow2014-01-14-34/+41
|/ | | | | | | | Conflicts: Gemfile.lock app/views/layouts/default.html.erb config/application.rb public/admin/stylesheets/admin.css
* Use the jquery-rails-ui gem, just including the modules we needMark Longair2013-11-26-0/+2
| | | | | | | | | | | | | | As far as I can tell, we only use the 'tabs' module in admin and 'datepicker' on the user-facing part of the site. The advantage of using this packaging of the gem is that its assets are in the gem, which simplifies things greatly - otherwise we'd end up doing something like rewrite the jquery-ui CSS to SCSS, referencing the image assets via sass-rails helpers or keep them in their expected paths in public or something. (Thanks to Louise Crow for pointing out the problem of just moving jquery-ui's image assets into the asset pipeline.)
* Remove jquery-ui; in a later commit we'll add it back via the gemMark Longair2013-11-26-526/+0
| | | | | | | The intention is to stop including our own custom build of jquery-ui but instead use the jquery-ui-rails gem, which works well with the asset pipeline. This commit should remove all traces of the old download of jquery-ui.
* Move last JS files from public/javascripts/ to app/assets/javascripts/Mark Longair2013-11-26-0/+3638
|
* Bundle up admin javascript using the asset pipelineMark Longair2013-11-19-0/+655
| | | | | This includes adding coffee-rails so that the .js.coffee file is compiled to .js automatically.
* Switch Javascript (bar admin) to be served with the asset piplineMark Longair2013-11-19-0/+1809