Commit e49b9022 authored by Morris Jobke's avatar Morris Jobke Committed by Thomas Müller
Browse files

bower snapjs

parent fd829cb0
......@@ -6,7 +6,7 @@ filter:
- 'core/l10n/*'
- 'apps/*/l10n/*'
- 'lib/l10n/*'
- 'core/vendor/*'
- 'core/vendor/*'
- 'core/js/tests/lib/*.js'
- 'core/js/tests/specs/*.js'
- 'core/js/jquery-showpassword.js'
......@@ -14,7 +14,6 @@ filter:
- 'core/js/jquery-ui-1.10.0.custom.js'
- 'core/js/placeholders.js'
- 'core/js/jquery.multiselect.js'
- 'core/js/snap.js'
imports:
......
Subproject commit 8e3d65c9d1e21c04ce62db9d5531764d91b76f94
Subproject commit b81d132702a2f7983919b3465e02ba365fd7b6cb
......@@ -18,7 +18,8 @@
"jquery": "~1.10.0",
"moment": "~2.8.3",
"select2": "3.4.8",
"underscore": "1.6.0",
"zxcvbn": "*"
"zxcvbn": "*",
"snapjs": "2.0.0-rc1",
"underscore": "1.6.0"
}
}
test/
src/
.bower.json
.gitignore
.jshintrc
.travis.yml
Gemfile
gruntfile.js
README.md
# underscore
underscore/**
......@@ -46,3 +53,11 @@ select2/**
zxcvbn/**
!zxcvbn/zxcvbn.js
!zxcvbn/LICENSE.txt
# snapjs
snapjs/demo
snapjs/dist/2.0.0-rc1
snapjs/dist/latest/snap.css
snapjs/dist/latest/snap.min.js
snapjs/scripts
snapjs/*.json
This diff is collapsed.
......@@ -347,7 +347,7 @@ class OC {
OC_Util::addScript('search', 'result');
OC_Util::addScript("oc-requesttoken");
OC_Util::addScript("apps");
OC_Util::addScript("snap");
OC_Util::addVendorScript('snapjs/dist/latest/snap');
OC_Util::addVendorScript('moment/min/moment-with-locales');
// avatars
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment