Kristof De Langhe
|
b51218ad5f
|
Merge branch 'master' into w2p-67478_Search-external-sources-in-submission
Conflicts:
src/app/+collection-page/collection-page.module.ts
src/app/+item-page/simple/related-entities/related-entities-search/related-entities-search.component.html
src/app/+item-page/simple/related-items/related-items-component.ts
src/app/+search-page/configuration-search-page.component.spec.ts
src/app/+search-page/configuration-search-page.component.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.component.html
src/app/+search-page/search-page.component.ts
src/app/+search-page/search-page.module.ts
src/app/+search-page/search.component.spec.ts
src/app/app.reducer.ts
src/app/core/data/data.service.spec.ts
src/app/core/data/data.service.ts
src/app/core/data/relationship.service.ts
src/app/core/shared/search/search-configuration.service.ts
src/app/core/shared/search/search.service.ts
|
2019-12-06 11:56:28 +01:00 |
|
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 |
|
lotte
|
168e74d1fa
|
Merge branch 'master' into clean-relationships-in-submission
|
2019-11-25 11:18:57 +01:00 |
|
Art Lowel
|
29c9682508
|
Fix variable name
|
2019-11-22 18:14:36 +01:00 |
|
lotte
|
3487231af1
|
fixed name variants in previews
|
2019-11-20 15:59:23 +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
|
99517c084c
|
fixed issues after merge
|
2019-10-17 13:57:10 +02:00 |
|
lotte
|
f79e210959
|
Merge branch 'w2p-65195_dynamic-component-refactoring' into clean-relationships-in-submission
|
2019-10-17 12:49:22 +02:00 |
|
lotte
|
7ca88021c9
|
added tests, aot fixes, lint fixes
|
2019-10-15 15:58:40 +02:00 |
|
lotte
|
a1f144aa0b
|
replaced type input by getRenderType method
|
2019-10-04 16:06:59 +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
|
e6a051e9c6
|
Merge branch 'master' into w2p-64574_Item-page-entities
|
2019-09-05 15:43:59 +02:00 |
|
Kristof De Langhe
|
713c40451f
|
64574: Mantis publication template fix
|
2019-08-28 11:32:04 +02:00 |
|
Kristof De Langhe
|
bd54d47037
|
64574: Further refactoring of item-component, mantis publication and JSDocs
|
2019-08-27 11:36:32 +02:00 |
|
Kristof De Langhe
|
737792a1df
|
62741: Moved entity mantis files to correct location
|
2019-08-14 15:05:25 +02:00 |
|
Art Lowel
|
743be6a2cd
|
add projectroot to sass includedPaths instead of using replace to fix the paths during build
|
2019-06-05 17:14:22 +02:00 |
|
Art Lowel
|
8bccdac99d
|
fix dev build
|
2019-06-03 17:22:55 +02:00 |
|
Art Lowel
|
d93173e8d2
|
add syncbuilddir step to aot build
|
2019-05-31 09:44:49 +02:00 |
|
Art Lowel
|
32e7b7a3b4
|
fix merge mistakes
|
2019-05-30 10:12:37 +02:00 |
|
Art Lowel
|
da4115f122
|
fix issues following rebase
|
2019-05-28 16:21:02 +02:00 |
|
Art Lowel
|
11d06e34b1
|
moved themes to separate folder
|
2019-05-28 14:20:21 +02:00 |
|