upgrade to latest ng2-charts (#1686)

This commit is contained in:
Denys Vuika
2017-03-04 17:30:22 +00:00
committed by Mario Romano
parent 861393de60
commit 9c07262657
10 changed files with 39 additions and 34 deletions

View File

@@ -36,6 +36,7 @@ import { AppComponent } from './app.component';
import { routing } from './app.routes';
import { CustomEditorsModule } from './components/activiti/custom-editor/custom-editor.component';
import { Editor3DModule } from 'ng2-3d-editor';
import { ChartsModule } from 'ng2-charts';
import {
HomeComponent,
@@ -73,7 +74,8 @@ import {
UserInfoComponentModule.forRoot(),
AnalyticsModule.forRoot(),
CustomEditorsModule,
Editor3DModule.forRoot()
Editor3DModule.forRoot(),
ChartsModule
],
declarations: [
AppComponent,

View File

@@ -9,7 +9,7 @@ import '@angular/router';
// RxJS
import 'rxjs';
//Alfresco
// Alfresco
import 'ng2-alfresco-core';
import 'ng2-alfresco-datatable';
import 'ng2-activiti-diagrams';
@@ -42,6 +42,7 @@ import '@angular/material/core/theming/prebuilt/deeppurple-amber.css'
import 'ng2-activiti-form/stencils/runtime.ng1';
import 'ng2-activiti-form/stencils/runtime.adf';
import 'ng2-charts';
import 'chart.js';
require('script!raphael/raphael.min.js');

View File

@@ -74,9 +74,9 @@
"pdfjs-dist": "1.5.404",
"flag-icon-css": "2.3.0",
"moment": "2.15.1",
"chart.js": "2.3.0",
"ng2-charts": "1.1.0",
"raphael": "^2.2.6",
"chart.js": "2.5.0",
"ng2-charts": "1.5.0",
"raphael": "2.2.7",
"md-date-time-picker": "^2.2.0",
"alfresco-js-api": "~1.2.0",
"ng2-3d-editor": "0.0.15",