From 1b1a3ea7acb4749c1620bd190d7ab22afba6206a Mon Sep 17 00:00:00 2001
From: "florian.azizian" <florian.azizian@maarch.org>
Date: Wed, 20 Jan 2021 18:00:11 +0100
Subject: [PATCH] FIX #15963 TIME 0:05 opening and ending tag mismatch for ldap
config.xml
---
modules/ldap/xml/config.xml.default | 4 ++--
package.json | 14 +++++++-------
2 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/modules/ldap/xml/config.xml.default b/modules/ldap/xml/config.xml.default
index 46a7e3b7bde..1a807491cf0 100755
--- a/modules/ldap/xml/config.xml.default
+++ b/modules/ldap/xml/config.xml.default
@@ -37,9 +37,9 @@
<defaultEntity>PJS</defaultEntity>
</user>
<entity>
- <entity_id>objectguid</ldap_id>
+ <entity_id>objectguid</entity_id>
<entity_label>samaccountname</entity_label>
- <parent_entity_id>memberof</parent_entity>
+ <parent_entity_id>memberof</parent_entity_id>
</entity>
</mapping>
<filter>
diff --git a/package.json b/package.json
index 6dfe82a64ce..dbe4df2f3cc 100755
--- a/package.json
+++ b/package.json
@@ -19,9 +19,9 @@
"author": "Maarch",
"license": "GPL-3.0",
"dependencies": {
- "core-js": "^3.8.0",
- "zone.js": "^0.11.3",
- "angular2-draggable": "^2.3.2"
+ "angular2-draggable": "^2.3.2",
+ "core-js": "^3.8.3",
+ "zone.js": "^0.11.3"
},
"devDependencies": {
"@angular-devkit/build-angular": "^0.1002.1",
@@ -38,7 +38,7 @@
"@angular/platform-browser-dynamic": "^10.2.3",
"@angular/platform-server": "^10.2.3",
"@angular/router": "^10.2.3",
- "@fortawesome/fontawesome-free": "^5.15.1",
+ "@fortawesome/fontawesome-free": "^5.15.2",
"@ngx-translate/core": "^13.0.0",
"@ngx-translate/http-loader": "^6.0.0",
"@swimlane/ngx-charts": "^16.0.0",
@@ -51,7 +51,7 @@
"bootstrap": "^3.4.1",
"chosen-js": "^1.8.7",
"codelyzer": "^6.0.1",
- "cypress": "^6.2.1",
+ "cypress": "^6.3.0",
"flat-to-nested": "^1.1.0",
"hammerjs": "^2.0.8",
"html-minifier": "^4.0.0",
@@ -66,7 +66,7 @@
"ngx-papaparse": "^5.0.0",
"ngx-pipes": "^2.7.5",
"node-sass": "^4.14.1",
- "nodemon": "^2.0.6",
+ "nodemon": "^2.0.7",
"npm-check-updates": "^9.2.4",
"pdfjs-dist": "2.5.207",
"photoswipe": "^4.1.3",
@@ -74,7 +74,7 @@
"tinymce": "^5.6.1",
"tinymce-i18n": "^20.12.25",
"tooltipster": "^4.2.8",
- "tslib": "^2.0.3",
+ "tslib": "^2.1.0",
"tslint": "^6.1.3",
"typescript": "4.0.3",
"url-loader": "^4.1.1"
--
GitLab