diff options
| author | Louise Crow <louise.crow@gmail.com> | 2014-10-14 09:51:05 +0100 |
|---|---|---|
| committer | Louise Crow <louise.crow@gmail.com> | 2014-10-14 09:51:05 +0100 |
| commit | 55e0b9f75160222d07773f38c8aa67aa9de1487e (patch) | |
| tree | 5253e2e570c49b0c2f9b07027858c6f93798aae1 /app/assets/javascripts/admin.js | |
| parent | c64360898beca1162a1bdef9ca4b76676e0907f8 (diff) | |
| parent | 5e1517acfc7b2c46523ca0657d67bdf53299826b (diff) | |
Merge branch 'issues/222-category-editing-add-order-interface' into rails-3-develop
Diffstat (limited to 'app/assets/javascripts/admin.js')
| -rw-r--r-- | app/assets/javascripts/admin.js | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/app/assets/javascripts/admin.js b/app/assets/javascripts/admin.js index 0b5d56525..4925a65a4 100644 --- a/app/assets/javascripts/admin.js +++ b/app/assets/javascripts/admin.js @@ -1,7 +1,10 @@ // ... //= require jquery //= require jquery.ui.tabs +//= require jquery.ui.sortable +//= require jquery.ui.effect-highlight //= require admin/bootstrap-collapse //= require admin/bootstrap-tab //= require admin/admin +//= require admin/category-order //= require jquery_ujs |