Commit Graph

13 Commits

Author SHA1 Message Date
Kristof De Langhe
e13801ce81 Merge branch 'master' into w2p-66156_Display-of-relations
Conflicts:
	src/app/+item-page/item-page.module.ts
	src/app/+search-page/filtered-search-page.component.spec.ts
	src/app/+search-page/filtered-search-page.component.ts
	src/app/+search-page/search-page.module.ts
2019-12-05 16:23:33 +01:00
Kristof De Langhe
1b978124d1 66156: Removal of redundant fields, message update and aciveTab as observable 2019-11-27 18:01:31 +01:00
Kristof De Langhe
757b9f9dcd 66156: Persons and Projects search tabs on OrgUnit pages + mantis fix 2019-11-25 14:18:21 +01:00
Art Lowel
29c9682508 Fix variable name 2019-11-22 18:14:36 +01:00
Kristof De Langhe
87d468f9b9 66156: Hide tabbox on single tab, merged filtered- and configuration-search-page into one component and added configuration option to tabs 2019-11-19 14:42:58 +01:00
Kristof De Langhe
4c8f9f82a4 Merge branch 'master' into w2p-66156_Display-of-relations
Conflicts:
	resources/i18n/en.json5
	src/app/entity-groups/journal-entities/item-pages/journal/journal.component.html
	src/app/entity-groups/research-entities/item-pages/person/person.component.html
	themes/mantis/app/entity-groups/journal-entities/item-pages/journal/journal.component.html
	themes/mantis/app/entity-groups/research-entities/item-pages/person/person.component.html
2019-11-15 15:39:45 +01:00
Kristof De Langhe
ac58297cbf 66156: Tabbed related entities search 2019-11-13 17:23:28 +01:00
lotte
40d740640d fixes after merge 2019-11-12 14:36:29 +01:00
lotte
0cdafacf22 Merge branch 'master' into w2p-65195_dynamic-component-refactoring 2019-11-12 13:37:37 +01:00
lotte
7ca88021c9 added tests, aot fixes, lint fixes 2019-10-15 15:58:40 +02:00
Kristof De Langhe
6ffd791f12 64574: Further mantis template fixes 2019-09-06 11:35:20 +02:00
Kristof De Langhe
adcefbae17 64574: Update mantis item pages with new template 2019-09-05 17:34:13 +02:00
Kristof De Langhe
737792a1df 62741: Moved entity mantis files to correct location 2019-08-14 15:05:25 +02:00