fix different material depencncies (#2791)

This commit is contained in:
Eugenio Romano
2017-12-19 15:41:36 +00:00
committed by GitHub
parent 14c81ca978
commit 413dcc9e45
10 changed files with 83 additions and 92 deletions

View File

@@ -60,18 +60,18 @@
], ],
"private": true, "private": true,
"dependencies": { "dependencies": {
"@angular/animations": "5.0.5", "@angular/animations": "5.1.1",
"@angular/cdk": "5.0.0", "@angular/cdk": "5.0.1",
"@angular/common": "5.0.5", "@angular/common": "5.1.1",
"@angular/compiler": "5.0.5", "@angular/compiler": "5.1.1",
"@angular/core": "5.0.5", "@angular/core": "5.1.1",
"@angular/flex-layout": "2.0.0-beta.10", "@angular/flex-layout": "2.0.0-beta.12",
"@angular/forms": "5.0.5", "@angular/forms": "5.1.1",
"@angular/http": "5.0.5", "@angular/http": "5.1.1",
"@angular/material": "5.0.0", "@angular/material": "5.0.1",
"@angular/platform-browser": "5.0.5", "@angular/platform-browser": "5.1.1",
"@angular/platform-browser-dynamic": "5.0.5", "@angular/platform-browser-dynamic": "5.1.1",
"@angular/router": "5.0.5", "@angular/router": "5.1.1",
"@ngx-translate/core": "8.0.0", "@ngx-translate/core": "8.0.0",
"alfresco-js-api": "2.0.0", "alfresco-js-api": "2.0.0",
"@alfresco/adf-content-services": "2.0.0", "@alfresco/adf-content-services": "2.0.0",
@@ -97,8 +97,8 @@
}, },
"devDependencies": { "devDependencies": {
"@angular/cli": "1.5.0", "@angular/cli": "1.5.0",
"@angular/compiler-cli": "5.0.5", "@angular/compiler-cli": "5.1.1",
"@angular/language-service": "5.0.5", "@angular/language-service": "5.1.1",
"@types/jasmine": "~2.5.53", "@types/jasmine": "~2.5.53",
"@types/jasminewd2": "~2.0.2", "@types/jasminewd2": "~2.0.2",
"@types/node": "~6.0.60", "@types/node": "~6.0.60",

View File

@@ -1,7 +1,7 @@
<div class="about-container"> <div class="about-container">
<h3>Server settings</h3> <h3>Server settings</h3>
<mat-list> <mat-list>
<small>The values below are taken from the AppConfigService and loaded from the '{{ configFile }}' file.</small> <small>The values below are taken from the AppConfigService </small>
<mat-list-item> <mat-list-item>
<h4 matLine> Alfresco Process Services URL: {{ bpmHost }}</h4> <h4 matLine> Alfresco Process Services URL: {{ bpmHost }}</h4>
</mat-list-item> </mat-list-item>

View File

@@ -39,7 +39,6 @@ export class AboutComponent implements OnInit {
modules: ObjectDataTableAdapter; modules: ObjectDataTableAdapter;
githubUrlCommitAlpha = 'https://github.com/Alfresco/alfresco-ng2-components/commits/'; githubUrlCommitAlpha = 'https://github.com/Alfresco/alfresco-ng2-components/commits/';
configFile = 'app.config.json';
ecmHost = ''; ecmHost = '';
bpmHost = ''; bpmHost = '';

View File

@@ -153,7 +153,7 @@ export class ProcessServiceComponent implements AfterViewInit, OnDestroy, OnInit
private preferenceService: UserPreferencesService) { private preferenceService: UserPreferencesService) {
this.dataTasks = new ObjectDataTableAdapter(); this.dataTasks = new ObjectDataTableAdapter();
this.dataTasks.setSorting(new DataSorting('created', 'desc')); this.dataTasks.setSorting(new DataSorting('created', 'desc'));
this.supportedPages = this.preferenceService.getDifferentPageSizes(); // this.supportedPages = this.preferenceService.getDifferentPageSizes();
this.taskPagination.maxItems = this.preferenceService.paginationSize; this.taskPagination.maxItems = this.preferenceService.paginationSize;
// Uncomment this line to replace all 'text' field editors with custom component // Uncomment this line to replace all 'text' field editors with custom component

View File

@@ -39,7 +39,6 @@ import 'core-js/es6/set';
/** IE10 and IE11 requires the following to support `@angular/animation`. */ /** IE10 and IE11 requires the following to support `@angular/animation`. */
import 'web-animations-js'; // Run `npm install --save web-animations-js`. import 'web-animations-js'; // Run `npm install --save web-animations-js`.
/** Evergreen browsers require these. **/ /** Evergreen browsers require these. **/
import 'core-js/es6/reflect'; import 'core-js/es6/reflect';
import 'core-js/es7/reflect'; import 'core-js/es7/reflect';
@@ -47,18 +46,11 @@ import 'core-js/es6/array';
import 'core-js/es7/array'; import 'core-js/es7/array';
/** ALL Firefox browsers require the following to support `@angular/animation`. **/
import 'web-animations-js'; // Run `npm install --save web-animations-js`.
/*************************************************************************************************** /***************************************************************************************************
* Zone JS is required by Angular itself. * Zone JS is required by Angular itself.
*/ */
import 'zone.js/dist/zone'; // Included with Angular CLI. import 'zone.js/dist/zone'; // Included with Angular CLI.
/*************************************************************************************************** /***************************************************************************************************
* APPLICATION IMPORTS * APPLICATION IMPORTS
*/ */

View File

@@ -12,19 +12,19 @@
"url": "https://github.com/Alfresco/alfresco-ng2-components/issues" "url": "https://github.com/Alfresco/alfresco-ng2-components/issues"
}, },
"dependencies": { "dependencies": {
"@angular/animations": "5.0.0", "@angular/animations": "5.1.1",
"@angular/cdk": "5.0.0-rc0", "@angular/cdk": "5.0.1",
"@angular/common": "5.0.0", "@angular/common": "5.1.1",
"@angular/compiler": "5.0.0", "@angular/compiler": "5.1.1",
"@angular/core": "5.0.0", "@angular/core": "5.1.1",
"@angular/flex-layout": "2.0.0-beta.10", "@angular/flex-layout": "2.0.0-beta.12",
"@angular/forms": "5.0.0", "@angular/forms": "5.1.1",
"@angular/http": "5.0.0", "@angular/http": "5.1.1",
"@angular/material": "5.0.0-rc0", "@angular/material": "5.0.1",
"@angular/material-moment-adapter": "^5.0.0-rc0", "@angular/material-moment-adapter": "5.0.0",
"@angular/platform-browser": "5.0.0", "@angular/platform-browser": "5.1.1",
"@angular/platform-browser-dynamic": "5.0.0", "@angular/platform-browser-dynamic": "5.1.1",
"@angular/router": "5.0.0", "@angular/router": "5.1.1",
"@ngx-translate/core": "8.0.0", "@ngx-translate/core": "8.0.0",
"alfresco-js-api": "2.0.0", "alfresco-js-api": "2.0.0",
"@alfresco/adf-core": "2.0.0", "@alfresco/adf-core": "2.0.0",

View File

@@ -12,19 +12,19 @@
"url": "https://github.com/Alfresco/alfresco-ng2-components/issues" "url": "https://github.com/Alfresco/alfresco-ng2-components/issues"
}, },
"dependencies": { "dependencies": {
"@angular/animations": "5.0.0", "@angular/animations": "5.1.1",
"@angular/cdk": "5.0.0-rc0", "@angular/cdk": "5.0.1",
"@angular/common": "5.0.0", "@angular/common": "5.1.1",
"@angular/compiler": "5.0.0", "@angular/compiler": "5.1.1",
"@angular/core": "5.0.0", "@angular/core": "5.1.1",
"@angular/flex-layout": "2.0.0-beta.10", "@angular/flex-layout": "2.0.0-beta.12",
"@angular/forms": "5.0.0", "@angular/forms": "5.1.1",
"@angular/http": "5.0.0", "@angular/http": "5.1.1",
"@angular/material": "5.0.0-rc0", "@angular/material": "5.0.1",
"@angular/material-moment-adapter": "^5.0.0-rc0", "@angular/material-moment-adapter": "5.0.0",
"@angular/platform-browser": "5.0.0", "@angular/platform-browser": "5.1.1",
"@angular/platform-browser-dynamic": "5.0.0", "@angular/platform-browser-dynamic": "5.1.1",
"@angular/router": "5.0.0", "@angular/router": "5.1.1",
"@ngx-translate/core": "8.0.0", "@ngx-translate/core": "8.0.0",
"alfresco-js-api": "2.0.0", "alfresco-js-api": "2.0.0",
"chart.js": "2.5.0", "chart.js": "2.5.0",

View File

@@ -12,19 +12,19 @@
"url": "https://github.com/Alfresco/alfresco-ng2-components/issues" "url": "https://github.com/Alfresco/alfresco-ng2-components/issues"
}, },
"dependencies": { "dependencies": {
"@angular/animations": "5.0.0", "@angular/animations": "5.1.1",
"@angular/cdk": "5.0.0-rc0", "@angular/cdk": "5.0.1",
"@angular/common": "5.0.0", "@angular/common": "5.1.1",
"@angular/compiler": "5.0.0", "@angular/compiler": "5.1.1",
"@angular/core": "5.0.0", "@angular/core": "5.1.1",
"@angular/flex-layout": "2.0.0-beta.10", "@angular/flex-layout": "2.0.0-beta.12",
"@angular/forms": "5.0.0", "@angular/forms": "5.1.1",
"@angular/http": "5.0.0", "@angular/http": "5.1.1",
"@angular/material": "5.0.0-rc0", "@angular/material": "5.0.1",
"@angular/material-moment-adapter": "^5.0.0-rc0", "@angular/material-moment-adapter": "5.0.0",
"@angular/platform-browser": "5.0.0", "@angular/platform-browser": "5.1.1",
"@angular/platform-browser-dynamic": "5.0.0", "@angular/platform-browser-dynamic": "5.1.1",
"@angular/router": "5.0.0", "@angular/router": "5.1.1",
"@ngx-translate/core": "8.0.0", "@ngx-translate/core": "8.0.0",
"alfresco-js-api": "2.0.0", "alfresco-js-api": "2.0.0",
"@alfresco/adf-core": "2.0.0", "@alfresco/adf-core": "2.0.0",

View File

@@ -49,19 +49,19 @@
"process services" "process services"
], ],
"dependencies": { "dependencies": {
"@angular/animations": "5.0.5", "@angular/animations": "5.1.1",
"@angular/cdk": "5.0.0", "@angular/cdk": "5.0.1",
"@angular/common": "5.0.5", "@angular/common": "5.1.1",
"@angular/compiler": "5.0.5", "@angular/compiler": "5.1.1",
"@angular/core": "5.0.5", "@angular/core": "5.1.1",
"@angular/flex-layout": "2.0.0-beta.10", "@angular/flex-layout": "2.0.0-beta.12",
"@angular/forms": "5.0.5", "@angular/forms": "5.1.1",
"@angular/http": "5.0.5", "@angular/http": "5.1.1",
"@angular/material": "5.0.0", "@angular/material": "5.0.1",
"@angular/material-moment-adapter": "5.0.0", "@angular/material-moment-adapter": "5.0.0",
"@angular/platform-browser": "5.0.5", "@angular/platform-browser": "5.1.1",
"@angular/platform-browser-dynamic": "5.0.5", "@angular/platform-browser-dynamic": "5.1.1",
"@angular/router": "5.0.5", "@angular/router": "5.1.1",
"@ngx-translate/core": "8.0.0", "@ngx-translate/core": "8.0.0",
"alfresco-js-api": "2.0.0", "alfresco-js-api": "2.0.0",
"chart.js": "2.5.0", "chart.js": "2.5.0",
@@ -80,7 +80,7 @@
"zone.js": "0.8.14" "zone.js": "0.8.14"
}, },
"devDependencies": { "devDependencies": {
"@angular/compiler-cli": "5.0.5", "@angular/compiler-cli": "5.1.1",
"@types/hammerjs": "2.0.35", "@types/hammerjs": "2.0.35",
"@types/jasmine": "^2.5.35", "@types/jasmine": "^2.5.35",
"@types/node": "6.0.90", "@types/node": "6.0.90",

View File

@@ -12,19 +12,19 @@
"url": "https://github.com/Alfresco/alfresco-ng2-components/issues" "url": "https://github.com/Alfresco/alfresco-ng2-components/issues"
}, },
"dependencies": { "dependencies": {
"@angular/animations": "5.0.0", "@angular/animations": "5.1.1",
"@angular/cdk": "5.0.0-rc0", "@angular/cdk": "5.0.1",
"@angular/common": "5.0.0", "@angular/common": "5.1.1",
"@angular/compiler": "5.0.0", "@angular/compiler": "5.1.1",
"@angular/core": "5.0.0", "@angular/core": "5.1.1",
"@angular/flex-layout": "2.0.0-beta.10", "@angular/flex-layout": "2.0.0-beta.12",
"@angular/forms": "5.0.0", "@angular/forms": "5.1.1",
"@angular/http": "5.0.0", "@angular/http": "5.1.1",
"@angular/material": "5.0.0-rc0", "@angular/material": "5.0.1",
"@angular/material-moment-adapter": "^5.0.0-rc0", "@angular/material-moment-adapter": "5.0.0",
"@angular/platform-browser": "5.0.0", "@angular/platform-browser": "5.1.1",
"@angular/platform-browser-dynamic": "5.0.0", "@angular/platform-browser-dynamic": "5.1.1",
"@angular/router": "5.0.0", "@angular/router": "5.1.1",
"@ngx-translate/core": "8.0.0", "@ngx-translate/core": "8.0.0",
"alfresco-js-api": "2.0.0", "alfresco-js-api": "2.0.0",
"@alfresco/adf-core": "2.0.0", "@alfresco/adf-core": "2.0.0",