Commit Graph

37 Commits

Author SHA1 Message Date
Kristof De Langhe
9766a65c3a Merge branch 'master' into w2p-61493_Configurable-entities-master-merge
Conflicts:
	src/app/+item-page/item-page.module.ts
	src/app/+search-page/search-filters/search-filter/search-filter.service.ts
	src/app/+search-page/search-page.component.ts
	src/app/+search-page/search-page.module.ts
	src/app/core/shared/dspace-object.model.ts
	src/app/core/shared/item.model.ts
	src/app/core/shared/metadata.models.ts
	src/app/core/shared/resource-type.ts
	src/app/shared/services/route.service.spec.ts
	src/app/shared/services/route.service.ts
	src/app/thumbnail/thumbnail.component.html
2019-04-01 15:52:53 +02:00
Art Lowel
8996716d71 Merge remote-tracking branch 'upstream/master' into configurable_entities 2019-03-29 13:23:05 +01:00
lotte
23a1e6bce5 Merge branch 'master' into performance-optimizations
Conflicts:
	src/app/core/data/request.service.spec.ts
	src/app/core/data/request.service.ts
2019-03-21 16:00:08 +01:00
lotte
fc73fc1d3e optimizations links in facets 2019-03-20 16:57:55 +01:00
lotte
f1686f3de1 applied feedback 2019-03-11 12:50:39 +01:00
lotte
9abbfa955e refactored, started tests 2019-03-07 14:25:48 +01:00
lotte
61a5620efe refactored lookup 2019-03-07 14:24:24 +01:00
Art Lowel
72fb18d92f Add virtual metadata fields for journals 2019-01-08 13:12:12 +01:00
Kristof De Langhe
4af12c2186 55647: Related publications on person pages 2018-09-19 14:26:15 +02:00
Kristof De Langhe
addea8bf0e Merge branch 'master' into entities-master
Conflicts:
	src/app/+item-page/full/full-item-page.component.ts
	src/app/+item-page/simple/item-page.component.html
	src/app/+item-page/simple/item-page.component.ts
	src/app/+search-page/search-filters/search-filter/search-filter.service.spec.ts
	src/app/+search-page/search-filters/search-filter/search-filter.service.ts
	src/app/+search-page/search-options.model.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-results/search-results.component.ts
	src/app/+search-page/search-service/search.service.spec.ts
	src/app/+search-page/search-service/search.service.ts
	src/app/+search-page/search-settings/search-settings.component.ts
	src/app/core/cache/response-cache.models.ts
	src/app/core/core.module.ts
	src/app/core/data/search-response-parsing.service.ts
	src/app/core/shared/operators.ts
	src/app/core/shared/resource-type.ts
	src/app/shared/object-collection/object-collection.component.spec.ts
	src/app/shared/object-collection/object-collection.component.ts
	src/app/shared/object-collection/shared/dso-element-decorator.spec.ts
	src/app/shared/object-collection/shared/dso-element-decorator.ts
	src/app/shared/object-grid/collection-grid-element/collection-grid-element.component.ts
	src/app/shared/object-grid/community-grid-element/community-grid-element.component.ts
	src/app/shared/object-grid/item-grid-element/item-grid-element.component.ts
	src/app/shared/object-grid/search-result-grid-element/collection-search-result/collection-search-result-grid-element.component.ts
	src/app/shared/object-grid/search-result-grid-element/community-search-result/community-search-result-grid-element.component.ts
	src/app/shared/object-grid/search-result-grid-element/item-search-result/item-search-result-grid-element.component.ts
	src/app/shared/object-grid/wrapper-grid-element/wrapper-grid-element.component.ts
	src/app/shared/object-list/collection-list-element/collection-list-element.component.ts
	src/app/shared/object-list/community-list-element/community-list-element.component.ts
	src/app/shared/object-list/item-list-element/item-list-element.component.html
	src/app/shared/object-list/item-list-element/item-list-element.component.ts
	src/app/shared/object-list/search-result-list-element/collection-search-result/collection-search-result-list-element.component.ts
	src/app/shared/object-list/search-result-list-element/community-search-result/community-search-result-list-element.component.ts
	src/app/shared/object-list/search-result-list-element/item-search-result/item-search-result-list-element.component.html
	src/app/shared/object-list/search-result-list-element/item-search-result/item-search-result-list-element.component.ts
	src/app/shared/object-list/wrapper-list-element/wrapper-list-element.component.ts
	src/app/shared/services/route.service.ts
	src/app/shared/shared.module.ts
	src/app/shared/testing/hal-endpoint-service-stub.ts
	src/app/shared/testing/search-service-stub.ts
	src/app/shared/view-mode-switch/view-mode-switch.component.spec.ts
	src/app/shared/view-mode-switch/view-mode-switch.component.ts
	src/app/thumbnail/thumbnail.component.html
