Kristof De Langhe
|
904228127e
|
Merge remote-tracking branch 'atmire/clean-relationships-in-submission' into w2p-67478_Search-external-sources-in-submission
Conflicts:
src/app/+item-page/simple/related-items/related-items-component.ts
src/app/+search-page/configuration-search-page.component.ts
src/app/+search-page/search-page.module.ts
src/app/+search-page/search-tracker.component.ts
src/app/+search-page/search.component.ts
src/app/app.reducer.ts
src/app/core/data/data.service.ts
src/app/core/data/relationship.service.ts
src/app/core/services/route.service.ts
src/app/core/utilities/equatable.ts
src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component.ts
src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/search-tab/dynamic-lookup-relation-search-tab.component.ts
src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/selection-tab/dynamic-lookup-relation-selection-tab.component.ts
src/app/shared/form/builder/models/relationship-options.model.ts
|
2019-12-19 11:55:28 +01:00 |
|