inteligr8/alfresco-ng2-components
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-ng2-components.git synced 2025-07-31 17:38:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'development' into dev-denys-440

Browse Source 
# Conflicts:
#	.travis.yml
#	demo-shell-ng2/app/app.component.html
#	demo-shell-ng2/app/app.component.ts
#	demo-shell-ng2/package.json
#	demo-shell-ng2/systemjs.config.js
This commit is contained in:
Denys Vuika
2016-07-22 09:59:44 +01:00
parent e3831d7622 8615853805
commit ab891ff5c2
62 changed files with 2058 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
demo-shell-ng2/systemjs.config.js
View File

@@ -17,8 +17,9 @@
'ng2-alfresco-login': 'node_modules/ng2-alfresco-login/dist',
'ng2-alfresco-search': 'node_modules/ng2-alfresco-search/dist',
'ng2-alfresco-upload': 'node_modules/ng2-alfresco-upload/dist',
'ng2-activiti-form': 'node_modules/ng2-activiti-form/dist',
'ng2-alfresco-viewer': 'node_modules/ng2-alfresco-viewer/dist',
'ng2-activiti-form': 'node_modules/ng2-activiti-form/dist'
'ng2-alfresco-webscript': 'node_modules/ng2-alfresco-webscript/dist'
};
// packages tells the System loader how to load when no filename and/or no extension
var packages = {
@@ -35,7 +36,8 @@
'ng2-alfresco-search': { main: 'index.js', defaultExtension: 'js'},
'ng2-alfresco-upload': { main: 'index.js', defaultExtension: 'js'},
'ng2-alfresco-viewer': { main: 'index.js', defaultExtension: 'js'},
'ng2-activiti-form': { main: 'index.js', defaultExtension: 'js'}
'ng2-activiti-form': { main: 'index.js', defaultExtension: 'js'},
'ng2-alfresco-webscript': { main: 'index.js', defaultExtension: 'js'}
};
var ngPackageNames = [
'common',