diff --git a/.angular-cli.json b/.angular-cli.json
index 205b6e9a46b5a386c709670508226f8bb1df0f0c..12580a9ec8767126311784ec1a44d3d0ea23c312 100644
--- a/.angular-cli.json
+++ b/.angular-cli.json
@@ -16,7 +16,9 @@
"prefix": "app",
"styles": [
],
- "scripts": []
+ "scripts": [
+ "../../../../node_modules/hammerjs/hammer.min.js"
+ ]
}
],
"defaults": {
diff --git a/apps/maarch_entreprise/merged_jsAbstract.php b/apps/maarch_entreprise/merged_jsAbstract.php
index 80bdc8e12795b3dd6b8b3afdd08c23c10f78d2e8..3061dfc721156a2229c9222ad218c1a0c9d96596 100755
--- a/apps/maarch_entreprise/merged_jsAbstract.php
+++ b/apps/maarch_entreprise/merged_jsAbstract.php
@@ -51,7 +51,6 @@ class MergedJsAbstract
readfile('node_modules/jquery.nicescroll/jquery.nicescroll.min.js'); //V2
readfile('node_modules/tooltipster/dist/js/tooltipster.bundle.min.js'); //V2
readfile('node_modules/jquery-typeahead/dist/jquery.typeahead.min.js'); //V2
- readfile('node_modules/hammerjs/hammer.min.js'); //V2- Angular Material
readfile('apps/maarch_entreprise/js/chosen.jquery.min.js');
readfile('node_modules/jstree-bootstrap-theme/dist/jstree.js'); //V2
readfile('apps/maarch_entreprise/js/bootstrap-tree.js'); //DEPRECATED use jstree instead
diff --git a/package-lock.json b/package-lock.json
index 6e8700872388d86b32e711eabf855b6ee22d195a..87822f3d29ca3d8e4235ea443bd169622bd1bfe3 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -138,7 +138,7 @@
},
"@angular/common": {
"version": "5.2.9",
- "resolved": "https://registry.npmjs.org/@angular/common/-/common-5.2.9.tgz",
+ "resolved": "http://registry.npmjs.org/@angular/common/-/common-5.2.9.tgz",
"integrity": "sha512-g2hPcI0fnT4TV+Fd+1IohjuqBxPvxwyH9IzTn8PkU9X2M+F6cHCUvHxL1sWI2sF8pYcaHzVjq9WClym10X36Lg==",
"dev": true,
"requires": {
@@ -147,7 +147,7 @@
},
"@angular/compiler": {
"version": "5.2.9",
- "resolved": "https://registry.npmjs.org/@angular/compiler/-/compiler-5.2.9.tgz",
+ "resolved": "http://registry.npmjs.org/@angular/compiler/-/compiler-5.2.9.tgz",
"integrity": "sha512-mN+ofInk8y/tk2TCJZx8RrGdOKdrfunoCair7tfDy4XoQJE90waGfaYWo07hYU+UYwLhrg19m2Czy6rIDciUJA==",
"dev": true,
"requires": {
@@ -156,7 +156,7 @@
},
"@angular/compiler-cli": {
"version": "5.2.9",
- "resolved": "https://registry.npmjs.org/@angular/compiler-cli/-/compiler-cli-5.2.9.tgz",
+ "resolved": "http://registry.npmjs.org/@angular/compiler-cli/-/compiler-cli-5.2.9.tgz",
"integrity": "sha512-LAEpL/6PAev3zwTow/43Atzv9AtKLAiLoS285X3EV1f80yQpYAmFRrPUtDlrIZdhZHBBv7CxnyCVpOLU3T8ohw==",
"dev": true,
"requires": {
@@ -176,7 +176,7 @@
},
"@angular/core": {
"version": "5.2.9",
- "resolved": "https://registry.npmjs.org/@angular/core/-/core-5.2.9.tgz",
+ "resolved": "http://registry.npmjs.org/@angular/core/-/core-5.2.9.tgz",
"integrity": "sha512-cvHBJGtasrIoARvbLFyHaOsiWKVwMNrrSTZLwrlyHP8oYzkDrE0qKGer6QCqyKt+51hF53cgWEffGzM/u/0wYg==",
"dev": true,
"requires": {
@@ -185,7 +185,7 @@
},
"@angular/forms": {
"version": "5.2.9",
- "resolved": "https://registry.npmjs.org/@angular/forms/-/forms-5.2.9.tgz",
+ "resolved": "http://registry.npmjs.org/@angular/forms/-/forms-5.2.9.tgz",
"integrity": "sha512-zyIOiZV/FAm1iVZWTk3Joz6Jt096hbhfDbBUrssmuiTKi9dU6rWG+Z4b88zStqulKe3HFVZkgdixWlminG8nKA==",
"dev": true,
"requires": {
@@ -194,7 +194,7 @@
},
"@angular/http": {
"version": "5.2.9",
- "resolved": "https://registry.npmjs.org/@angular/http/-/http-5.2.9.tgz",
+ "resolved": "http://registry.npmjs.org/@angular/http/-/http-5.2.9.tgz",
"integrity": "sha512-DKjgIk+Dp0Xv1ieG8LawvUnL4dYZp1KroAq5cfKuO9EojP0zM3tUvBtw2vbPLsHYma7g7ZMjOoAbzVxtmTBZqw==",
"dev": true,
"requires": {
@@ -263,7 +263,7 @@
"chalk": "2.2.2",
"enhanced-resolve": "3.4.1",
"loader-utils": "1.1.0",
- "magic-string": "0.22.4",
+ "magic-string": "0.22.5",
"semver": "5.5.0",
"source-map": "0.5.7",
"tree-kill": "1.2.0",
@@ -307,7 +307,7 @@
},
"@types/node": {
"version": "7.0.56",
- "resolved": "https://registry.npmjs.org/@types/node/-/node-7.0.56.tgz",
+ "resolved": "http://registry.npmjs.org/@types/node/-/node-7.0.56.tgz",
"integrity": "sha512-NgjN3xPyqbAXSIpznNAR5Cisx5uKqJWxcS9kefzSFEX/9J7O01/FHyfnvPI7SztBf9p6c8mqOn3olZWJx3ja6g==",
"dev": true
},
@@ -637,7 +637,7 @@
"dev": true,
"requires": {
"browserslist": "2.11.3",
- "caniuse-lite": "1.0.30000813",
+ "caniuse-lite": "1.0.30000815",
"normalize-range": "0.1.2",
"num2fraction": "1.2.2",
"postcss": "6.0.19",
@@ -755,7 +755,7 @@
"babylon": "6.18.0",
"debug": "2.6.9",
"globals": "9.18.0",
- "invariant": "2.2.3",
+ "invariant": "2.2.4",
"lodash": "4.17.5"
}
},
@@ -1087,8 +1087,8 @@
"integrity": "sha512-yWu5cXT7Av6mVwzWc8lMsJMHWn4xyjSuGYi4IozbVTLUOEYPSagUB8kiMDUHA1fS3zjr8nkxkn9jdvug4BBRmA==",
"dev": true,
"requires": {
- "caniuse-lite": "1.0.30000813",
- "electron-to-chromium": "1.3.37"
+ "caniuse-lite": "1.0.30000815",
+ "electron-to-chromium": "1.3.38"
}
},
"buffer": {
@@ -1148,7 +1148,7 @@
"move-concurrently": "1.0.1",
"promise-inflight": "1.0.1",
"rimraf": "2.6.2",
- "ssri": "5.2.4",
+ "ssri": "5.3.0",
"unique-filename": "1.1.0",
"y18n": "4.0.0"
}
@@ -1217,9 +1217,9 @@
}
},
"caniuse-lite": {
- "version": "1.0.30000813",
- "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000813.tgz",
- "integrity": "sha512-A8ITSmH5SFdMFdC704ggjg+x2z5PzQmVlG8tavwnfvbC33Q1UYrj0+G+Xm0SNAnd4He36fwUE/KEWytOEchw+A==",
+ "version": "1.0.30000815",
+ "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000815.tgz",
+ "integrity": "sha512-PGSOPK6gFe5fWd+eD0u2bG0aOsN1qC4B1E66tl3jOsIoKkTIcBYAc2+O6AeNzKW8RsFykWgnhkTlfOyuTzgI9A==",
"dev": true
},
"capture-stack-trace": {
@@ -1493,9 +1493,9 @@
}
},
"commander": {
- "version": "2.14.1",
- "resolved": "https://registry.npmjs.org/commander/-/commander-2.14.1.tgz",
- "integrity": "sha512-+YR16o3rK53SmWHU3rEM3tPAh2rwb1yPcQX5irVn7mb0gXbwuCCrnkbV5+PBfETdfg1vui07nM6PCG1zndcjQw==",
+ "version": "2.15.0",
+ "resolved": "https://registry.npmjs.org/commander/-/commander-2.15.0.tgz",
+ "integrity": "sha512-7B1ilBwtYSbetCgTY1NJFg+gVpestg0fdA1MhC1Vs4ssyfSXnCAjFr+QcQM9/RedXC0EaUx1sG8Smgw2VfgKEg==",
"dev": true
},
"common-tags": {
@@ -1530,7 +1530,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": {
@@ -1887,14 +1887,6 @@
}
}
},
- "datatables": {
- "version": "1.10.13",
- "resolved": "https://registry.npmjs.org/datatables/-/datatables-1.10.13.tgz",
- "integrity": "sha1-m7Lexvfc8CBJoA5PDn0/4AnDk0Y=",
- "requires": {
- "jquery": "3.3.1"
- }
- },
"date-now": {
"version": "0.1.4",
"resolved": "https://registry.npmjs.org/date-now/-/date-now-0.1.4.tgz",
@@ -2228,9 +2220,9 @@
"dev": true
},
"electron-to-chromium": {
- "version": "1.3.37",
- "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.37.tgz",
- "integrity": "sha1-SpJzTgBEyM8LFVO+V+riGkxuX6s=",
+ "version": "1.3.38",
+ "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.38.tgz",
+ "integrity": "sha1-SSNLAMBZL2KSH5QmvM7+4j3ghrs=",
"dev": true
},
"elliptic": {
@@ -2474,7 +2466,7 @@
},
"event-stream": {
"version": "3.3.4",
- "resolved": "https://registry.npmjs.org/event-stream/-/event-stream-3.3.4.tgz",
+ "resolved": "http://registry.npmjs.org/event-stream/-/event-stream-3.3.4.tgz",
"integrity": "sha1-SrTJoPWlTbkzi0w02Gv86PSzVXE=",
"dev": true,
"requires": {
@@ -2565,9 +2557,9 @@
}
},
"express": {
- "version": "4.16.2",
- "resolved": "https://registry.npmjs.org/express/-/express-4.16.2.tgz",
- "integrity": "sha1-41xt/i1kt9ygpc1PIXgb4ymeB2w=",
+ "version": "4.16.3",
+ "resolved": "https://registry.npmjs.org/express/-/express-4.16.3.tgz",
+ "integrity": "sha1-avilAjUNsyRuzEvs9rWjTSL37VM=",
"dev": true,
"requires": {
"accepts": "1.3.5",
@@ -2582,7 +2574,7 @@
"encodeurl": "1.0.2",
"escape-html": "1.0.3",
"etag": "1.8.1",
- "finalhandler": "1.1.0",
+ "finalhandler": "1.1.1",
"fresh": "0.5.2",
"merge-descriptors": "1.0.1",
"methods": "1.1.2",
@@ -2593,10 +2585,10 @@
"qs": "6.5.1",
"range-parser": "1.2.0",
"safe-buffer": "5.1.1",
- "send": "0.16.1",
- "serve-static": "1.13.1",
+ "send": "0.16.2",
+ "serve-static": "1.13.2",
"setprototypeof": "1.1.0",
- "statuses": "1.3.1",
+ "statuses": "1.4.0",
"type-is": "1.6.16",
"utils-merge": "1.0.1",
"vary": "1.1.2"
@@ -2744,9 +2736,9 @@
}
},
"finalhandler": {
- "version": "1.1.0",
- "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.0.tgz",
- "integrity": "sha1-zgtoVbRYU+eRsvzGgARtiCU91/U=",
+ "version": "1.1.1",
+ "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.1.tgz",
+ "integrity": "sha512-Y1GUDo39ez4aHAw7MysnUD5JzYX+WaIj8I57kO3aEPT1fFRL4sr7mjei97FgnwhAyyzRYmQZaTHb2+9uZ1dPtg==",
"dev": true,
"requires": {
"debug": "2.6.9",
@@ -2754,7 +2746,7 @@
"escape-html": "1.0.3",
"on-finished": "2.3.0",
"parseurl": "1.3.2",
- "statuses": "1.3.1",
+ "statuses": "1.4.0",
"unpipe": "1.0.0"
}
},
@@ -4202,19 +4194,19 @@
"dev": true
},
"html-minifier": {
- "version": "3.5.10",
- "resolved": "https://registry.npmjs.org/html-minifier/-/html-minifier-3.5.10.tgz",
- "integrity": "sha512-5c8iAyeIGAiuFhVjJ0qy1lgvyQxxuZgjeOuMnoK/wjEyy8DF3xKUnE9pO+6H7VMir976K6SGlZV8ZEmIOea/Zg==",
+ "version": "3.5.11",
+ "resolved": "https://registry.npmjs.org/html-minifier/-/html-minifier-3.5.11.tgz",
+ "integrity": "sha512-kIi9C090qWW5cGxEf+EwNUczduyVR6krk29WB3zDSWBQN6xuh/1jCXgmY4SvqzaJMOZFCnf8wcNzA8iPsfLiUQ==",
"dev": true,
"requires": {
"camel-case": "3.0.0",
"clean-css": "4.1.11",
- "commander": "2.14.1",
+ "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.14"
+ "uglify-js": "3.3.15"
}
},
"html-webpack-plugin": {
@@ -4224,7 +4216,7 @@
"dev": true,
"requires": {
"bluebird": "3.5.1",
- "html-minifier": "3.5.10",
+ "html-minifier": "3.5.11",
"loader-utils": "0.2.17",
"lodash": "4.17.5",
"pretty-error": "2.1.1",
@@ -4307,7 +4299,7 @@
"depd": "1.1.1",
"inherits": "2.0.3",
"setprototypeof": "1.0.3",
- "statuses": "1.3.1"
+ "statuses": "1.4.0"
},
"dependencies": {
"depd": {
@@ -4377,7 +4369,7 @@
"requires": {
"assert-plus": "0.2.0",
"jsprim": "1.4.1",
- "sshpk": "1.13.1"
+ "sshpk": "1.14.1"
}
},
"https-browserify": {
@@ -4504,9 +4496,9 @@
"dev": true
},
"invariant": {
- "version": "2.2.3",
- "resolved": "https://registry.npmjs.org/invariant/-/invariant-2.2.3.tgz",
- "integrity": "sha512-7Z5PPegwDTyjbaeCnV0efcyS6vdKAU51kpEmS7QFib3P4822l8ICYyMn7qvJnc+WzLoDsuI9gPMKbJ8pCu8XtA==",
+ "version": "2.2.4",
+ "resolved": "https://registry.npmjs.org/invariant/-/invariant-2.2.4.tgz",
+ "integrity": "sha512-phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA==",
"dev": true,
"requires": {
"loose-envify": "1.3.1"
@@ -5323,9 +5315,9 @@
"integrity": "sha1-wNjq82BZ9wV5bh40SBHPTEmNOiY="
},
"magic-string": {
- "version": "0.22.4",
- "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.22.4.tgz",
- "integrity": "sha512-kxBL06p6iO2qPBHsqGK2b3cRwiRGpnmSuVWNhwHcMX7qJOUr1HvricYP1LZOCdkQBUp0jiWg2d6WJwR3vYgByw==",
+ "version": "0.22.5",
+ "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.22.5.tgz",
+ "integrity": "sha512-oreip9rJZkzvA8Qzk9HFs8fZGF/u7H/gtrE8EN6RjKJ9kh2HlC+yQ2QezifqTZfGyiuAV0dRv5a+y/8gBb1m9w==",
"dev": true,
"requires": {
"vlq": "0.2.3"
@@ -5709,7 +5701,8 @@
"ng2-dnd": {
"version": "5.0.2",
"resolved": "https://registry.npmjs.org/ng2-dnd/-/ng2-dnd-5.0.2.tgz",
- "integrity": "sha512-5mWWBePwvEPsNd/HkdbD543Q9mPyJofL6zkNydl8/Ah3qrrvZT2DaEPbknY08OgkXpI2qUGksc01OzzVlRQ9dQ=="
+ "integrity": "sha512-5mWWBePwvEPsNd/HkdbD543Q9mPyJofL6zkNydl8/Ah3qrrvZT2DaEPbknY08OgkXpI2qUGksc01OzzVlRQ9dQ==",
+ "dev": true
},
"no-case": {
"version": "2.3.2",
@@ -5786,7 +5779,7 @@
"querystring-es3": "0.2.1",
"readable-stream": "2.3.5",
"stream-browserify": "2.0.1",
- "stream-http": "2.8.0",
+ "stream-http": "2.8.1",
"string_decoder": "1.0.3",
"timers-browserify": "2.0.6",
"tty-browserify": "0.0.0",
@@ -5860,7 +5853,7 @@
"dev": true,
"requires": {
"chalk": "1.1.3",
- "commander": "2.14.1",
+ "commander": "2.15.0",
"is-my-json-valid": "2.17.2",
"pinkie-promise": "2.0.1"
}
@@ -7700,9 +7693,9 @@
}
},
"send": {
- "version": "0.16.1",
- "resolved": "https://registry.npmjs.org/send/-/send-0.16.1.tgz",
- "integrity": "sha512-ElCLJdJIKPk6ux/Hocwhk7NFHpI3pVm/IZOYWqUmoxcgeyM+MpxHHKhb8QmlJDX1pU6WrgaHBkVNm73Sv7uc2A==",
+ "version": "0.16.2",
+ "resolved": "https://registry.npmjs.org/send/-/send-0.16.2.tgz",
+ "integrity": "sha512-E64YFPUssFHEFBvpbbjr44NCLtI1AohxQ8ZSiJjQLskAdKuriYEP6VyGEsRDH8ScozGpkaX1BGvhanqCwkcEZw==",
"dev": true,
"requires": {
"debug": "2.6.9",
@@ -7717,7 +7710,7 @@
"ms": "2.0.0",
"on-finished": "2.3.0",
"range-parser": "1.2.0",
- "statuses": "1.3.1"
+ "statuses": "1.4.0"
},
"dependencies": {
"mime": {
@@ -7750,15 +7743,15 @@
}
},
"serve-static": {
- "version": "1.13.1",
- "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.13.1.tgz",
- "integrity": "sha512-hSMUZrsPa/I09VYFJwa627JJkNs0NrfL1Uzuup+GqHfToR2KcsXFymXSV90hoyw3M+msjFuQly+YzIH/q0MGlQ==",
+ "version": "1.13.2",
+ "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.13.2.tgz",
+ "integrity": "sha512-p/tdJrO4U387R9oMjb1oj7qSMaMfmOyd4j9hOFoxZe2baQszgHcSWjuya/CiT5kgZZKRudHNOA0pYXOl8rQ5nw==",
"dev": true,
"requires": {
"encodeurl": "1.0.2",
"escape-html": "1.0.3",
"parseurl": "1.3.2",
- "send": "0.16.1"
+ "send": "0.16.2"
}
},
"set-blocking": {
@@ -8173,9 +8166,9 @@
"dev": true
},
"sshpk": {
- "version": "1.13.1",
- "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.13.1.tgz",
- "integrity": "sha1-US322mKHFEMW3EwY/hzx2UBzm+M=",
+ "version": "1.14.1",
+ "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.14.1.tgz",
+ "integrity": "sha1-Ew9Zde3a2WPx1W+SuaxsUfqfg+s=",
"dev": true,
"requires": {
"asn1": "0.2.3",
@@ -8197,9 +8190,9 @@
}
},
"ssri": {
- "version": "5.2.4",
- "resolved": "https://registry.npmjs.org/ssri/-/ssri-5.2.4.tgz",
- "integrity": "sha512-UnEAgMZa15973iH7cUi0AHjJn1ACDIkaMyZILoqwN6yzt+4P81I8tBc5Hl+qwi5auMplZtPQsHrPBR5vJLcQtQ==",
+ "version": "5.3.0",
+ "resolved": "https://registry.npmjs.org/ssri/-/ssri-5.3.0.tgz",
+ "integrity": "sha512-XRSIPqLij52MtgoQavH/x/dU1qVKtWUAAZeOHsR9c2Ddi4XerFy3mc1alf+dLJKl9EUIm/Ht+EowFkTUOA6GAQ==",
"dev": true,
"requires": {
"safe-buffer": "5.1.1"
@@ -8284,9 +8277,9 @@
}
},
"statuses": {
- "version": "1.3.1",
- "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.3.1.tgz",
- "integrity": "sha1-+vUbnrdKrvOzrPStX2Gr8ky3uT4=",
+ "version": "1.4.0",
+ "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.4.0.tgz",
+ "integrity": "sha512-zhSCtt8v2NDrRlPQpCNtw/heZLtfUDqxBM1udqikb/Hbk52LK4nQSwr10u77iopCW5LsyHpuXS0GnEc48mLeew==",
"dev": true
},
"stdout-stream": {
@@ -8328,9 +8321,9 @@
}
},
"stream-http": {
- "version": "2.8.0",
- "resolved": "https://registry.npmjs.org/stream-http/-/stream-http-2.8.0.tgz",
- "integrity": "sha512-sZOFxI/5xw058XIRHl4dU3dZ+TTOIGJR78Dvo0oEAejIt4ou27k+3ne1zYmCV+v7UucbxIFQuOgnkTVHh8YPnw==",
+ "version": "2.8.1",
+ "resolved": "https://registry.npmjs.org/stream-http/-/stream-http-2.8.1.tgz",
+ "integrity": "sha512-cQ0jo17BLca2r0GfRdZKYAGLU6JRoIWxqSOakUMuKOT6MOK7AAlE856L33QuDmAy/eeOrhLee3dZKX0Uadu93A==",
"dev": true,
"requires": {
"builtin-status-codes": "3.0.0",
@@ -8728,7 +8721,7 @@
"minimist": "1.2.0",
"mkdirp": "0.5.1",
"source-map": "0.6.1",
- "source-map-support": "0.5.3"
+ "source-map-support": "0.5.4"
},
"dependencies": {
"minimist": {
@@ -8744,9 +8737,9 @@
"dev": true
},
"source-map-support": {
- "version": "0.5.3",
- "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.3.tgz",
- "integrity": "sha512-eKkTgWYeBOQqFGXRfKabMFdnWepo51vWqEdoeikaEPFiJC7MCU5j2h4+6Q8npkZTeLGbSyecZvRxiSoWl3rh+w==",
+ "version": "0.5.4",
+ "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.4.tgz",
+ "integrity": "sha512-PETSPG6BjY1AHs2t64vS2aqAgu6dMIMXJULWFBGbh2Gr8nVLbCFDo6i/RMMvviIQ2h1Z8+5gQhVKSn2je9nmdg==",
"dev": true,
"requires": {
"source-map": "0.6.1"
@@ -8805,12 +8798,12 @@
"dev": true
},
"uglify-js": {
- "version": "3.3.14",
- "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.3.14.tgz",
- "integrity": "sha512-OY8VPQU25q09gQRbC+Ekk3xgEVBmYFEfVcgS47ksjTiNht2LmLlUkWutyi38ZsDSToJHwbe76kDGwmD226Z2Fg==",
+ "version": "3.3.15",
+ "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.3.15.tgz",
+ "integrity": "sha512-bqtBCAINYXX/OkdnqMGpbXr+OPWc00hsozRpk+dAtfnbdk2jjKiLmyOkQ7zamg648lVMnzATL8JrSN6LmaVpYA==",
"dev": true,
"requires": {
- "commander": "2.14.1",
+ "commander": "2.15.0",
"source-map": "0.6.1"
},
"dependencies": {
@@ -9889,7 +9882,7 @@
"connect-history-api-fallback": "1.5.0",
"debug": "3.1.0",
"del": "3.0.0",
- "express": "4.16.2",
+ "express": "4.16.3",
"html-entities": "1.2.1",
"http-proxy-middleware": "0.17.4",
"import-local": "1.0.0",
diff --git a/package.json b/package.json
index 7b8c8f39fbc90678c766f00f815195ed350bc3a9..6ca6c546619cec6fcb94833539e407849fcb13ee 100755
--- a/package.json
+++ b/package.json
@@ -14,12 +14,10 @@
"bootstrap": "^3.3.7",
"chart.js": "1.1.1",
"core-js": "^2.5.3",
- "datatables": "^1.10.13",
"jquery": "^3.3.1",
"jquery-typeahead": "^2.8.0",
"jquery.nicescroll": "~3.6.8",
"jstree-bootstrap-theme": "^1.0.1",
- "ng2-dnd": "^5.0.2",
"photoswipe": "^4.1.2",
"tinymce": "^4.7.9",
"tooltipster": "^4.2.6",
@@ -44,6 +42,7 @@
"@types/jquery": "^2.0.49",
"@types/node": "^7.0.56",
"hammerjs": "^2.0.8",
+ "ng2-dnd": "^5.0.2",
"node-sass": "^4.8.2",
"nodemon": "^1.17.2",
"rxjs": "^5.5.7",