Merge branch 'development' into dev-denys-1304

This commit is contained in:
Denys Vuika
2016-12-16 14:49:54 +00:00
committed by GitHub
12 changed files with 1475 additions and 431 deletions

View File

@@ -2,8 +2,6 @@ import 'core-js/es6';
import 'core-js/es7/reflect';
// IE 8-11
require('script!element.scrollintoviewifneeded-polyfill/index.js');
require('zone.js/dist/zone');
if (process.env.ENV === 'production') {

View File

@@ -10,45 +10,32 @@ import '@angular/router';
import 'rxjs';
//Alfresco
import 'ng2-alfresco-core'
import 'ng2-alfresco-datatable'
import 'ng2-activiti-diagrams'
import 'ng2-activiti-analytics'
import 'ng2-activiti-form'
import 'ng2-activiti-processlist'
import 'ng2-activiti-tasklist'
import 'ng2-alfresco-documentlist'
import 'ng2-alfresco-login'
import 'ng2-alfresco-search'
import 'ng2-alfresco-tag'
import 'ng2-alfresco-upload'
import 'ng2-alfresco-viewer'
import 'ng2-alfresco-webscript'
import 'ng2-alfresco-userinfo'
// Other vendors for example jQuery, Lodash or Bootstrap
// You can import js, ts, css, sass, ...
// Google Material Design Lite
import '../public/css/material.orange-blue.min.css';
import 'material-design-lite/material.min';
import 'material-design-icons/iconfont/material-icons.css';
// Flags
import 'flag-icon-css/css/flag-icon.min.css';
import 'ng2-alfresco-core';
import 'ng2-alfresco-datatable';
import 'ng2-activiti-diagrams';
import 'ng2-activiti-analytics';
import 'ng2-activiti-form';
import 'ng2-activiti-processlist';
import 'ng2-activiti-tasklist';
import 'ng2-alfresco-documentlist';
import 'ng2-alfresco-login';
import 'ng2-alfresco-search';
import 'ng2-alfresco-tag';
import 'ng2-alfresco-upload';
import 'ng2-alfresco-viewer';
import 'ng2-alfresco-webscript';
import 'ng2-alfresco-userinfo';
// Polyfill(s) for dialogs
require('script!dialog-polyfill/dialog-polyfill');
import 'dialog-polyfill/dialog-polyfill.css';
// app content
import '../public/css/app.css';
import '../public/css/muli-font.css';
// Flags
import 'flag-icon-css/css/flag-icon.min.css';
import 'ng2-activiti-form/stencils/runtime.ng1';
import 'ng2-activiti-form/stencils/runtime.adf';
require('script!../public/js/Polyline.js');
import 'chart.js';
require('script!raphael/raphael.min.js');