61949: merged master, resolving conflicts
Showing
- src/app/+search-page/search-service/search-configuration.service.ts 1 addition, 1 deletion...earch-page/search-service/search-configuration.service.ts
- src/app/core/cache/models/items/normalized-item-type.model.ts 2 additions, 0 deletions...app/core/cache/models/items/normalized-item-type.model.ts
- src/app/core/cache/models/items/normalized-relationship-type.model.ts 2 additions, 0 deletions.../cache/models/items/normalized-relationship-type.model.ts
- src/app/core/cache/models/items/normalized-relationship.model.ts 2 additions, 0 deletions.../core/cache/models/items/normalized-relationship.model.ts
- src/app/core/cache/response.models.ts 1 addition, 3 deletionssrc/app/core/cache/response.models.ts
- src/app/core/data/base-response-parsing.service.ts 1 addition, 0 deletionssrc/app/core/data/base-response-parsing.service.ts
- src/app/core/tasks/models/normalized-claimed-task-object.model.ts 3 additions, 1 deletion...core/tasks/models/normalized-claimed-task-object.model.ts
- src/app/core/tasks/models/normalized-pool-task-object.model.ts 3 additions, 1 deletion...pp/core/tasks/models/normalized-pool-task-object.model.ts
- src/app/core/tasks/models/normalized-task-object.model.ts 1 addition, 1 deletionsrc/app/core/tasks/models/normalized-task-object.model.ts
- src/app/core/tasks/models/task-object.model.ts 2 additions, 2 deletionssrc/app/core/tasks/models/task-object.model.ts
- src/app/core/tasks/task-response-parsing.service.ts 0 additions, 2 deletionssrc/app/core/tasks/task-response-parsing.service.ts
- src/app/shared/mydspace-actions/claimed-task/claimed-task-actions.component.spec.ts 2 additions, 2 deletions...tions/claimed-task/claimed-task-actions.component.spec.ts
- src/app/shared/mydspace-actions/claimed-task/claimed-task-actions.component.ts 6 additions, 6 deletions...ce-actions/claimed-task/claimed-task-actions.component.ts
- src/app/shared/mydspace-actions/mydspace-actions-service.factory.ts 4 additions, 4 deletions...ared/mydspace-actions/mydspace-actions-service.factory.ts
- src/app/shared/mydspace-actions/pool-task/pool-task-actions.component.spec.ts 2 additions, 2 deletions...ace-actions/pool-task/pool-task-actions.component.spec.ts
- src/app/shared/mydspace-actions/pool-task/pool-task-actions.component.ts 6 additions, 6 deletions...mydspace-actions/pool-task/pool-task-actions.component.ts
- src/app/shared/mydspace-actions/workflowitem/workflowitem-actions.component.spec.ts 5 additions, 5 deletions...tions/workflowitem/workflowitem-actions.component.spec.ts
- src/app/shared/mydspace-actions/workflowitem/workflowitem-actions.component.ts 9 additions, 9 deletions...ce-actions/workflowitem/workflowitem-actions.component.ts
- src/app/shared/mydspace-actions/workspaceitem/workspaceitem-actions.component.spec.ts 3 additions, 3 deletions...ons/workspaceitem/workspaceitem-actions.component.spec.ts
- src/app/shared/mydspace-actions/workspaceitem/workspaceitem-actions.component.ts 7 additions, 7 deletions...-actions/workspaceitem/workspaceitem-actions.component.ts
Please register or sign in to comment