From d5648024397147240b50ba305a9eac284df988bf Mon Sep 17 00:00:00 2001 From: Sebastian Date: Wed, 18 Mar 2020 12:09:57 +0100 Subject: [PATCH] Get rid of mentions fix. --- .../comments/comment.component.html | 7 +- .../comments/comments.component.html | 7 +- frontend/package-lock.json | 102 +++++++++--------- frontend/package.json | 18 ++-- 4 files changed, 65 insertions(+), 69 deletions(-) diff --git a/frontend/app/shared/components/comments/comment.component.html b/frontend/app/shared/components/comments/comment.component.html index ad1668878..fcd4f2015 100644 --- a/frontend/app/shared/components/comments/comment.component.html +++ b/frontend/app/shared/components/comments/comment.component.html @@ -30,7 +30,6 @@ [(ngModel)]="editingText" [mention]="mentionUsers" [mentionConfig]="mentionConfig" - [mentionListTemplate]="mentionListTemplate" (keydown)="updateWhenEnter($event)">
@@ -58,8 +57,4 @@
- - - - {{item['contributorEmail']}} - \ No newline at end of file + \ No newline at end of file diff --git a/frontend/app/shared/components/comments/comments.component.html b/frontend/app/shared/components/comments/comments.component.html index d2eee9612..3219e184b 100644 --- a/frontend/app/shared/components/comments/comments.component.html +++ b/frontend/app/shared/components/comments/comments.component.html @@ -19,16 +19,11 @@ -
- - {{item['contributorEmail']}} - - +
diff --git a/frontend/package-lock.json b/frontend/package-lock.json index e3054ad79..92f295eb5 100644 --- a/frontend/package-lock.json +++ b/frontend/package-lock.json @@ -5,9 +5,9 @@ "requires": true, "dependencies": { "@angular-devkit/build-optimizer": { - "version": "0.900.5", - "resolved": "https://registry.npmjs.org/@angular-devkit/build-optimizer/-/build-optimizer-0.900.5.tgz", - "integrity": "sha512-BdmvD58DnAAf6/o/fRzU2l+2g4IwuIJf8x/rd9AGWd7fHrcwgJDhB9rYetB7JqYR8uOWk+AFElDpvNOj8YUy0w==", + "version": "0.900.6", + "resolved": "https://registry.npmjs.org/@angular-devkit/build-optimizer/-/build-optimizer-0.900.6.tgz", + "integrity": "sha512-K8BDga/E1tUCuUnpnCCAR5yh8lfJqHSBvk1K9P5LgqQNxPvSedghyQ4LYNaeRRVIVmsh4RdsJ7hvmquFrFnTZg==", "dev": true, "requires": { "loader-utils": "1.2.3", @@ -82,9 +82,9 @@ } }, "@angular-devkit/core": { - "version": "9.0.5", - "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-9.0.5.tgz", - "integrity": "sha512-9TPQPzfSRbV5wVEnfo1d1CS+oVXROfE7VnBRuRMilFnNhuc29wX3zvBQRTreDVyxJetLBEb9sRlcKYGaJzpKPw==", + "version": "9.0.6", + "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-9.0.6.tgz", + "integrity": "sha512-hCZJbnqLEm1F5Bx+ILcdd3LPgQTn4WFWpfUqMEGGj7UirRInWcz+6UpYotKGTJw85/mV01LrIbtWIkAUXbkkhg==", "dev": true, "requires": { "ajv": "6.10.2", @@ -159,9 +159,9 @@ "integrity": "sha512-LNtzUrrjqLTlZyhuAEV0sdEV0yi52Ih/p+ozCr/ivhTSSemcPbniTBbJlFZO4NJ2BuS2iEXkXwZs3mm8Fvx5Sg==" }, "@angular/cdk": { - "version": "9.1.2", - "resolved": "https://registry.npmjs.org/@angular/cdk/-/cdk-9.1.2.tgz", - "integrity": "sha512-x5niyE0iYrbVtLYjJFw2MoS+OoSbJn6y/G2pNScviDwyjBBgqRh4YgUox2kMhdPumkvuh+eA6blZoE9qpvSo2w==", + "version": "9.1.3", + "resolved": "https://registry.npmjs.org/@angular/cdk/-/cdk-9.1.3.tgz", + "integrity": "sha512-K6XJzfqP+PE0ahyBUYrnoW+3ocwDpPN3dE9a+XRtZ0vM4P/FElweWj5zjNwWktb+uF9yal6oMPWXJNOAfonpPw==", "requires": { "parse5": "^5.0.0" } @@ -415,12 +415,12 @@ "dev": true }, "@ngtools/webpack": { - "version": "9.0.5", - "resolved": "https://registry.npmjs.org/@ngtools/webpack/-/webpack-9.0.5.tgz", - "integrity": "sha512-xe0rGpme04MNRK/PpPOx8cza9k8F/XuAOmxC3Tk4dIgigqIzYsP6v6N/At8vPRDrf88X4ZyR94lL5RrUYf/KNQ==", + "version": "9.0.6", + "resolved": "https://registry.npmjs.org/@ngtools/webpack/-/webpack-9.0.6.tgz", + "integrity": "sha512-1R6xuQKBlVdf1lPsjN9S/BRCxPTRPPDN3E3unX2Nw4wK8XBWwm5CuSeEgp33PCwMpyWPaa7bg25Nz3Zt+DIlSQ==", "dev": true, "requires": { - "@angular-devkit/core": "9.0.5", + "@angular-devkit/core": "9.0.6", "enhanced-resolve": "4.1.1", "rxjs": "6.5.3", "webpack-sources": "1.4.3" @@ -882,9 +882,9 @@ "dev": true }, "angular-mentions": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/angular-mentions/-/angular-mentions-1.1.3.tgz", - "integrity": "sha512-gTe20SQSS62FLW1dOptskeAfeLni9W3IBzTlki3veM+fbMbLeZpqbel7rfHGT15fymm2gTBcrsRyM/wRfItjHQ==", + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/angular-mentions/-/angular-mentions-1.1.4.tgz", + "integrity": "sha512-JGOSAuTxQub2rjtDke0aS+PXH8VTMG5hRwtX3LNYr+JqcoqU8uPobKRSHj/mpvYibPMdFIISmAODCZRuwAfltA==", "requires": { "tslib": "^1.9.0" } @@ -2019,9 +2019,9 @@ } }, "caniuse-lite": { - "version": "1.0.30001033", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001033.tgz", - "integrity": "sha512-8Ibzxee6ibc5q88cM1usPsMpJOG5CTq0s/dKOmlekPbDGKt+UrnOOTPSjQz3kVo6yL7N4SB5xd+FGLHQmbzh6A==", + "version": "1.0.30001035", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001035.tgz", + "integrity": "sha512-C1ZxgkuA4/bUEdMbU5WrGY4+UhMFFiXrgNAfxiMIqWgFTWfv/xsZCS2xEHT2LMq7xAZfuAnu6mcqyDl0ZR6wLQ==", "dev": true }, "canonical-path": { @@ -3128,9 +3128,9 @@ } }, "date-fns": { - "version": "2.10.0", - "resolved": "https://registry.npmjs.org/date-fns/-/date-fns-2.10.0.tgz", - "integrity": "sha512-EhfEKevYGWhWlZbNeplfhIU/+N+x0iCIx7VzKlXma2EdQyznVlZhCptXUY+BegNpPW2kjdx15Rvq503YcXXrcA==" + "version": "2.11.0", + "resolved": "https://registry.npmjs.org/date-fns/-/date-fns-2.11.0.tgz", + "integrity": "sha512-8P1cDi8ebZyDxUyUprBXwidoEtiQAawYPGvpfb+Dg0G6JrQ+VozwOmm91xYC0vAv1+0VmLehEPb+isg4BGUFfA==" }, "date-format": { "version": "2.1.0", @@ -4321,19 +4321,19 @@ } }, "file-loader": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/file-loader/-/file-loader-5.1.0.tgz", - "integrity": "sha512-u/VkLGskw3Ue59nyOwUwXI/6nuBCo7KBkniB/l7ICwr/7cPNGsL1WCXUp3GB0qgOOKU1TiP49bv4DZF/LJqprg==", + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/file-loader/-/file-loader-6.0.0.tgz", + "integrity": "sha512-/aMOAYEFXDdjG0wytpTL5YQLfZnnTmLNjn+AIrJ/6HVnTfDqLsVKUUwkDf4I4kgex36BvjuXEn/TX9B/1ESyqQ==", "dev": true, "requires": { - "loader-utils": "^1.4.0", - "schema-utils": "^2.5.0" + "loader-utils": "^2.0.0", + "schema-utils": "^2.6.5" }, "dependencies": { "ajv": { - "version": "6.11.0", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.11.0.tgz", - "integrity": "sha512-nCprB/0syFYy9fVYU1ox1l2KN8S9I+tziH8D4zdZuLT3N6RMlGSGt5FSTpAiHB/Whv8Qs1cWHma1aMKZyaHRKA==", + "version": "6.12.0", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.0.tgz", + "integrity": "sha512-D6gFiFA0RRLyUbvijN74DWAjXSFxWKaWP7mldxkVhyhAV3+SWA9HEJPHQ2c9soIeTFJqcSdFDGFgdqs1iUU2Hw==", "dev": true, "requires": { "fast-deep-equal": "^3.1.1", @@ -4373,32 +4373,38 @@ "dev": true }, "json5": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz", - "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==", + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/json5/-/json5-2.1.2.tgz", + "integrity": "sha512-MoUOQ4WdiN3yxhm7NEVJSJrieAo5hNSLQ5sj05OTRHPL9HOBy8u4Bu88jsC1jvqAdN+E1bJmsUcZH+1HQxliqQ==", "dev": true, "requires": { - "minimist": "^1.2.0" + "minimist": "^1.2.5" } }, "loader-utils": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.0.tgz", - "integrity": "sha512-qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA==", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.0.tgz", + "integrity": "sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ==", "dev": true, "requires": { "big.js": "^5.2.2", "emojis-list": "^3.0.0", - "json5": "^1.0.1" + "json5": "^2.1.2" } }, + "minimist": { + "version": "1.2.5", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz", + "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==", + "dev": true + }, "schema-utils": { - "version": "2.6.4", - "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-2.6.4.tgz", - "integrity": "sha512-VNjcaUxVnEeun6B2fiiUDjXXBtD4ZSH7pdbfIu1pOFwgptDPLMo/z9jr4sUfsjFVPqDCEin/F7IYlq7/E6yDbQ==", + "version": "2.6.5", + "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-2.6.5.tgz", + "integrity": "sha512-5KXuwKziQrTVHh8j/Uxz+QUbxkaLW9X/86NBlx/gnKgtsZA2GIVMUn17qWhRFwF8jdYb3Dig5hRO/W5mZqy6SQ==", "dev": true, "requires": { - "ajv": "^6.10.2", + "ajv": "^6.12.0", "ajv-keywords": "^3.4.1" } }, @@ -12485,9 +12491,9 @@ "integrity": "sha512-aZW88SY8kQbU7gpV19lN24LtXh/yD4ZZg6qieAJDDg+YBsJcSmLGK9QpnUjAKVG/xefmvJGd1WUmfpT/g6AJGA==" }, "tslint": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/tslint/-/tslint-6.0.0.tgz", - "integrity": "sha512-9nLya8GBtlFmmFMW7oXXwoXS1NkrccqTqAtwXzdPV9e2mqSEvCki6iHL/Fbzi5oqbugshzgGPk7KBb2qNP1DSA==", + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/tslint/-/tslint-6.1.0.tgz", + "integrity": "sha512-fXjYd/61vU6da04E505OZQGb2VCN2Mq3doeWcOIryuG+eqdmFUXTYVwdhnbEu2k46LNLgUYt9bI5icQze/j0bQ==", "dev": true, "requires": { "@babel/code-frame": "^7.0.0", @@ -15404,9 +15410,9 @@ "dev": true }, "zone.js": { - "version": "0.10.2", - "resolved": "https://registry.npmjs.org/zone.js/-/zone.js-0.10.2.tgz", - "integrity": "sha512-UAYfiuvxLN4oyuqhJwd21Uxb4CNawrq6fPS/05Su5L4G+1TN+HVDJMUHNMobVQDFJRir2cLAODXwluaOKB7HFg==" + "version": "0.10.3", + "resolved": "https://registry.npmjs.org/zone.js/-/zone.js-0.10.3.tgz", + "integrity": "sha512-LXVLVEq0NNOqK/fLJo3d0kfzd4sxwn2/h67/02pjCjfKDxgx1i9QqpvtHD8CrBnSSwMw5+dy11O7FRX5mkO7Cg==" } } } diff --git a/frontend/package.json b/frontend/package.json index e5224c186..9fee2cb4f 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -17,7 +17,7 @@ }, "dependencies": { "@angular/animations": "9.0.6", - "@angular/cdk": "9.1.2", + "@angular/cdk": "9.1.3", "@angular/common": "9.0.6", "@angular/core": "9.0.6", "@angular/forms": "9.0.6", @@ -25,13 +25,13 @@ "@angular/platform-browser-dynamic": "9.0.6", "@angular/platform-server": "9.0.6", "@angular/router": "9.0.6", - "angular-mentions": "^1.1.3", + "angular-mentions": "1.1.4", "angular2-chartjs": "0.5.1", "babel-polyfill": "6.26.0", "bootstrap": "4.4.1", "core-js": "3.6.4", "cropperjs": "2.0.0-alpha.1", - "date-fns": "^2.10.0", + "date-fns": "2.11.0", "graphiql": "0.17.5", "graphql": "14.6.0", "image-focus": "^1.1.0", @@ -47,13 +47,13 @@ "rxjs": "6.5.4", "slugify": "1.4.0", "tslib": "1.11.1", - "zone.js": "0.10.2" + "zone.js": "0.10.3" }, "devDependencies": { - "@angular-devkit/build-optimizer": "0.900.5", + "@angular-devkit/build-optimizer": "0.900.6", "@angular/compiler": "9.0.6", "@angular/compiler-cli": "9.0.6", - "@ngtools/webpack": "9.0.5", + "@ngtools/webpack": "9.0.6", "@types/core-js": "2.5.3", "@types/jasmine": "3.5.9", "@types/marked": "0.7.3", @@ -64,13 +64,13 @@ "@types/react-dom": "16.9.5", "@types/tinymce": "^4.5.24", "browserslist": "4.9.1", - "caniuse-lite": "1.0.30001033", + "caniuse-lite": "1.0.30001035", "circular-dependency-plugin": "5.2.0", "codelyzer": "5.2.1", "css-loader": "3.4.2", "cssnano": "^4.1.10", "entities": "^2.0.0", - "file-loader": "5.1.0", + "file-loader": "6.0.0", "html-loader": "0.5.5", "html-webpack-plugin": "3.2.0", "ignore-loader": "0.1.2", @@ -104,7 +104,7 @@ "terser-webpack-plugin": "2.3.5", "ts-loader": "6.2.1", "tsconfig-paths-webpack-plugin": "3.2.0", - "tslint": "6.0.0", + "tslint": "6.1.0", "tslint-immutable": "6.0.1", "tslint-webpack-plugin": "2.1.0", "typemoq": "2.1.0",