ag-admin
/
OpenSlides
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #4377 from tsiegleauq/angular725 

Update to angular 7.2.5
This commit is contained in:
Jochen Saalfeld 2019-02-20 15:25:46 +01:00 committed by GitHub
parent 6eea064862 8f83fc1bd5
commit 0975de7432
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 41 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
client/angular.json
View File

@ -22,13 +22,8 @@
"main": "src/main.ts",
"polyfills": "src/polyfills.ts",
"tsConfig": "src/tsconfig.app.json",
"assets": [
"src/assets",
"src/manifest.json"
],
"styles": [
"src/styles.scss"
],
"assets": ["src/assets", "src/manifest.json"],
"styles": ["src/styles.scss"],
"scripts": [
"node_modules/tinymce/tinymce.min.js",
"node_modules/tinymce/themes/modern/theme.js",
@ -92,16 +87,9 @@
"polyfills": "src/polyfills.ts",
"tsConfig": "src/tsconfig.spec.json",
"karmaConfig": "src/karma.conf.js",
"styles": [
"src/styles.scss"
],
"scripts": [
"node_modules/tinymce/tinymce.min.js"
],
"assets": [
"src/assets",
"src/manifest.json"
]
"styles": ["src/styles.scss"],
"scripts": ["node_modules/tinymce/tinymce.min.js"],
"assets": ["src/assets", "src/manifest.json"]
}
},
"lint": {
@ -109,9 +97,7 @@
"options": {
"tsConfig": "src/tsconfig.spec.json",
"format": "stylish",
"exclude": [
"**/node_modules/**"
]
"exclude": ["**/node_modules/**"]
}
}
}
@ -136,9 +122,7 @@
"builder": "@angular-devkit/build-angular:tslint",
"options": {
"tsConfig": "e2e/tsconfig.e2e.json",
"exclude": [
"**/node_modules/**"
]
"exclude": ["**/node_modules/**"]
}
}
}

64
client/package.json
View File

@ -24,33 +24,33 @@
"prettify-write": "prettier --config ./.prettierrc --write \"src/{app,environments}/**/*{.ts,.js,.json,.css,.scss}\""
},
"dependencies": {
"@angular/animations": "^7.2.2",
"@angular/cdk": "^7.3.0",
"@angular/common": "^7.2.2",
"@angular/compiler": "^7.2.2",
"@angular/core": "^7.2.2",
"@angular/forms": "^7.2.2",
"@angular/http": "^7.2.2",
"@angular/material": "^7.3.0",
"@angular/platform-browser": "^7.2.2",
"@angular/platform-browser-dynamic": "^7.2.2",
"@angular/pwa": "^0.12.3",
"@angular/router": "^7.2.2",
"@angular/service-worker": "^7.2.2",
"@angular/animations": "^7.2.5",
"@angular/cdk": "^7.3.2",
"@angular/common": "^7.2.5",
"@angular/compiler": "^7.2.5",
"@angular/core": "^7.2.5",
"@angular/forms": "^7.2.5",
"@angular/http": "^7.2.5",
"@angular/material": "^7.3.2",
"@angular/platform-browser": "^7.2.5",
"@angular/platform-browser-dynamic": "^7.2.5",
"@angular/pwa": "^0.13.2",
"@angular/router": "^7.2.5",
"@angular/service-worker": "^7.2.5",
"@ngx-pwa/local-storage": "^7.4.1",
"@ngx-translate/core": "^11.0.1",
"@ngx-translate/http-loader": "^4.0.0",
"@tinymce/tinymce-angular": "^2.5.0",
"@tinymce/tinymce-angular": "^3.0.0",
"angular-tree-component": "^8.2.0",
"core-js": "^2.6.3",
"core-js": "^2.6.5",
"css-element-queries": "^1.1.1",
"file-saver": "^2.0.0",
"file-saver": "^2.0.1",
"material-icon-font": "git+https://github.com/petergng/materialIconFont.git",
"ng-pick-datetime": "^7.0.0",
"ngx-file-drop": "^5.0.2",
"ngx-file-drop": "^5.0.5",
"ngx-mat-select-search": "^1.5.2",
"ngx-papaparse": "^3.0.2",
"pdfmake": "^0.1.41",
"pdfmake": "^0.1.53",
"po2json": "^1.0.0-alpha",
"rxjs": "^6.4.0",
"tinymce": "^4.9.2",
@ -58,33 +58,33 @@
"zone.js": "^0.8.29"
},
"devDependencies": {
"@angular-devkit/build-angular": "^0.12.3",
"@angular/cli": "^7.2.3",
"@angular/compiler-cli": "^7.2.2",
"@angular/language-service": "^7.2.2",
"@compodoc/compodoc": "^1.1.7",
"@types/jasmine": "^3.3.8",
"@angular-devkit/build-angular": "^0.13.2",
"@angular/cli": "^7.3.2",
"@angular/compiler-cli": "^7.2.5",
"@angular/language-service": "^7.2.5",
"@compodoc/compodoc": "^1.1.8",
"@types/jasmine": "^3.3.9",
"@types/jasminewd2": "^2.0.6",
"@types/node": "^10.12.19",
"@types/yargs": "^12.0.8",
"@types/node": "^11.9.4",
"@types/yargs": "^12.0.9",
"codelyzer": "~4.5.0",
"husky": "^1.3.1",
"jasmine-core": "~3.3.0",
"jasmine-spec-reporter": "~4.2.1",
"karma": "^4.0.0",
"karma-chrome-launcher": "~2.2.0",
"karma-coverage-istanbul-reporter": "^2.0.4",
"karma-coverage-istanbul-reporter": "^2.0.5",
"karma-jasmine": "~2.0.1",
"karma-jasmine-html-reporter": "^1.4.0",
"npm-run-all": "^4.1.5",
"prettier": "^1.16.2",
"prettier": "^1.16.4",
"protractor": "^5.4.2",
"source-map-explorer": "^1.6.0",
"source-map-explorer": "^1.7.0",
"terser": "3.16.1",
"ts-node": "~8.0.2",
"tslint": "~5.12.1",
"tsutils": "^3.7.0",
"tsutils": "^3.8.0",
"typescript": "~3.2.0",
"webpack-bundle-analyzer": "^3.0.3",
"terser": "3.14.1"
"webpack-bundle-analyzer": "^3.0.4"
}
}

