Merge development branch

# Conflicts:
#	ng2-components/ng2-activiti-tasklist/index.ts
#
ng2-components/ng2-activiti-tasklist/src/components/activiti-filters.com
ponent.spec.ts
#
ng2-components/ng2-activiti-tasklist/src/components/activiti-task-detail
s.component.ts
#
ng2-components/ng2-activiti-tasklist/src/components/activiti-tasklist.co
mponent.spec.ts
#	ng2-components/ng2-alfresco-login/demo/package.json
This commit is contained in:
Denys Vuika
2016-09-26 09:55:38 +01:00
61 changed files with 1891 additions and 153 deletions

View File

@@ -29,7 +29,8 @@ import {
ActivitiChecklist,
ActivitiComments,
ActivitiPeople,
ActivitiTaskHeader
ActivitiTaskHeader,
ActivitiStartProcessButton
} from './src/components/index';
import { ActivitiTaskListService } from './src/services/activiti-tasklist.service';
@@ -47,7 +48,8 @@ export const ACTIVITI_TASKLIST_DIRECTIVES: any[] = [
ActivitiChecklist,
ActivitiComments,
ActivitiPeople,
ActivitiTaskHeader
ActivitiTaskHeader,
ActivitiStartProcessButton
];
export const ACTIVITI_TASKLIST_PROVIDERS: any[] = [