2018-09-17 14:10:46 +02:00
lotte
9ebd25709d fixed configuration 2018-07-30 16:08:53 +02:00
lotte
3fa70523ea Fixed issue #1 and some other fixes 2018-07-30 10:19:45 +02:00
lotte
2e04b542b8 Merge branch 'w2p-49440_Date-widget' into w2p-49440_date-widget-for-search-features
Conflicts:
	package.json
	src/app/+search-page/search-filters/search-filter/search-facet-filter/search-facet-filter.component.ts
	src/app/+search-page/search-filters/search-filter/search-filter.component.html
	src/app/+search-page/search-page.component.ts
	src/app/+search-page/search-page.module.ts
	src/app/shared/shared.module.ts
2018-07-17 10:09:07 +02:00
lotte
cef2ea827b finished entity search endpoints 2018-07-06 13:59:02 +02:00
Kristof De Langhe
8931337d2d 54053: intermediate commit 2018-07-04 15:56:29 +02:00
lotte
1231d3ebad 53029: almost finished filtered discovery pages 2018-07-03 15:26:01 +02:00
Lotte Hofstede
95060ee573 almost finished date widget 2018-05-15 11:03:18 +02:00
Lotte Hofstede
307d9bf854 intermediate commit 2018-05-02 15:31:17 +02:00
Lotte Hofstede
c92d4cf951 Merge branch 'search-backend' into w2p-49440_Date-widget 2018-04-30 13:12:35 +02:00
Art Lowel
994c089925 fixed a few sorting, rpp and view persistence issues with grid view 2018-04-26 10:57:12 +02:00
Lotte Hofstede
fb8172af10 49440: fixed naming bug 2018-04-16 09:28:37 +02:00
Lotte Hofstede
e7054af1d5 49440: date widget with decorator 2018-04-16 09:28:36 +02:00
Jonas Van Goolen
520b7f3e12 #150 Moved list,grid and object-collection to shared package 2017-12-01 09:59:35 +01:00
Jonas Van Goolen
a704157c1f #150 Initial grid/list view implementation 2017-12-01 09:59:35 +01:00
Lotte Hofstede
c062fdf396 45621: adding more tests 2017-11-17 17:05:13 +01:00
Jonas Van Goolen
152c79278a 195 Pre-test commit 2017-11-13 14:15:50 +01:00
Lotte Hofstede
91f4ee6ed1 45621: ngrx filter facets 2017-11-08 16:04:20 +01:00
Lotte Hofstede
532741d073 45621: filter components for sidebar 2017-11-06 14:27:48 +01:00
Lotte Hofstede
e14e8fac37 45477: sidebar filter section 2017-11-03 14:04:36 +01:00
Lotte Hofstede
2b41ce4006 44988: sidebar component finished with redux and tests 2017-11-02 13:34:41 +01:00
Lotte Hofstede
7daf6a2923 44988: added tests 2017-10-31 15:17:42 +01:00
Lotte Hofstede
7d5dad94a1 44988: added reducer, angular animation, tests... 2017-10-30 17:04:52 +01:00
Lotte Hofstede
ce31ff1f21 44988: search sidebar finished 2017-10-20 17:14:55 +02:00
Lotte Hofstede
90186b867c 44988: started search page sidebar 2017-10-06 17:09:18 +02:00
Lotte Hofstede
f5a291e8e0 44835: added facet/filter methods to search service 2017-10-06 12:01:50 +02:00
Lotte Hofstede
ad59cb3276 44878: more unit tests 2017-10-03 15:49:26 +02:00
Lotte Hofstede
da881f7a30 Fixed and updated merge related issues for simple search 2017-10-03 11:05:42 +02:00