diff --git a/modules/adminlte/package-lock.json b/modules/adminlte/package-lock.json old mode 100755 new mode 100644 index ac15ea2a..5d576d3b --- a/modules/adminlte/package-lock.json +++ b/modules/adminlte/package-lock.json @@ -513,6 +513,7 @@ "resolved": "https://registry.npmjs.org/boom/-/boom-0.4.2.tgz", "integrity": "sha1-emNune1O/O+xnO9JR6PGffrukRs=", "dev": true, + "optional": true, "requires": { "hoek": "0.9.1" } @@ -1196,7 +1197,7 @@ "convert-source-map": "1.1.3", "inline-source-map": "0.6.2", "lodash.memoize": "3.0.4", - "source-map": "https://registry.npmjs.org/source-map/-/source-map-0.5.6.tgz" + "source-map": "0.5.6" } }, "combined-stream": { @@ -1425,7 +1426,7 @@ "dev": true, "requires": { "clap": "1.2.0", - "source-map": "https://registry.npmjs.org/source-map/-/source-map-0.5.6.tgz" + "source-map": "0.5.6" } }, "ctype": { @@ -1464,11 +1465,11 @@ } }, "datatables.net": { - "version": "1.10.15", - "resolved": "https://registry.npmjs.org/datatables.net/-/datatables.net-1.10.15.tgz", - "integrity": "sha1-x4kHe7/jhedf9aIz+l8jJRpy32g=", + "version": "1.10.22", + "resolved": "https://registry.npmjs.org/datatables.net/-/datatables.net-1.10.22.tgz", + "integrity": "sha512-ujn8GvkQIBYzYH54XY7OrI0Zb35TKRd9ABYfbnXgBfwTGIFT6UsmXrfHU5Yk+MSDoF0sDu2TB+31V6c+zUZ0Pw==", "requires": { - "jquery": "3.2.1" + "jquery": ">=1.7" } }, "datatables.net-bs": { @@ -1478,6 +1479,16 @@ "requires": { "datatables.net": "1.10.15", "jquery": "3.2.1" + }, + "dependencies": { + "datatables.net": { + "version": "1.10.15", + "resolved": "https://registry.npmjs.org/datatables.net/-/datatables.net-1.10.15.tgz", + "integrity": "sha1-x4kHe7/jhedf9aIz+l8jJRpy32g=", + "requires": { + "jquery": ">=1.7" + } + } } }, "date-now": { @@ -1753,7 +1764,8 @@ } }, "deep-equal": { - "version": "https://registry.npmjs.org/deep-equal/-/deep-equal-1.0.1.tgz", + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-1.0.1.tgz", "integrity": "sha1-9dJgKStmDghO/0zbyfCK0yR0SLU=", "dev": true }, @@ -2219,7 +2231,8 @@ "version": "1.0.2", "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.0.2.tgz", "integrity": "sha1-4QgOBljjALBilJkMxw4VAiNf1VA=", - "dev": true + "dev": true, + "optional": true }, "fancy-log": { "version": "1.3.0", @@ -3863,7 +3876,7 @@ "dev": true, "requires": { "async": "0.2.10", - "deep-equal": "https://registry.npmjs.org/deep-equal/-/deep-equal-1.0.1.tgz", + "deep-equal": "1.0.1", "i": "0.3.6", "mkdirp": "0.5.1", "ncp": "0.4.2", @@ -4325,7 +4338,8 @@ "version": "0.9.1", "resolved": "https://registry.npmjs.org/hoek/-/hoek-0.9.1.tgz", "integrity": "sha1-PTIkYrrfB3Fup+uFuviAec3c5QU=", - "dev": true + "dev": true, + "optional": true }, "hooker": { "version": "0.2.3", @@ -4475,7 +4489,7 @@ "resolved": "https://registry.npmjs.org/inline-source-map/-/inline-source-map-0.6.2.tgz", "integrity": "sha1-+Tk0ccGKedFyT4Y/o4tYY3Ct4qU=", "requires": { - "source-map": "https://registry.npmjs.org/source-map/-/source-map-0.5.6.tgz" + "source-map": "0.5.6" } }, "inputmask": { @@ -4971,7 +4985,7 @@ "mkdirp": "0.5.1", "promise": "7.3.1", "request": "2.81.0", - "source-map": "https://registry.npmjs.org/source-map/-/source-map-0.5.6.tgz" + "source-map": "0.5.6" }, "dependencies": { "assert-plus": { @@ -4993,6 +5007,7 @@ "resolved": "https://registry.npmjs.org/boom/-/boom-2.10.1.tgz", "integrity": "sha1-OciRjO/1eZ+D+UkqhI9iWt0Mdm8=", "dev": true, + "optional": true, "requires": { "hoek": "2.16.3" } @@ -5002,6 +5017,7 @@ "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.5.tgz", "integrity": "sha1-k4NwpXtKUd6ix3wV1cX9+JUWQAk=", "dev": true, + "optional": true, "requires": { "delayed-stream": "1.0.0" } @@ -5020,7 +5036,8 @@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz", "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=", - "dev": true + "dev": true, + "optional": true }, "forever-agent": { "version": "0.6.1", @@ -5065,7 +5082,8 @@ "version": "2.16.3", "resolved": "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz", "integrity": "sha1-ILt0A9POo5jpHcRxCo/xuCdKJe0=", - "dev": true + "dev": true, + "optional": true }, "http-signature": { "version": "1.1.1", @@ -5084,6 +5102,7 @@ "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.15.tgz", "integrity": "sha1-pOv1BkCUVpI3uM9wBGd20J/JKu0=", "dev": true, + "optional": true, "requires": { "mime-db": "1.27.0" } @@ -6630,7 +6649,8 @@ } }, "source-map": { - "version": "https://registry.npmjs.org/source-map/-/source-map-0.5.6.tgz", + "version": "0.5.6", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.6.tgz", "integrity": "sha1-dc449SvwczxafwwRjYEzSiu19BI=" }, "source-map-resolve": { @@ -7319,7 +7339,7 @@ "integrity": "sha1-KcVzMUgFe7Th913zW3qcty5qWd0=", "dev": true, "requires": { - "source-map": "https://registry.npmjs.org/source-map/-/source-map-0.5.6.tgz", + "source-map": "0.5.6", "uglify-to-browserify": "1.0.2", "yargs": "3.10.0" } diff --git a/modules/adminlte/package.json b/modules/adminlte/package.json old mode 100755 new mode 100644 index 35262618..0b402184 --- a/modules/adminlte/package.json +++ b/modules/adminlte/package.json @@ -37,7 +37,7 @@ "bootstrap-timepicker": "^0.5.2", "chart.js": "1.0.*", "ckeditor": "^4.7.0", - "datatables.net": "^1.10.15", + "datatables.net": "^1.10.22", "datatables.net-bs": "^1.10.15", "fastclick": "^1.0.6", "flot": "^0.8.0-alpha", diff --git a/modules/adminlte/yarn.lock b/modules/adminlte/yarn.lock old mode 100755 new mode 100644 index d1085f44..1fd24da5 --- a/modules/adminlte/yarn.lock +++ b/modules/adminlte/yarn.lock @@ -995,12 +995,18 @@ datatables.net-bs@^1.10.15: datatables.net "1.10.16" jquery ">=1.7" -datatables.net@1.10.16, datatables.net@^1.10.15: +datatables.net@1.10.16: version "1.10.16" resolved "https://registry.yarnpkg.com/datatables.net/-/datatables.net-1.10.16.tgz#4b052d1082824261b68eed9d22741b711d3d2469" dependencies: jquery ">=1.7" +datatables.net@^1.10.22: + version "1.10.22" + resolved "https://registry.yarnpkg.com/datatables.net/-/datatables.net-1.10.22.tgz#975d4ffb1eb40dec5fb772eaf93796ec1a948b55" + dependencies: + jquery ">=1.7" + date-now@^0.1.4: version "0.1.4" resolved "https://registry.yarnpkg.com/date-now/-/date-now-0.1.4.tgz#eaf439fd4d4848ad74e5cc7dbef200672b9e345b"