inteligr8/alfresco-ng2-components
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-ng2-components.git synced 2025-07-24 17:32:15 +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

4
demo-shell-ng2/app/app.component.ts
View File

@@ -33,6 +33,7 @@ import { SearchBarComponent } from './components/search/search-bar.component';
import { LoginDemoComponent } from './components/login/login-demo.component';
import { TasksDemoComponent } from './components/tasks/tasks-demo.component';
import { ActivitiDemoComponent } from './components/activiti/activiti-demo.component';
import { WebscriptComponent } from './components/webscript/webscript.component';
declare var document: any;
@@ -52,7 +53,8 @@ declare var document: any;
{path: '/login', name: 'Login', component: LoginDemoComponent},
{path: '/search', name: 'Search', component: SearchComponent},
{path: '/tasks', name: 'Tasks', component: TasksDemoComponent},
{path: '/activiti', name: 'Activiti', component: ActivitiDemoComponent}
{path: '/activiti', name: 'Activiti', component: ActivitiDemoComponent},
{path: '/webscript', name: 'Webscript', component: WebscriptComponent}
])
export class AppComponent {
translate: AlfrescoTranslationService;