Merge remote-tracking branch 'dspace/master' into w2p-62589_Item-mapper-update
Conflicts: src/app/core/data/collection-data.service.ts
Showing
- src/app/+login-page/login-page.component.html 2 additions, 1 deletionsrc/app/+login-page/login-page.component.html
- src/app/+search-page/search-page.module.ts 0 additions, 1 deletionsrc/app/+search-page/search-page.module.ts
- src/app/core/auth/auth.service.spec.ts 40 additions, 4 deletionssrc/app/core/auth/auth.service.spec.ts
- src/app/core/auth/auth.service.ts 32 additions, 8 deletionssrc/app/core/auth/auth.service.ts
- src/app/core/auth/server-auth.service.ts 11 additions, 6 deletionssrc/app/core/auth/server-auth.service.ts
- src/app/core/data/collection-data.service.ts 31 additions, 0 deletionssrc/app/core/data/collection-data.service.ts
- src/app/core/data/request.service.ts 8 additions, 7 deletionssrc/app/core/data/request.service.ts
- src/app/core/submission/submission-response-parsing.service.ts 4 additions, 1 deletion...pp/core/submission/submission-response-parsing.service.ts
- src/app/shared/auth-nav-menu/auth-nav-menu.component.html 2 additions, 1 deletionsrc/app/shared/auth-nav-menu/auth-nav-menu.component.html
- src/app/shared/chips/models/chips-item.model.ts 7 additions, 1 deletionsrc/app/shared/chips/models/chips-item.model.ts
- src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.html 2 additions, 1 deletion...-form-ui/ds-dynamic-form-control-container.component.html
- src/app/shared/form/builder/ds-dynamic-form-ui/models/ds-dynamic-concat.model.ts 7 additions, 0 deletions...lder/ds-dynamic-form-ui/models/ds-dynamic-concat.model.ts
- src/app/shared/form/builder/ds-dynamic-form-ui/models/ds-dynamic-input.model.ts 2 additions, 5 deletions...ilder/ds-dynamic-form-ui/models/ds-dynamic-input.model.ts
- src/app/shared/form/builder/ds-dynamic-form-ui/models/ds-dynamic-qualdrop.model.ts 6 additions, 2 deletions...er/ds-dynamic-form-ui/models/ds-dynamic-qualdrop.model.ts
- src/app/shared/form/builder/ds-dynamic-form-ui/models/lookup/dynamic-lookup.component.html 4 additions, 6 deletions...namic-form-ui/models/lookup/dynamic-lookup.component.html
- src/app/shared/form/builder/ds-dynamic-form-ui/models/lookup/dynamic-lookup.component.spec.ts 42 additions, 2 deletions...ic-form-ui/models/lookup/dynamic-lookup.component.spec.ts
- src/app/shared/form/builder/ds-dynamic-form-ui/models/lookup/dynamic-lookup.component.ts 15 additions, 10 deletions...dynamic-form-ui/models/lookup/dynamic-lookup.component.ts
- src/app/shared/form/builder/ds-dynamic-form-ui/models/relation-group/dynamic-relation-group.components.ts 7 additions, 5 deletions...odels/relation-group/dynamic-relation-group.components.ts
- src/app/shared/form/builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.component.ts 8 additions, 2 deletions...ollable-dropdown/dynamic-scrollable-dropdown.component.ts
- src/app/shared/form/builder/ds-dynamic-form-ui/models/typeahead/dynamic-typeahead.component.html 2 additions, 1 deletion...form-ui/models/typeahead/dynamic-typeahead.component.html
Please register or sign in to comment