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

Merge pull request #4922 from tsiegleauq/update-ngrid-to-alpha-27 

Update NGrid and fix build errors
This commit is contained in:
Finn Stutzenstein 2019-08-15 12:18:33 +02:00 committed by GitHub
parent ba5782a655 1ecd5d663b
commit a1b7b1c69d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.travis.yml
View File

@ -146,7 +146,7 @@ matrix:
install:
- npm install
script:
- npm run ng-high-memory -- build --prod --aot
- npm run build
- language: node_js
name: "Client: Production Build (ES2015)"
@ -163,4 +163,4 @@ matrix:
install:
- npm install
script:
- npm run ng-high-memory -- build --prod --aot
- npm run build

4
client/README.md
View File

@ -75,8 +75,8 @@ OpenSlides uses the following software or parts of them:
- [@ngx-pwa/local-storage@8.0.2](https://github.com/cyrilletuzi/angular-async-local-storage), License: MIT
- [@ngx-translate/core@11.0.1](https://github.com/ngx-translate/core), License: MIT
- [@ngx-translate/http-loader@4.0.0](https://github.com/ngx-translate/http-loader), License: MIT
- [@pebula/ngrid-material@1.0.0-alpha.26](https://github.com/shlomiassaf/ngrid), License: MIT
- [@pebula/ngrid@1.0.0-alpha.26](https://github.com/shlomiassaf/ngrid), License: MIT
- [@pebula/ngrid-material@1.0.0-alpha.27](https://github.com/shlomiassaf/ngrid), License: MIT
- [@pebula/ngrid@1.0.0-alpha.27](https://github.com/shlomiassaf/ngrid), License: MIT
- [@pebula/utils@1.0.0-alpha.3](https://github.com/shlomiassaf/ngrid), License: MIT
- [@tinymce/tinymce-angular@3.2.0](https://github.com/tinymce/tinymce-angular), License: Apache-2.0
- [acorn@6.1.1](https://github.com/acornjs/acorn), License: MIT

12
client/package.json
View File

@ -12,7 +12,7 @@
"ng": "ng",
"ng-high-memory": "node --max_old_space_size=4096 ./node_modules/@angular/cli/bin/ng",
"start": "ng serve --proxy-config proxy.conf.json --host=0.0.0.0",
"build": "ng build --prod",
"build": "npm run ng-high-memory -- build --prod",
"test": "ng test",
"lint-check": "ng lint",
"lint-write": "ng lint --fix",
@ -29,8 +29,8 @@
},
"dependencies": {
"@angular/animations": "^8.0.3",
"@angular/cdk": "^8.0.1",
"@angular/cdk-experimental": "^8.0.1",
"@angular/cdk": "8.1.2",
"@angular/cdk-experimental": "8.1.2",
"@angular/common": "^8.0.3",
"@angular/compiler": "^8.0.3",
"@angular/core": "^8.0.3",
@ -44,9 +44,9 @@
"@ngx-pwa/local-storage": "^8.0.2",
"@ngx-translate/core": "^11.0.1",
"@ngx-translate/http-loader": "^4.0.0",
"@pebula/ngrid": "^1.0.0-alpha.26",
"@pebula/ngrid-material": "^1.0.0-alpha.26",
"@pebula/utils": "^1.0.0-alpha.3",
"@pebula/ngrid": "1.0.0-alpha.27",
"@pebula/ngrid-material": "1.0.0-alpha.27",
"@pebula/utils": "1.0.0-alpha.3",
"@tinymce/tinymce-angular": "^3.2.0",
"acorn": "^6.1.1",
"core-js": "^3.0.1",