Merge branch 'w2p-67478_Search-external-sources-in-submission' into...
Merge branch 'w2p-67478_Search-external-sources-in-submission' into w2p-67611_Convert-external-source-to-entity Conflicts: src/app/entity-groups/research-entities/submission/item-list-elements/external-source-entry/external-source-entry-list-submission-element.component.html 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/external-source-tab/dynamic-lookup-relation-external-source-tab.component.ts
No related branches found
No related tags found
Showing
- config/environment.default.js 4 additions, 5 deletionsconfig/environment.default.js
- resources/i18n/en.json5 10 additions, 2 deletionsresources/i18n/en.json5
- src/app/+item-page/item-page.module.ts 3 additions, 1 deletionsrc/app/+item-page/item-page.module.ts
- src/app/+item-page/simple/abstract-incremental-list/abstract-incremental-list.component.ts 73 additions, 0 deletions...t-incremental-list/abstract-incremental-list.component.ts
- src/app/+item-page/simple/metadata-representation-list/metadata-representation-list.component.html 19 additions, 10 deletions...entation-list/metadata-representation-list.component.html
- src/app/+item-page/simple/metadata-representation-list/metadata-representation-list.component.spec.ts 15 additions, 17 deletions...ation-list/metadata-representation-list.component.spec.ts
- src/app/+item-page/simple/metadata-representation-list/metadata-representation-list.component.ts 15 additions, 44 deletions...esentation-list/metadata-representation-list.component.ts
- src/app/+item-page/simple/related-items/related-items-component.ts 18 additions, 59 deletions...item-page/simple/related-items/related-items-component.ts
- src/app/+item-page/simple/related-items/related-items.component.html 19 additions, 10 deletions...em-page/simple/related-items/related-items.component.html
- src/app/+item-page/simple/related-items/related-items.component.spec.ts 19 additions, 15 deletions...page/simple/related-items/related-items.component.spec.ts
- src/app/+search-page/configuration-search-page.component.ts 4 additions, 2 deletionssrc/app/+search-page/configuration-search-page.component.ts
- src/app/+search-page/search-page-routing.module.ts 0 additions, 1 deletionsrc/app/+search-page/search-page-routing.module.ts
- src/app/+search-page/search-tracker.component.ts 12 additions, 10 deletionssrc/app/+search-page/search-tracker.component.ts
- src/app/+search-page/search.component.html 4 additions, 0 deletionssrc/app/+search-page/search.component.html
- src/app/+search-page/search.component.ts 7 additions, 4 deletionssrc/app/+search-page/search.component.ts
- src/app/app.effects.ts 1 addition, 1 deletionsrc/app/app.effects.ts
- src/app/app.module.ts 1 addition, 1 deletionsrc/app/app.module.ts
- src/app/app.reducer.ts 1 addition, 1 deletionsrc/app/app.reducer.ts
- src/app/core/cache/models/normalized-external-source-entry.model.ts 3 additions, 0 deletions...re/cache/models/normalized-external-source-entry.model.ts
- src/app/core/cache/models/normalized-external-source.model.ts 3 additions, 0 deletions...app/core/cache/models/normalized-external-source.model.ts
Loading
Please register or sign in to comment