Commit 9e79bb73 authored by Philipp Eichhorn's avatar Philipp Eichhorn
Browse files

Fix password strength meter tooltip message

parent 89078909
......@@ -24,7 +24,7 @@
"select2": "3.4.8",
"zxcvbn": "*",
"snapjs": "2.0.0-rc1",
"strengthify": "0.4.2",
"strengthify": "0.5.0",
"underscore": "1.8.3",
"bootstrap": "3.3.6",
"backbone": "1.2.3",
......
......@@ -110,7 +110,8 @@ $(document).ready(function() {
t('core', 'So-so password'),
t('core', 'Good password'),
t('core', 'Strong password')
]
],
drawTitles: true
});
// centers the database chooser if it is too wide
......
......@@ -52,7 +52,6 @@ script('core', [
<label for="adminpass" class="infield"><?php p($l->t( 'Password' )); ?></label>
<input type="checkbox" id="show" name="show">
<label for="show"></label>
<div class="strengthify-wrapper"></div>
</p>
</fieldset>
......
......@@ -343,7 +343,8 @@ $(document).ready(function () {
t('core', 'So-so password'),
t('core', 'Good password'),
t('core', 'Strong password')
]
],
drawTitles: true
});
// does the user have a custom avatar? if he does show #removeavatar
......
......@@ -48,9 +48,9 @@ OC_Util::addScript('settings', 'authtoken_collection');
OC_Util::addScript('settings', 'authtoken_view');
OC_Util::addScript( 'settings', 'personal' );
OC_Util::addScript('settings', 'certificates');
OC_Util::addStyle( 'settings', 'settings' );
\OC_Util::addVendorScript('strengthify/jquery.strengthify');
\OC_Util::addVendorStyle('strengthify/strengthify');
OC_Util::addStyle( 'settings', 'settings' );
\OC_Util::addScript('files', 'jquery.fileupload');
if ($config->getSystemValue('enable_avatars', true) === true) {
\OC_Util::addVendorScript('jcrop/js/jquery.Jcrop');
......
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