diff --git a/modules/templates/lang/en.php b/modules/templates/lang/en.php
index d78332d0b85b3f3862ccbf7c80e6681745c2aeb5..5794109fc818ac02943e30abdd15c6701ada2a4c 100755
--- a/modules/templates/lang/en.php
+++ b/modules/templates/lang/en.php
@@ -16,7 +16,7 @@ if (!defined('_ADMIN_TEMPLATE_ANSWER')) {
define('_ADMIN_TEMPLATE_ANSWER', 'Manage the templates');
}
if (!defined('_ADMIN_TEMPLATES_DESC')) {
- define('_ADMIN_TEMPLATES_DESC', 'Manage templates for attachments (OFFICE or LIBREOFFICE), notifications and document generation and sendmail (HTML), notes (PLAIN TEXT)');
+ define('_ADMIN_TEMPLATES_DESC', 'Manage templates for attachments, notifications, document generation, sendmail and notes');
}
/*********************** Menu ***********************************/
diff --git a/modules/templates/lang/fr.php b/modules/templates/lang/fr.php
index 307259b1bd8e76a37bd59ebfb86a17cb319fe26c..e1e29f6dccd49423eb1ad6fdbcebb5a4fe3c3f46 100755
--- a/modules/templates/lang/fr.php
+++ b/modules/templates/lang/fr.php
@@ -16,7 +16,7 @@ if (!defined('_ADMIN_TEMPLATE_ANSWER')) {
define('_ADMIN_TEMPLATE_ANSWER', 'Administrer les modèles');
}
if (!defined('_ADMIN_TEMPLATES_DESC')) {
- define('_ADMIN_TEMPLATES_DESC', "Gérer les modèles utilisés pour les pièces jointes (editeur de texte OFFICE ou LIBREOFFICE), les notifications et générations de courriers ainsi que l'envoi de courriels (HTML), les notes (TEXTE BRUT)");
+ define('_ADMIN_TEMPLATES_DESC', "Gérer les modèles utilisés pour les pièces jointes, les notifications, la génération de courriers, l'envoi de courriels et les notes");
}
/*********************** Menu ***********************************/
if (!defined('_EXPLOIT_TEMPLATE_ANSWER')) {
diff --git a/package-lock.json b/package-lock.json
index 828211796c7402edde0deaea1dd3e293ff7122a7..c65fbed1b90b6519d28ab01681f5063921f5b0d2 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -70,9 +70,9 @@
}
},
"@angular/cli": {
- "version": "1.7.3",
- "resolved": "https://registry.npmjs.org/@angular/cli/-/cli-1.7.3.tgz",
- "integrity": "sha512-19sh0SbjneG7/R/FvZBfHsHqfIqyj4LQuXdddJKMCDM97UoHQTjfgrpRvBf3a3lR79wdLXchWJBD9Yc6ifosEA==",
+ "version": "1.7.4",
+ "resolved": "https://registry.npmjs.org/@angular/cli/-/cli-1.7.4.tgz",
+ "integrity": "sha512-URdb1QtnQf+Ievy93wjq7gE81s25BkWUwJFPey+YkphBA3G1lbCAQPiEh2pntBwaIKavgEuCw+Sf2YZdgTVhDA==",
"dev": true,
"requires": {
"@angular-devkit/build-optimizer": "0.3.2",
@@ -82,7 +82,7 @@
"@ngtools/webpack": "1.10.2",
"@schematics/angular": "0.3.2",
"@schematics/package-update": "0.3.2",
- "ajv": "6.2.1",
+ "ajv": "6.4.0",
"autoprefixer": "7.2.6",
"cache-loader": "1.2.2",
"chalk": "2.2.2",
@@ -98,11 +98,11 @@
"fs-extra": "4.0.3",
"glob": "7.1.2",
"html-webpack-plugin": "2.30.1",
- "istanbul-instrumenter-loader": "3.0.0",
+ "istanbul-instrumenter-loader": "3.0.1",
"karma-source-map-support": "1.2.0",
"less": "2.7.3",
"less-loader": "4.1.0",
- "license-webpack-plugin": "1.3.0",
+ "license-webpack-plugin": "1.3.1",
"loader-utils": "1.1.0",
"lodash": "4.17.5",
"memory-fs": "0.4.1",
@@ -112,12 +112,12 @@
"nopt": "4.0.1",
"opn": "5.1.0",
"portfinder": "1.0.13",
- "postcss": "6.0.19",
+ "postcss": "6.0.21",
"postcss-import": "11.1.0",
- "postcss-loader": "2.1.1",
- "postcss-url": "7.3.1",
+ "postcss-loader": "2.1.3",
+ "postcss-url": "7.3.2",
"raw-loader": "0.5.1",
- "resolve": "1.5.0",
+ "resolve": "1.6.0",
"rxjs": "5.5.8",
"sass-loader": "6.0.7",
"semver": "5.5.0",
@@ -126,7 +126,7 @@
"style-loader": "0.19.1",
"stylus": "0.54.5",
"stylus-loader": "3.0.2",
- "uglifyjs-webpack-plugin": "1.2.3",
+ "uglifyjs-webpack-plugin": "1.2.4",
"url-loader": "0.6.2",
"webpack": "3.11.0",
"webpack-dev-middleware": "1.12.2",
@@ -351,14 +351,15 @@
}
},
"ajv": {
- "version": "6.2.1",
- "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.2.1.tgz",
- "integrity": "sha1-KKarxJOiq+D7TIUHrK7bQ/pVBnE=",
+ "version": "6.4.0",
+ "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.4.0.tgz",
+ "integrity": "sha1-06/3jpJ3VJdx2vAWTP9ISCt1T8Y=",
"dev": true,
"requires": {
"fast-deep-equal": "1.1.0",
"fast-json-stable-stringify": "2.0.0",
- "json-schema-traverse": "0.3.1"
+ "json-schema-traverse": "0.3.1",
+ "uri-js": "3.0.2"
}
},
"ajv-keywords": {
@@ -522,7 +523,7 @@
"dev": true,
"requires": {
"define-properties": "1.1.2",
- "es-abstract": "1.10.0"
+ "es-abstract": "1.11.0"
}
},
"array-union": {
@@ -637,10 +638,10 @@
"dev": true,
"requires": {
"browserslist": "2.11.3",
- "caniuse-lite": "1.0.30000815",
+ "caniuse-lite": "1.0.30000824",
"normalize-range": "0.1.2",
"num2fraction": "1.2.2",
- "postcss": "6.0.19",
+ "postcss": "6.0.21",
"postcss-value-parser": "3.3.0"
}
},
@@ -880,7 +881,7 @@
"content-type": "1.0.4",
"debug": "2.6.9",
"depd": "1.1.2",
- "http-errors": "1.6.2",
+ "http-errors": "1.6.3",
"iconv-lite": "0.4.19",
"on-finished": "2.3.0",
"qs": "6.5.1",
@@ -1012,9 +1013,9 @@
"dev": true
},
"browserify-aes": {
- "version": "1.1.1",
- "resolved": "https://registry.npmjs.org/browserify-aes/-/browserify-aes-1.1.1.tgz",
- "integrity": "sha512-UGnTYAnB2a3YuYKIRy1/4FB2HdM866E0qC46JXvVTYKlBlZlnvfpSfY6OKfXZAkv70eJ2a1SqzpAo5CRhZGDFg==",
+ "version": "1.2.0",
+ "resolved": "https://registry.npmjs.org/browserify-aes/-/browserify-aes-1.2.0.tgz",
+ "integrity": "sha512-+7CHXqGuspUn/Sl5aO7Ea0xWGAtETPXNSAjHo48JfLdPWcMng33Xe4znFvQweqc/uzk5zSOI3H52CYnjCfb5hA==",
"dev": true,
"requires": {
"buffer-xor": "1.0.3",
@@ -1031,7 +1032,7 @@
"integrity": "sha1-mYgkSHS/XtTijalWZtzWasj8Njo=",
"dev": true,
"requires": {
- "browserify-aes": "1.1.1",
+ "browserify-aes": "1.2.0",
"browserify-des": "1.0.0",
"evp_bytestokey": "1.0.3"
}
@@ -1087,8 +1088,8 @@
"integrity": "sha512-yWu5cXT7Av6mVwzWc8lMsJMHWn4xyjSuGYi4IozbVTLUOEYPSagUB8kiMDUHA1fS3zjr8nkxkn9jdvug4BBRmA==",
"dev": true,
"requires": {
- "caniuse-lite": "1.0.30000815",
- "electron-to-chromium": "1.3.38"
+ "caniuse-lite": "1.0.30000824",
+ "electron-to-chromium": "1.3.42"
}
},
"buffer": {
@@ -1098,10 +1099,16 @@
"dev": true,
"requires": {
"base64-js": "1.2.3",
- "ieee754": "1.1.8",
+ "ieee754": "1.1.11",
"isarray": "1.0.0"
}
},
+ "buffer-from": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.0.0.tgz",
+ "integrity": "sha512-83apNb8KK0Se60UE1+4Ukbe3HbfELJ6UlI4ldtOGs7So4KD26orJM8hIY9lxdzP+UpItH1Yh/Y8GUvNFWFFRxA==",
+ "dev": true
+ },
"buffer-indexof": {
"version": "1.1.1",
"resolved": "https://registry.npmjs.org/buffer-indexof/-/buffer-indexof-1.1.1.tgz",
@@ -1217,9 +1224,9 @@
}
},
"caniuse-lite": {
- "version": "1.0.30000815",
- "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000815.tgz",
- "integrity": "sha512-PGSOPK6gFe5fWd+eD0u2bG0aOsN1qC4B1E66tl3jOsIoKkTIcBYAc2+O6AeNzKW8RsFykWgnhkTlfOyuTzgI9A==",
+ "version": "1.0.30000824",
+ "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000824.tgz",
+ "integrity": "sha512-KcgeAvVkpzN05Mjiyz5vf0le5AWRwfRGqGkKXWWsdrLQd4EIBevReSy7mYCdwSq7MqKrmJ0lEQEkUQE2VspRRw==",
"dev": true
},
"capture-stack-trace": {
@@ -1423,9 +1430,9 @@
}
},
"clone": {
- "version": "2.1.1",
- "resolved": "https://registry.npmjs.org/clone/-/clone-2.1.1.tgz",
- "integrity": "sha1-0hfR6WERjjrJpLi7oyhVU79kfNs=",
+ "version": "2.1.2",
+ "resolved": "https://registry.npmjs.org/clone/-/clone-2.1.2.tgz",
+ "integrity": "sha1-G39Ln1kfHo+DZwQBYANFoCiHQ18=",
"dev": true
},
"clone-deep": {
@@ -1541,7 +1548,7 @@
},
"compression": {
"version": "1.7.2",
- "resolved": "https://registry.npmjs.org/compression/-/compression-1.7.2.tgz",
+ "resolved": "http://registry.npmjs.org/compression/-/compression-1.7.2.tgz",
"integrity": "sha1-qv+81qr4VLROuygDU9WtFlH1mmk=",
"dev": true,
"requires": {
@@ -1561,11 +1568,12 @@
"dev": true
},
"concat-stream": {
- "version": "1.6.1",
- "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.1.tgz",
- "integrity": "sha512-gslSSJx03QKa59cIKqeJO9HQ/WZMotvYJCuaUULrLpjj8oG40kV2Z+gz82pVxlTkOADi4PJxQPPfhl1ELYrrXw==",
+ "version": "1.6.2",
+ "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.2.tgz",
+ "integrity": "sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==",
"dev": true,
"requires": {
+ "buffer-from": "1.0.0",
"inherits": "2.0.3",
"readable-stream": "2.3.5",
"typedarray": "0.0.6"
@@ -1766,7 +1774,7 @@
"cipher-base": "1.0.4",
"inherits": "2.0.3",
"ripemd160": "2.0.1",
- "sha.js": "2.4.10"
+ "sha.js": "2.4.11"
}
},
"create-hmac": {
@@ -1780,7 +1788,7 @@
"inherits": "2.0.3",
"ripemd160": "2.0.1",
"safe-buffer": "5.1.1",
- "sha.js": "2.4.10"
+ "sha.js": "2.4.11"
}
},
"cross-spawn": {
@@ -1878,7 +1886,7 @@
"integrity": "sha1-dUu1v+VUUdpppYuU1F9MWwRi1Y8=",
"dev": true,
"requires": {
- "es5-ext": "0.10.40"
+ "es5-ext": "0.10.42"
}
},
"dashdash": {
@@ -1973,7 +1981,7 @@
"requires": {
"globby": "6.1.0",
"is-path-cwd": "1.0.0",
- "is-path-in-cwd": "1.0.0",
+ "is-path-in-cwd": "1.0.1",
"p-map": "1.2.0",
"pify": "3.0.0",
"rimraf": "2.6.2"
@@ -2225,15 +2233,15 @@
"dev": true
},
"ejs": {
- "version": "2.5.7",
- "resolved": "https://registry.npmjs.org/ejs/-/ejs-2.5.7.tgz",
- "integrity": "sha1-zIcsFoiArjxxiXYv1f/ACJbJUYo=",
+ "version": "2.5.8",
+ "resolved": "https://registry.npmjs.org/ejs/-/ejs-2.5.8.tgz",
+ "integrity": "sha512-QIDZL54fyV8MDcAsO91BMH1ft2qGGaHIJsJIA/+t+7uvXol1dm413fPcUgUb4k8F/9457rx4/KFE4XfDifrQxQ==",
"dev": true
},
"electron-to-chromium": {
- "version": "1.3.38",
- "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.38.tgz",
- "integrity": "sha1-SSNLAMBZL2KSH5QmvM7+4j3ghrs=",
+ "version": "1.3.42",
+ "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.42.tgz",
+ "integrity": "sha1-lcM78B0MxAVVauyJn+Yf1NduoPk=",
"dev": true
},
"elliptic": {
@@ -2315,9 +2323,9 @@
}
},
"es-abstract": {
- "version": "1.10.0",
- "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.10.0.tgz",
- "integrity": "sha512-/uh/DhdqIOSkAWifU+8nG78vlQxdLckUdI/sPgy0VhuXi2qJ7T8czBmqIYtLQVpCIFYafChnsRsB5pyb1JdmCQ==",
+ "version": "1.11.0",
+ "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.11.0.tgz",
+ "integrity": "sha512-ZnQrE/lXTTQ39ulXZ+J1DTFazV9qBy61x2bY071B+qGco8Z8q1QddsLdt/EF8Ai9hcWH72dWS0kFqXLxOxqslA==",
"dev": true,
"requires": {
"es-to-primitive": "1.1.1",
@@ -2339,13 +2347,14 @@
}
},
"es5-ext": {
- "version": "0.10.40",
- "resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.40.tgz",
- "integrity": "sha512-S9Fh3oya5OOvYSNGvPZJ+vyrs6VYpe1IXPowVe3N1OhaiwVaGlwfn3Zf5P5klYcWOA0toIwYQW8XEv/QqhdHvQ==",
+ "version": "0.10.42",
+ "resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.42.tgz",
+ "integrity": "sha512-AJxO1rmPe1bDEfSR6TJ/FgMFYuTBhR5R57KW58iCkYACMyFbrkqVyzXSurYoScDGvgyMpk7uRF/lPUPPTmsRSA==",
"dev": true,
"requires": {
"es6-iterator": "2.0.3",
- "es6-symbol": "3.1.1"
+ "es6-symbol": "3.1.1",
+ "next-tick": "1.0.0"
}
},
"es6-iterator": {
@@ -2355,7 +2364,7 @@
"dev": true,
"requires": {
"d": "1.0.0",
- "es5-ext": "0.10.40",
+ "es5-ext": "0.10.42",
"es6-symbol": "3.1.1"
}
},
@@ -2366,7 +2375,7 @@
"dev": true,
"requires": {
"d": "1.0.0",
- "es5-ext": "0.10.40",
+ "es5-ext": "0.10.42",
"es6-iterator": "2.0.3",
"es6-set": "0.1.5",
"es6-symbol": "3.1.1",
@@ -2380,7 +2389,7 @@
"dev": true,
"requires": {
"d": "1.0.0",
- "es5-ext": "0.10.40",
+ "es5-ext": "0.10.42",
"es6-iterator": "2.0.3",
"es6-symbol": "3.1.1",
"event-emitter": "0.3.5"
@@ -2393,7 +2402,7 @@
"dev": true,
"requires": {
"d": "1.0.0",
- "es5-ext": "0.10.40"
+ "es5-ext": "0.10.42"
}
},
"es6-weak-map": {
@@ -2403,7 +2412,7 @@
"dev": true,
"requires": {
"d": "1.0.0",
- "es5-ext": "0.10.40",
+ "es5-ext": "0.10.42",
"es6-iterator": "2.0.3",
"es6-symbol": "3.1.1"
}
@@ -2472,7 +2481,7 @@
"dev": true,
"requires": {
"d": "1.0.0",
- "es5-ext": "0.10.40"
+ "es5-ext": "0.10.42"
}
},
"event-stream": {
@@ -2782,9 +2791,9 @@
}
},
"flush-write-stream": {
- "version": "1.0.2",
- "resolved": "https://registry.npmjs.org/flush-write-stream/-/flush-write-stream-1.0.2.tgz",
- "integrity": "sha1-yBuQ2HRnZvGmCaRoCZRsRd2K5Bc=",
+ "version": "1.0.3",
+ "resolved": "https://registry.npmjs.org/flush-write-stream/-/flush-write-stream-1.0.3.tgz",
+ "integrity": "sha512-calZMC10u0FMUqoiunI2AiGIIUtUIvifNwkHhNupZH4cbNnW1Itkoh/Nf5HFYmDrwWPjrUxpkZT0KhuCq0jmGw==",
"dev": true,
"requires": {
"inherits": "2.0.3",
@@ -4205,19 +4214,18 @@
"dev": true
},
"html-minifier": {
- "version": "3.5.11",
- "resolved": "https://registry.npmjs.org/html-minifier/-/html-minifier-3.5.11.tgz",
- "integrity": "sha512-kIi9C090qWW5cGxEf+EwNUczduyVR6krk29WB3zDSWBQN6xuh/1jCXgmY4SvqzaJMOZFCnf8wcNzA8iPsfLiUQ==",
+ "version": "3.5.13",
+ "resolved": "https://registry.npmjs.org/html-minifier/-/html-minifier-3.5.13.tgz",
+ "integrity": "sha512-B7P99uf0LPQ5lslyhrAZAXE7Lk1tpiv52KVapKbeFhgqNMUI7JBd/fYLX55imu3Rz7sCTzZM6r/IBe4oT7qCjg==",
"dev": true,
"requires": {
"camel-case": "3.0.0",
"clean-css": "4.1.11",
"commander": "2.15.0",
"he": "1.1.1",
- "ncname": "1.0.0",
"param-case": "2.1.1",
"relateurl": "0.2.7",
- "uglify-js": "3.3.15"
+ "uglify-js": "3.3.18"
}
},
"html-webpack-plugin": {
@@ -4227,7 +4235,7 @@
"dev": true,
"requires": {
"bluebird": "3.5.1",
- "html-minifier": "3.5.11",
+ "html-minifier": "3.5.13",
"loader-utils": "0.2.17",
"lodash": "4.17.5",
"pretty-error": "2.1.1",
@@ -4302,29 +4310,15 @@
"dev": true
},
"http-errors": {
- "version": "1.6.2",
- "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.6.2.tgz",
- "integrity": "sha1-CgAsyFcHGSp+eUbO7cERVfYOxzY=",
+ "version": "1.6.3",
+ "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.6.3.tgz",
+ "integrity": "sha1-i1VoC7S+KDoLW/TqLjhYC+HZMg0=",
"dev": true,
"requires": {
- "depd": "1.1.1",
+ "depd": "1.1.2",
"inherits": "2.0.3",
- "setprototypeof": "1.0.3",
+ "setprototypeof": "1.1.0",
"statuses": "1.4.0"
- },
- "dependencies": {
- "depd": {
- "version": "1.1.1",
- "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.1.tgz",
- "integrity": "sha1-V4O04cRZ8G+lyif5kfPQbnoxA1k=",
- "dev": true
- },
- "setprototypeof": {
- "version": "1.0.3",
- "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.0.3.tgz",
- "integrity": "sha1-ZlZ+NwQ+608E2RvWWMDL77VbjgQ=",
- "dev": true
- }
}
},
"http-parser-js": {
@@ -4396,9 +4390,9 @@
"dev": true
},
"ieee754": {
- "version": "1.1.8",
- "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.1.8.tgz",
- "integrity": "sha1-vjPUCsEO8ZJnAfbwii2G+/0a0+Q=",
+ "version": "1.1.11",
+ "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.1.11.tgz",
+ "integrity": "sha512-VhDzCKN7K8ufStx/CLj5/PDTMgph+qwN5Pkd5i0sGnVwk56zJ0lkT8Qzi1xqWLS0Wp29DgDtNeS7v8/wMoZeHg==",
"dev": true
},
"iferr": {
@@ -4771,9 +4765,9 @@
"dev": true
},
"is-path-in-cwd": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/is-path-in-cwd/-/is-path-in-cwd-1.0.0.tgz",
- "integrity": "sha1-ZHdYK4IU1gI0YJRWcAO+ip6sBNw=",
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/is-path-in-cwd/-/is-path-in-cwd-1.0.1.tgz",
+ "integrity": "sha512-FjV1RTW48E7CWM7eE/J2NJvAEEVektecDBVBE5Hh3nM1Jd0kvhHtX68Pr3xsDf857xt3Y4AkwVULK1Vku62aaQ==",
"dev": true,
"requires": {
"is-path-inside": "1.0.1"
@@ -4908,9 +4902,9 @@
"dev": true
},
"istanbul-instrumenter-loader": {
- "version": "3.0.0",
- "resolved": "https://registry.npmjs.org/istanbul-instrumenter-loader/-/istanbul-instrumenter-loader-3.0.0.tgz",
- "integrity": "sha512-alLSEFX06ApU75sm5oWcaVNaiss/bgMRiWTct3g0P0ZZTKjR+6QiCcuVOKDI1kWJgwHEnIXsv/dWm783kPpmtw==",
+ "version": "3.0.1",
+ "resolved": "https://registry.npmjs.org/istanbul-instrumenter-loader/-/istanbul-instrumenter-loader-3.0.1.tgz",
+ "integrity": "sha512-a5SPObZgS0jB/ixaKSMdn6n/gXSrK2S6q/UfRJBT3e6gQmVjwZROTODQsYW5ZNwOu78hG62Y3fWlebaVOL0C+w==",
"dev": true,
"requires": {
"convert-source-map": "1.5.1",
@@ -5184,18 +5178,18 @@
"integrity": "sha512-KNTsgCE9tMOM70+ddxp9yyt9iHqgmSs0yTZc5XH5Wo+g80RWRIYNqE58QJKm/yMud5wZEvz50ugRDuzVIkyahg==",
"dev": true,
"requires": {
- "clone": "2.1.1",
+ "clone": "2.1.2",
"loader-utils": "1.1.0",
"pify": "3.0.0"
}
},
"license-webpack-plugin": {
- "version": "1.3.0",
- "resolved": "https://registry.npmjs.org/license-webpack-plugin/-/license-webpack-plugin-1.3.0.tgz",
- "integrity": "sha512-12Spl8M5Ty7aRszGQUEfNK1W0gwcWNfAj0sMyJv7E7BglAb4YaZ6FciGncmwzxEcuzJ45RjA/Fql3Gw13la6aA==",
+ "version": "1.3.1",
+ "resolved": "https://registry.npmjs.org/license-webpack-plugin/-/license-webpack-plugin-1.3.1.tgz",
+ "integrity": "sha512-NqAFodJdpBUuf1iD+Ij8hQvF0rCFKlO2KaieoQzAPhFgzLCtJnC7Z7x5gQbGNjoe++wOKAtAmwVEIBLqq2Yp1A==",
"dev": true,
"requires": {
- "ejs": "2.5.7"
+ "ejs": "2.5.8"
}
},
"load-json-file": {
@@ -5555,10 +5549,10 @@
"integrity": "sha512-zHo8v+otD1J10j/tC+VNoGK9keCuByhKovAvdn74dmxJl9+mWHnx6EMsDN4lgRoMI/eYo2nchAxniIbUPb5onw==",
"dev": true,
"requires": {
- "concat-stream": "1.6.1",
+ "concat-stream": "1.6.2",
"duplexify": "3.5.4",
"end-of-stream": "1.4.1",
- "flush-write-stream": "1.0.2",
+ "flush-write-stream": "1.0.3",
"from2": "2.3.0",
"parallel-transform": "1.1.0",
"pump": "2.0.1",
@@ -5698,15 +5692,6 @@
}
}
},
- "ncname": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/ncname/-/ncname-1.0.0.tgz",
- "integrity": "sha1-W1etGLHKCShk72Kwse2BlPODtxw=",
- "dev": true,
- "requires": {
- "xml-char-classes": "1.0.0"
- }
- },
"negotiator": {
"version": "0.6.1",
"resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.1.tgz",
@@ -5719,6 +5704,12 @@
"integrity": "sha512-nJmSswG4As/MkRq7QZFuH/sf/yuv8ODdMZrY4Bedjp77a5MK4A6s7YbBB64c9u79EBUOfXUXBvArmvzTD0X+6g==",
"dev": true
},
+ "next-tick": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/next-tick/-/next-tick-1.0.0.tgz",
+ "integrity": "sha1-yobR/ogoFpsBICCOPchCS524NCw=",
+ "dev": true
+ },
"ng2-dnd": {
"version": "5.0.2",
"resolved": "https://registry.npmjs.org/ng2-dnd/-/ng2-dnd-5.0.2.tgz",
@@ -6686,7 +6677,7 @@
"dev": true,
"requires": {
"asn1.js": "4.10.1",
- "browserify-aes": "1.1.1",
+ "browserify-aes": "1.2.0",
"create-hash": "1.1.3",
"evp_bytestokey": "1.0.3",
"pbkdf2": "3.0.14"
@@ -6801,7 +6792,7 @@
"create-hmac": "1.1.6",
"ripemd160": "2.0.1",
"safe-buffer": "5.1.1",
- "sha.js": "2.4.10"
+ "sha.js": "2.4.11"
}
},
"performance-now": {
@@ -6871,9 +6862,9 @@
"dev": true
},
"postcss": {
- "version": "6.0.19",
- "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.19.tgz",
- "integrity": "sha512-f13HRz0HtVwVaEuW6J6cOUCBLFtymhgyLPV7t4QEk2UD3twRI9IluDcQNdzQdBpiixkXj2OmzejhhTbSbDxNTg==",
+ "version": "6.0.21",
+ "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.21.tgz",
+ "integrity": "sha512-y/bKfbQz2Nn/QBC08bwvYUxEFOVGfPIUOTsJ2CK5inzlXW9SdYR1x4pEsG9blRAF/PX+wRNdOah+gx/hv4q7dw==",
"dev": true,
"requires": {
"chalk": "2.3.2",
@@ -6921,10 +6912,10 @@
"integrity": "sha512-5l327iI75POonjxkXgdRCUS+AlzAdBx4pOvMEhTKTCjb1p8IEeVR9yx3cPbmN7LIWJLbfnIXxAhoB4jpD0c/Cw==",
"dev": true,
"requires": {
- "postcss": "6.0.19",
+ "postcss": "6.0.21",
"postcss-value-parser": "3.3.0",
"read-cache": "1.0.0",
- "resolve": "1.5.0"
+ "resolve": "1.6.0"
}
},
"postcss-load-config": {
@@ -6960,27 +6951,27 @@
}
},
"postcss-loader": {
- "version": "2.1.1",
- "resolved": "https://registry.npmjs.org/postcss-loader/-/postcss-loader-2.1.1.tgz",
- "integrity": "sha512-f0J/DWE/hyO9/LH0WHpXkny/ZZ238sSaG3p1SRBtVZnFWUtD7GXIEgHoBg8cnAeRbmEvUxHQptY46zWfwNYj/w==",
+ "version": "2.1.3",
+ "resolved": "https://registry.npmjs.org/postcss-loader/-/postcss-loader-2.1.3.tgz",
+ "integrity": "sha512-RuBcNE8rjCkIB0IsbmkGFRmQJTeQJfCI88E0VTarPNTvaNSv9OFv1DvTwgtAN/qlzyiELsmmmtX/tEzKp/cdug==",
"dev": true,
"requires": {
"loader-utils": "1.1.0",
- "postcss": "6.0.19",
+ "postcss": "6.0.21",
"postcss-load-config": "1.2.0",
"schema-utils": "0.4.5"
}
},
"postcss-url": {
- "version": "7.3.1",
- "resolved": "https://registry.npmjs.org/postcss-url/-/postcss-url-7.3.1.tgz",
- "integrity": "sha512-Ya5KIjGptgz0OtrVYfi2UbLxVAZ6Emc4Of+Grx4Sf1deWlRpFwLr8FrtkUxfqh+XiZIVkXbjQrddE10ESpNmdA==",
+ "version": "7.3.2",
+ "resolved": "https://registry.npmjs.org/postcss-url/-/postcss-url-7.3.2.tgz",
+ "integrity": "sha512-QMV5mA+pCYZQcUEPQkmor9vcPQ2MT+Ipuu8qdi1gVxbNiIiErEGft+eny1ak19qALoBkccS5AHaCaCDzh7b9MA==",
"dev": true,
"requires": {
"mime": "1.6.0",
"minimatch": "3.0.4",
"mkdirp": "0.5.1",
- "postcss": "6.0.19",
+ "postcss": "6.0.21",
"xxhashjs": "0.2.2"
}
},
@@ -7220,6 +7211,32 @@
"http-errors": "1.6.2",
"iconv-lite": "0.4.19",
"unpipe": "1.0.0"
+ },
+ "dependencies": {
+ "depd": {
+ "version": "1.1.1",
+ "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.1.tgz",
+ "integrity": "sha1-V4O04cRZ8G+lyif5kfPQbnoxA1k=",
+ "dev": true
+ },
+ "http-errors": {
+ "version": "1.6.2",
+ "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.6.2.tgz",
+ "integrity": "sha1-CgAsyFcHGSp+eUbO7cERVfYOxzY=",
+ "dev": true,
+ "requires": {
+ "depd": "1.1.1",
+ "inherits": "2.0.3",
+ "setprototypeof": "1.0.3",
+ "statuses": "1.4.0"
+ }
+ },
+ "setprototypeof": {
+ "version": "1.0.3",
+ "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.0.3.tgz",
+ "integrity": "sha1-ZlZ+NwQ+608E2RvWWMDL77VbjgQ=",
+ "dev": true
+ }
}
},
"raw-loader": {
@@ -7522,9 +7539,9 @@
"dev": true
},
"resolve": {
- "version": "1.5.0",
- "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.5.0.tgz",
- "integrity": "sha512-hgoSGrc3pjzAPHNBg+KnFcK2HwlHTs/YrAGUr6qgTVUZmXv1UEXXl0bZNBKMA9fud6lRYFdPGz0xXxycPzmmiw==",
+ "version": "1.6.0",
+ "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.6.0.tgz",
+ "integrity": "sha512-mw7JQNu5ExIkcw4LPih0owX/TZXjD/ZUF/ZQ/pDnkw3ZKhDcZZw5klmBlj6gVMwjQ3Pz5Jgu7F3d0jcDVuEWdw==",
"dev": true,
"requires": {
"path-parse": "1.0.5"
@@ -7655,7 +7672,7 @@
"integrity": "sha512-yYrjb9TX2k/J1Y5UNy3KYdZq10xhYcF8nMpAW6o3hy6Q8WSIEf9lJHG/ePnOBfziPM3fvQwfOwa13U/Fh8qTfA==",
"dev": true,
"requires": {
- "ajv": "6.2.1",
+ "ajv": "6.4.0",
"ajv-keywords": "3.1.0"
}
},
@@ -7732,7 +7749,7 @@
"escape-html": "1.0.3",
"etag": "1.8.1",
"fresh": "0.5.2",
- "http-errors": "1.6.2",
+ "http-errors": "1.6.3",
"mime": "1.4.1",
"ms": "2.0.0",
"on-finished": "2.3.0",
@@ -7764,7 +7781,7 @@
"batch": "0.6.1",
"debug": "2.6.9",
"escape-html": "1.0.3",
- "http-errors": "1.6.2",
+ "http-errors": "1.6.3",
"mime-types": "2.1.18",
"parseurl": "1.3.2"
}
@@ -7829,9 +7846,9 @@
"dev": true
},
"sha.js": {
- "version": "2.4.10",
- "resolved": "https://registry.npmjs.org/sha.js/-/sha.js-2.4.10.tgz",
- "integrity": "sha512-vnwmrFDlOExK4Nm16J2KMWHLrp14lBrjxMxBJpu++EnsuBmpiYaM/MEs46Vxxm/4FvdP5yTwuCTO9it5FSjrqA==",
+ "version": "2.4.11",
+ "resolved": "https://registry.npmjs.org/sha.js/-/sha.js-2.4.11.tgz",
+ "integrity": "sha512-QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ==",
"dev": true,
"requires": {
"inherits": "2.0.3",
@@ -8053,7 +8070,7 @@
"faye-websocket": "0.11.1",
"inherits": "2.0.3",
"json3": "3.3.2",
- "url-parse": "1.2.0"
+ "url-parse": "1.3.0"
},
"dependencies": {
"faye-websocket": {
@@ -8150,13 +8167,13 @@
"http-deceiver": "1.2.7",
"safe-buffer": "5.1.1",
"select-hose": "2.0.0",
- "spdy-transport": "2.0.20"
+ "spdy-transport": "2.1.0"
}
},
"spdy-transport": {
- "version": "2.0.20",
- "resolved": "https://registry.npmjs.org/spdy-transport/-/spdy-transport-2.0.20.tgz",
- "integrity": "sha1-c15yBUxIayNU/onnAiVgBKOazk0=",
+ "version": "2.1.0",
+ "resolved": "https://registry.npmjs.org/spdy-transport/-/spdy-transport-2.1.0.tgz",
+ "integrity": "sha512-bpUeGpZcmZ692rrTiqf9/2EUakI6/kXX1Rpe0ib/DyOzbiexVfXkw6GnvI9hVGvIwVaUhkaBojjCZwLNRGQg1g==",
"dev": true,
"requires": {
"debug": "2.6.9",
@@ -8825,9 +8842,9 @@
"dev": true
},
"uglify-js": {
- "version": "3.3.15",
- "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.3.15.tgz",
- "integrity": "sha512-bqtBCAINYXX/OkdnqMGpbXr+OPWc00hsozRpk+dAtfnbdk2jjKiLmyOkQ7zamg648lVMnzATL8JrSN6LmaVpYA==",
+ "version": "3.3.18",
+ "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.3.18.tgz",
+ "integrity": "sha512-VhjIFv93KnTx/ntNi9yTBbfrsWnQnqUy02MT32uqU/5i2oEJ8GAEJ0AwYV206JeOmIzSjm41Ba0iXVKv6j7y9g==",
"dev": true,
"requires": {
"commander": "2.15.0",
@@ -8850,9 +8867,9 @@
"optional": true
},
"uglifyjs-webpack-plugin": {
- "version": "1.2.3",
- "resolved": "https://registry.npmjs.org/uglifyjs-webpack-plugin/-/uglifyjs-webpack-plugin-1.2.3.tgz",
- "integrity": "sha512-as/50351uuJGiQbhVvE510SCqM/YOWghCzIFJeEOu5oVE0QOZ3/vu2QcnVvu0Lz+vNd0rKsiCFAlbcw0i/YH2w==",
+ "version": "1.2.4",
+ "resolved": "https://registry.npmjs.org/uglifyjs-webpack-plugin/-/uglifyjs-webpack-plugin-1.2.4.tgz",
+ "integrity": "sha512-z0IbjpW8b3O/OVn+TTZN4pI29RN1zktFBXLIzzfZ+++cUtZ1ERSlLWgpE/5OERuEUs1ijVQnpYAkSlpoVmQmSQ==",
"dev": true,
"requires": {
"cacache": "10.0.4",
@@ -9054,6 +9071,23 @@
"integrity": "sha1-9rRQHC7EzdJrp4vnIilh3ndiFZg=",
"dev": true
},
+ "uri-js": {
+ "version": "3.0.2",
+ "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-3.0.2.tgz",
+ "integrity": "sha1-+QuFhQf4HepNz7s8TD2/orVX+qo=",
+ "dev": true,
+ "requires": {
+ "punycode": "2.1.0"
+ },
+ "dependencies": {
+ "punycode": {
+ "version": "2.1.0",
+ "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.0.tgz",
+ "integrity": "sha1-X4Y+3Im5bbCQdLrXlHvwkFbKTn0=",
+ "dev": true
+ }
+ }
+ },
"urix": {
"version": "0.1.0",
"resolved": "https://registry.npmjs.org/urix/-/urix-0.1.0.tgz",
@@ -9113,9 +9147,9 @@
}
},
"url-parse": {
- "version": "1.2.0",
- "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.2.0.tgz",
- "integrity": "sha512-DT1XbYAfmQP65M/mE6OALxmXzZ/z1+e5zk2TcSKe/KiYbNGZxgtttzC0mR/sjopbpOXcbniq7eIKmocJnUWlEw==",
+ "version": "1.3.0",
+ "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.3.0.tgz",
+ "integrity": "sha512-zPvPA3T7P6M+0iNsgX+iAcAz4GshKrowtQBHHc/28tVsBc8jK7VRCNX+2GEcoE6zDB6XqXhcyiUWPVZY6C70Cg==",
"dev": true,
"requires": {
"querystringify": "1.0.0",
@@ -9253,7 +9287,7 @@
"integrity": "sha512-RSlipNQB1u48cq0wH/BNfCu1tD/cJ8ydFIkNYhp9o+3d+8unClkIovpW5qpFPgmL9OE48wfAnlZydXByWP82AA==",
"dev": true,
"requires": {
- "chokidar": "2.0.2",
+ "chokidar": "2.0.3",
"graceful-fs": "4.1.11",
"neo-async": "2.5.0"
},
@@ -9264,7 +9298,7 @@
"integrity": "sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==",
"dev": true,
"requires": {
- "micromatch": "3.1.9",
+ "micromatch": "3.1.10",
"normalize-path": "2.1.1"
}
},
@@ -9321,9 +9355,9 @@
}
},
"chokidar": {
- "version": "2.0.2",
- "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.0.2.tgz",
- "integrity": "sha512-l32Hw3wqB0L2kGVmSbK/a+xXLDrUEsc84pSgMkmwygHvD7ubRsP/vxxHa5BtB6oix1XLLVCHyYMsckRXxThmZw==",
+ "version": "2.0.3",
+ "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.0.3.tgz",
+ "integrity": "sha512-zW8iXYZtXMx4kux/nuZVXjkLP+CyIK5Al5FHnj1OgTKGZfp4Oy6/ymtMSKFv3GD8DviEmUPmJg9eFdJ/JzudMg==",
"dev": true,
"requires": {
"anymatch": "2.0.0",
@@ -9560,9 +9594,9 @@
"dev": true
},
"micromatch": {
- "version": "3.1.9",
- "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.9.tgz",
- "integrity": "sha512-SlIz6sv5UPaAVVFRKodKjCg48EbNoIhgetzfK/Cy0v5U52Z6zB136M8tp0UC9jM53LYbmIRihJszvvqpKkfm9g==",
+ "version": "3.1.10",
+ "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
+ "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
"dev": true,
"requires": {
"arr-diff": "4.0.0",
@@ -9599,7 +9633,7 @@
"requires": {
"acorn": "5.5.3",
"acorn-dynamic-import": "2.0.2",
- "ajv": "6.2.1",
+ "ajv": "6.4.0",
"ajv-keywords": "3.1.0",
"async": "2.6.0",
"enhanced-resolve": "3.4.1",
@@ -9905,7 +9939,7 @@
"ansi-html": "0.0.7",
"array-includes": "3.0.3",
"bonjour": "3.5.0",
- "chokidar": "2.0.2",
+ "chokidar": "2.0.3",
"compression": "1.7.2",
"connect-history-api-fallback": "1.5.0",
"debug": "3.1.0",
@@ -9937,7 +9971,7 @@
"integrity": "sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==",
"dev": true,
"requires": {
- "micromatch": "3.1.9",
+ "micromatch": "3.1.10",
"normalize-path": "2.1.1"
}
},
@@ -10000,9 +10034,9 @@
"dev": true
},
"chokidar": {
- "version": "2.0.2",
- "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.0.2.tgz",
- "integrity": "sha512-l32Hw3wqB0L2kGVmSbK/a+xXLDrUEsc84pSgMkmwygHvD7ubRsP/vxxHa5BtB6oix1XLLVCHyYMsckRXxThmZw==",
+ "version": "2.0.3",
+ "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.0.3.tgz",
+ "integrity": "sha512-zW8iXYZtXMx4kux/nuZVXjkLP+CyIK5Al5FHnj1OgTKGZfp4Oy6/ymtMSKFv3GD8DviEmUPmJg9eFdJ/JzudMg==",
"dev": true,
"requires": {
"anymatch": "2.0.0",
@@ -10263,9 +10297,9 @@
"dev": true
},
"micromatch": {
- "version": "3.1.9",
- "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.9.tgz",
- "integrity": "sha512-SlIz6sv5UPaAVVFRKodKjCg48EbNoIhgetzfK/Cy0v5U52Z6zB136M8tp0UC9jM53LYbmIRihJszvvqpKkfm9g==",
+ "version": "3.1.10",
+ "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
+ "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
"dev": true,
"requires": {
"arr-diff": "4.0.0",
@@ -10514,12 +10548,6 @@
"integrity": "sha1-f4dliEdxbbUCYyOBL4GMras4el8=",
"dev": true
},
- "xml-char-classes": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/xml-char-classes/-/xml-char-classes-1.0.0.tgz",
- "integrity": "sha1-ZGV4SKIP/F31g6Qq2KJ3tFErvE0=",
- "dev": true
- },
"xtend": {
"version": "4.0.1",
"resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz",
diff --git a/package.json b/package.json
index 49ff970c6c61ebae666a0b711529be212765ee31..e389b43f8c83b9bb00fc778bbab4739221c00d98 100755
--- a/package.json
+++ b/package.json
@@ -27,7 +27,7 @@
"devDependencies": {
"@angular/animations": "^5.2.9",
"@angular/cdk": "^5.2.4",
- "@angular/cli": "~1.7.3",
+ "@angular/cli": "^1.7.4",
"@angular/common": "^5.2.9",
"@angular/compiler": "^5.2.9",
"@angular/compiler-cli": "^5.2.9",