BIN
client/src/assets/tinymce/skins/lightgray/fonts/tinymce.eot
View File

Binary file not shown.

1
client/src/assets/tinymce/skins/lightgray/fonts/tinymce.svg
View File

@ -87,6 +87,7 @@
<glyph unicode="&#xe906;" glyph-name="reload" d="M889.68 793.68c-93.608 102.216-228.154 166.32-377.68 166.32-282.77 0-512-229.23-512-512h96c0 229.75 186.25 416 416 416 123.020 0 233.542-53.418 309.696-138.306l-149.696-149.694h352v352l-134.32-134.32zM928 448c0-229.75-186.25-416-416-416-123.020 0-233.542 53.418-309.694 138.306l149.694 149.694h-352v-352l134.32 134.32c93.608-102.216 228.154-166.32 377.68-166.32 282.77 0 512 229.23 512 512h-96z" />
<glyph unicode="&#xe907;" glyph-name="translate" d="M553.6 304l-118.4 118.4c80 89.6 137.6 195.2 172.8 304h137.6v92.8h-326.4v92.8h-92.8v-92.8h-326.4v-92.8h518.4c-32-89.6-80-176-147.2-249.6-44.8 48-80 99.2-108.8 156.8h-92.8c35.2-76.8 80-147.2 137.6-211.2l-236.8-233.6 67.2-67.2 233.6 233.6 144-144c3.2 0 38.4 92.8 38.4 92.8zM816 540.8h-92.8l-208-560h92.8l51.2 140.8h220.8l51.2-140.8h92.8l-208 560zM691.2 214.4l76.8 201.6 76.8-201.6h-153.6z" />
<glyph unicode="&#xe908;" glyph-name="drag" d="M576 896h128v-128h-128v128zM576 640h128v-128h-128v128zM320 640h128v-128h-128v128zM576 384h128v-128h-128v128zM320 384h128v-128h-128v128zM320 128h128v-128h-128v128zM576 128h128v-128h-128v128zM320 896h128v-128h-128v128z" />
<glyph unicode="&#xe909;" glyph-name="format-painter" d="M768 746.667v42.667c0 23.467-19.2 42.667-42.667 42.667h-512c-23.467 0-42.667-19.2-42.667-42.667v-170.667c0-23.467 19.2-42.667 42.667-42.667h512c23.467 0 42.667 19.2 42.667 42.667v42.667h42.667v-170.667h-426.667v-384c0-23.467 19.2-42.667 42.667-42.667h85.333c23.467 0 42.667 19.2 42.667 42.667v298.667h341.333v341.333h-128z" />
<glyph unicode="&#xe90b;" glyph-name="home" d="M1024 369.556l-512 397.426-512-397.428v162.038l512 397.426 512-397.428zM896 384v-384h-256v256h-256v-256h-256v384l384 288z" />
<glyph unicode="&#xe911;" glyph-name="books" d="M576.234 670.73l242.712 81.432 203.584-606.784-242.712-81.432zM0 64h256v704h-256v-704zM64 640h128v-64h-128v64zM320 64h256v704h-256v-704zM384 640h128v-64h-128v64z" />
<glyph unicode="&#xe914;" glyph-name="upload" d="M839.432 760.57c27.492-27.492 50.554-78.672 55.552-120.57h-318.984v318.984c41.898-4.998 93.076-28.060 120.568-55.552l142.864-142.862zM512 576v384h-368c-44 0-80-36-80-80v-864c0-44 36-80 80-80h672c44 0 80 36 80 80v560h-384zM576 192v-192h-192v192h-160l256 256 256-256h-160z" />

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 45 KiB

After

Width:  |  Height:  |  Size: 45 KiB

BIN
client/src/assets/tinymce/skins/lightgray/fonts/tinymce.ttf
View File

Binary file not shown.

BIN
client/src/assets/tinymce/skins/lightgray/fonts/tinymce.woff
View File

Binary file not shown.

2
client/src/assets/tinymce/skins/lightgray/skin.min.css vendored
View File

File diff suppressed because one or more lines are too long

1
client/src/styles.scss
View File

@ -405,7 +405,6 @@ button.mat-menu-item.selected {
margin-left: 10px;
}
.button24 {
background-color: white;
width: 24px !important;