Merge pull request #510 from emanueldima/master#fix-bootstrap-multise…

…lect-version fix bootstrap/bower version and grunt path
EUDAT-B2SHARE · Dec 17, 2014 · 3750e5a · 3750e5a
2 parents b3711f1 + 6d508a9
commit 3750e5a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/bower.json b/bower.json
@@ -35,7 +35,7 @@
     "plupload": "*",
     "lindat-license-selector": "0.0.3",
     "bootstrap-switch": "https://github.com/nostalgiaz/bootstrap-switch.git#3.0",
-    "bootstrap-multiselect": "https://github.com/davidstutz/bootstrap-multiselect.git",
+    "bootstrap-multiselect": "0.9.10",
     "font-awesome": "*",
     "bootstrap-tagsinput": "*",
     "jquery.caret": "https://github.com/acdvorak/jquery.caret.git",

diff --git a/grunt/copy.js b/grunt/copy.js
@@ -35,7 +35,7 @@ module.exports = {
                ,'prism/themes/prism.css'
                ,'lindat-license-selector/license-selector.min.css'
                ,'bootstrap-switch/dist/css/bootstrap3/bootstrap-switch.css'
-               ,'bootstrap-multiselect/css/bootstrap-multiselect.css'
+               ,'bootstrap-multiselect/dist/css/bootstrap-multiselect.css'
                ,'bootstrap-tagsinput/dist/bootstrap-tagsinput.css'],
         dest: '<%= globalConfig.installation_path %>/css/'
     },
@@ -86,7 +86,7 @@ module.exports = {
              ,'bootstrap/dist/js/bootstrap.min.js'
              ,'bootstrap-switch/dist/js/bootstrap-switch.js'
              ,'bootstrap-switch/dist/js/bootstrap-switch.min.js'
-             ,'bootstrap-multiselect/js/bootstrap-multiselect.js'
+             ,'bootstrap-multiselect/dist/js/bootstrap-multiselect.js'
              ,'jquery/dist/jquery.min.js'
              ,'jquery/dist/jquery.min.map'
              ,'jquery-tokeninput/src/jquery.tokeninput.js'