hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-13 04:53:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

PHRAS-1267 Add password strenght plugin to require vendor

Browse Source
This commit is contained in:
Xavier Rousset
2016-10-24 15:14:07 +02:00
parent 9a2e4677d9
commit 7f45d7ed01
5 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Vagrantfile vendored
View File

@@ -63,7 +63,7 @@ Vagrant.configure("2") do |config|
v.customize [ v.customize [
"modifyvm", :id, "modifyvm", :id,
"--name", $hostname, "--name", $hostname,
"--memory", 2048, "--memory", 4096,
"--cpus", 2, "--cpus", 2,
] ]
end end

1
www/scripts/apps/admin/require.config.js
View File

@@ -16,7 +16,6 @@ require.config({
"jquery.ui": "../assets/vendors/jquery-ui/jquery-ui.min", "jquery.ui": "../assets/vendors/jquery-ui/jquery-ui.min",
underscore: "../assets/vendors/underscore/underscore.min", underscore: "../assets/vendors/underscore/underscore.min",
backbone: "../assets/vendors/backbone/backbone.min", backbone: "../assets/vendors/backbone/backbone.min",
zxcvbn: "../assets/vendors/zxcvbn/zxcvbn.min",
"jquery.ui.widget": "../assets/vendors/jquery-file-upload/jquery.ui.widget.min", "jquery.ui.widget": "../assets/vendors/jquery-file-upload/jquery.ui.widget.min",
"jquery.cookie": "../assets/vendors/jquery.cookie/jquery.cookie.min", "jquery.cookie": "../assets/vendors/jquery.cookie/jquery.cookie.min",
"jquery.treeview": "../assets/vendors/jquery-treeview/jquery.treeview", "jquery.treeview": "../assets/vendors/jquery-treeview/jquery.treeview",

4
www/scripts/apps/login/home/config.js
View File

@@ -14,6 +14,7 @@ require.config({
jquery: "../assets/vendors/jquery/jquery.min", jquery: "../assets/vendors/jquery/jquery.min",
"jquery.ui": "../assets/vendors/jquery-ui/jquery-ui.min", "jquery.ui": "../assets/vendors/jquery-ui/jquery-ui.min",
underscore: "../assets/vendors/underscore/underscore.min", underscore: "../assets/vendors/underscore/underscore.min",
"zxcvbn": "../assets/vendors/zxcvbn/zxcvbn.min",
backbone: "../assets/vendors/backbone/backbone.min", backbone: "../assets/vendors/backbone/backbone.min",
i18n: "../assets/vendors/i18next/i18next.min", i18n: "../assets/vendors/i18next/i18next.min",
bootstrap: "../assets/vendors/bootstrap/js/bootstrap.min", bootstrap: "../assets/vendors/bootstrap/js/bootstrap.min",
@@ -29,6 +30,9 @@ require.config({
deps: ["jquery", "jquery.ui"], deps: ["jquery", "jquery.ui"],
exports: "$.fn.geocompleter" exports: "$.fn.geocompleter"
}, },
"zxcvbn": {
deps: ["jquery"]
},
"common/geonames": { "common/geonames": {
deps: ["jquery.geonames"] deps: ["jquery.geonames"]
}, },

2
www/scripts/apps/login/home/register.js
View File

@@ -14,7 +14,7 @@ require([
"apps/login/home/common", "apps/login/home/common",
"common/forms/views/formType/passwordSetter", "common/forms/views/formType/passwordSetter",
"common/geonames", "common/geonames",
"common/forms/views/formType/zxcvbn" "zxcvbn"
], function ($, i18n, Common, RegisterForm, geonames, zxcvbn) { ], function ($, i18n, Common, RegisterForm, geonames, zxcvbn) {
var fieldsConfiguration = []; var fieldsConfiguration = [];

2
www/scripts/common/forms/views/formType/passwordSetter.js
View File

@@ -14,7 +14,7 @@ define([
"backbone", "backbone",
"bootstrap", "bootstrap",
"common/forms/views/form", "common/forms/views/form",
"common/forms/views/formType/zxcvbn" "zxcvbn"
], function ($, _, i18n, Backbone, bootstrap, FormView, zxcvbn) { ], function ($, _, i18n, Backbone, bootstrap, FormView, zxcvbn) {
var PasswordSetterForm = FormView.extend({ var PasswordSetterForm = FormView.extend({
events: function () { events: function () {