bower zxcvbn

3rdparty

@@ -1 +1 @@
-Subproject commit 165fadf4252843fb3015a1138cdabef66a1988bb
+Subproject commit 8e3d65c9d1e21c04ce62db9d5531764d91b76f94

bower.json

@@ -18,6 +18,7 @@
     "jquery": "~1.10.0",
     "moment": "~2.8.3",
     "select2": "3.4.8",
-    "underscore": "1.6.0"
+    "underscore": "1.6.0",
+    "zxcvbn": "*"
   }
 }

core/js/setup.js

@@ -94,7 +94,7 @@ $(document).ready(function() {
 	}
 
 	$('#adminpass').strengthify({
-		zxcvbn: OC.linkTo('3rdparty','zxcvbn/js/zxcvbn.js'),
+		zxcvbn: OC.linkTo('core','vendor/zxcvbn/zxcvbn.js'),
 		titles: [
 			t('core', 'Very weak password'),
 			t('core', 'Weak password'),

core/vendor/.gitignore

@@ -41,3 +41,8 @@ select2/**
 !select2/select2x2.png
 !select2/select2-spinner.gif
 !select2/LICENSE
+
+#zxcvbn
+zxcvbn/**
+!zxcvbn/zxcvbn.js
+!zxcvbn/LICENSE.txt

core/vendor/zxcvbn/LICENSE.txt

@@ -0,0 +1,20 @@
+Copyright (c) 2012 Dropbox, Inc.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

settings/js/personal.js

@@ -282,7 +282,7 @@ $(document).ready(function () {
 	});
 
 	$('#pass2').strengthify({
-		zxcvbn: OC.linkTo('3rdparty', 'zxcvbn/js/zxcvbn.js'),
+		zxcvbn: OC.linkTo('core','vendor/zxcvbn/zxcvbn.js'),
 		titles: [
 			t('core', 'Very weak password'),
 			t('core', 'Weak password'),