Commit Graph

1245 Commits

Author SHA1 Message Date
Kristof De Langhe
8e3e826a5f 55647: FixedFilter fixed 2018-09-19 09:36:33 +02:00
lotte
e96eeeaa83 fixed redirect after login 2018-09-18 16:29:55 +02:00
Kristof De Langhe
d8ce01b27a 55647: Intermediate FixedFilter fixes 2018-09-18 16:08:29 +02:00
Kristof De Langhe
66ae2fe224 55558: Full item page buttons on all entity type item-pages 2018-09-18 11:46:09 +02:00
Kristof De Langhe
363e1459cc 55558: RouteService tests fix 2018-09-18 11:22:41 +02:00
Kristof De Langhe
81d89401ad 55558: Test error fix 2018-09-18 10:31:41 +02:00
Kristof De Langhe
20520ea0e2 55558: Collection-page fix and search reponse parsing fix 2018-09-18 09:45:21 +02:00
Kristof De Langhe
de2499b1da 55558: Small conflict fixes - intermediate 2018-09-17 16:05:19 +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
97669d0c34 upgrade ngrx to fix store devtools bug 2018-09-17 10:20:12 +02:00
Tim Donohue
59baced783 Merge pull request #283 from atmire/browse-by-features
Issues 252,253: Browse by title and browse by metadata (author)
2018-09-14 14:01:27 -05:00
lotte
2b1d4cd12a Fixed logout issue 2018-09-14 11:42:55 +02:00
lotte
1f336f29fd small fixes for authentication 2018-09-12 16:11:04 +02:00
lotte
caf9194f36 Fixes for authentication (awaiting fixes in EPerson REST endpoint) 2018-09-12 11:38:08 +02:00
Kristof De Langhe
cb20a31379 Fixed Browse-By-Title sort direction 2018-09-07 12:05:22 +02:00
Kristof De Langhe
d7582edfa1 BrowseItemsResponseParsingService TypeDocs 2018-09-07 11:24:37 +02:00
Kristof De Langhe
15587a920a Merge branch 'master' into browse-by-features
Conflicts:
	src/app/core/shared/operators.ts
2018-09-07 11:15:01 +02:00
Tim Donohue
0455a16d03 Merge pull request #288 from atmire/resolvers-branch
Resolvers for item, collection and community home page
2018-09-06 11:52:56 -05:00
lotte
e62524e7d0 fixed typos and added TypeDocs 2018-08-30 12:53:57 +02:00
Kristof De Langhe
28d7a169fc removed browse-by pages empty test files 2018-08-30 10:05:09 +02:00
Kristof De Langhe
3a53595573 Merge branch 'browse-by-features' of https://github.com/atmire/dspace-angular into browse-by-features
Conflicts:
	src/app/core/data/data.service.spec.ts
2018-08-29 14:40:38 +02:00
Kristof De Langhe
4590264d5a Merge branch 'master' into browse-by-features
Conflicts:
	src/app/core/core.module.ts
	src/app/core/shared/operators.ts
	src/app/shared/object-grid/item-grid-element/item-grid-element.component.html
	src/app/shared/object-list/item-list-element/item-list-element.component.html
	src/app/shared/shared.module.ts
2018-08-29 14:24:45 +02:00
Kristof De Langhe
535034ec8e Added type docs 2018-08-29 12:46:20 +02:00
Tim Donohue
bf308c02c7 Merge pull request #280 from atmire/search-features
Search features
2018-08-27 12:39:22 -05:00
lotte
46daefd16e 55407: updated home page 2018-08-27 14:36:04 +02:00
lotte
9fbbf53661 undo REST server config 2018-08-23 16:00:46 +02:00
lotte
02110c66be Merge branch 'search-features' into resolvers-branch
Conflicts:
	src/app/core/shared/operators.ts
2018-08-23 15:53:02 +02:00
lotte
bf29b74c55 reverse rest endpoint to 4Science server 2018-08-23 15:39:22 +02:00
lotte
9a410d02d9 scope now uses DSO endpoint instead of PID 2018-08-23 15:38:10 +02:00
lotte
976302389f fixed collection page, added SearchFilter Model 2018-08-23 14:01:37 +02:00
lotte
f5fed28722 reworked items list on collection page 2018-08-22 16:30:28 +02:00
lotte
1ea0e0ecfc fix for tests 2018-08-22 10:08:01 +02:00
lotte
d9cd292ec1 Revert "added preloading guard for search results"
This reverts commit d9e70bd4da.
2018-08-22 09:26:31 +02:00
Ben Bosman
132d979598 Merge branch 'w2p-53029_filtered-discovery-pages-entities' into 'entities-or2018'
W2p 53029 filtered discovery pages entities

See merge request contributions/dspace-angular!3
2018-08-21 11:54:09 +00:00
lotte
8548aef2b0 test fixes for browse pages 2018-08-16 15:39:31 +02:00
lotte
a124e17782 Merge branch 'master' into browse-by-features
Conflicts:
	src/app/shared/object-grid/item-grid-element/item-grid-element.component.html
	src/app/shared/object-list/item-list-element/item-list-element.component.html
2018-08-16 14:48:58 +02:00
Kristof De Langhe
375742a000 count badges next to browse-by-metadata values 2018-08-10 13:34:44 +02:00
lotte
b7947b3b5b Merge branch 'search-features' into resolvers-branch 2018-08-10 11:59:53 +02:00
lotte
a0a9d43a03 changed test webpack config to remove warnings from tests 2018-08-10 11:07:31 +02:00
lotte
8c5366705d Merge branch 'master' into search-features
Conflicts:
	src/app/shared/object-list/search-result-list-element/item-search-result/item-search-result-list-element.component.html
2018-08-10 11:01:18 +02:00
Tim Donohue
5820e9ca81 Merge pull request #276 from atmire/grid-view-date-fix
Missing metadata list objects fix
2018-08-09 11:29:43 -05:00
Tim Donohue
5127c70979 Merge pull request #271 from atmire/embedded-objects-fixes
Embedded objects fixes
2018-08-09 11:25:03 -05:00
Tim Donohue
cbbfb2ea03 Merge pull request #282 from mohideen/WAFFLE-247
ISSUE-247:  Added startsWith param to getFindAllHref
2018-08-09 11:08:02 -05:00
lotte
1543be50ed Merge branch 'search-features' into resolvers-branch 2018-08-09 15:38:29 +02:00
lotte
86767e044f removed console log from test file 2018-08-09 13:46:26 +02:00
Kristof De Langhe
072507b293 improved coverage, type docs, removed startsWith option and general refactoring 2018-08-09 12:37:09 +02:00
lotte
87fecf98f9 Merge branch 'embedded-objects-fixes' into search-features 2018-08-09 12:10:08 +02:00
lotte
a4855ce9ea fixed some tests after merge 2018-08-09 11:50:42 +02:00
lotte
9d318e334b Merge branch 'master' into embedded-objects-fixes 2018-08-09 11:16:07 +02:00
lotte
87dcdac551 Added comments and some refactoring to new files 2018-08-09 11:15:58 +02:00