Commit Graph

7213 Commits

Author SHA1 Message Date
Art Lowel
bfb6b1f262 Merge pull request #291 from tdonohue/bootstrap_update
Update version of Bootstrap per CVE-2018-14041
2018-09-24 10:44:10 +02:00
Tim Donohue
9029231396 Update version of Bootstrap per CVE-2018-14041 2018-09-21 12:02:06 -05:00
lotte
7db30e8809 fixed tslint error 2018-09-20 15:37:54 +02:00
lotte
a2bcdfbea9 disabled reloads 2018-09-20 15:24:16 +02:00
Kristof De Langhe
278a664063 Merge branch 'w2p-55558_Entities-full-item-pages' into entities-master 2018-09-20 14:29:39 +02:00
lotte
bae69aef97 Small fix 2018-09-19 15:34:14 +02:00
lotte
c6f55e424b Finished patch support 2018-09-19 15:32:14 +02:00
Kristof De Langhe
4af12c2186 55647: Related publications on person pages 2018-09-19 14:26:15 +02:00
lotte
e959542e2d implemented applying of a patch 2018-09-19 13:10:23 +02:00
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
Kristof De Langhe
e011ec207c 54472: Adjustment of tests with new code + removal of fdescribe 2018-09-17 10:46:47 +02:00
Kristof De Langhe
a842d70939 Merge branch 'w2p-54472_Create-community-and-collection-pages' of https://git.atmire.com/contributions/dspace-angular into w2p-54472_Create-community-and-collection-pages 2018-09-17 10:33:27 +02:00
Kristof De Langhe
30284ea78f 54472: DataService create method tests + buildFormData test pt2 2018-09-17 10:33:20 +02:00
lotte
97669d0c34 upgrade ngrx to fix store devtools bug 2018-09-17 10:20:12 +02:00
lotte
9da839e318 refactoring 2018-09-17 08:47:30 +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
Kristof De Langhe
6aee6e668c 54472: DataService create method tests pt1 2018-09-14 16:27:41 +02:00
Giuseppe
6da159b763 Changed EpersonService to extend DataService 2018-09-14 15:01:32 +02:00
Kristof De Langhe
f9203a5cb6 54472: Tests + caching fix attempts intermediate commit 2018-09-14 12:02:20 +02:00
lotte
2b1d4cd12a Fixed logout issue 2018-09-14 11:42:55 +02:00
lotte
17ad62c172 implementation of server synchronization 2018-09-14 09:26:30 +02:00
Giuseppe
49f37e8ad7 Added more tests 2018-09-13 15:00:05 +02:00
Kristof De Langhe
6c8e498891 54472: Small changes 2018-09-13 14:19:02 +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
6973c66d79 54472: Intermediate commit 2018-09-12 10:49:31 +02:00
Kristof De Langhe
0197b4a9dc 54472: Passing parent as parameter and fixed duplicate collection created 2018-09-12 08:11:33 +02:00
Kristof De Langhe
758127e409 54472: Working post request with form-data (contains test code) 2018-09-11 16:23:57 +02:00
lotte
acb5f5197d patching changes 2018-09-11 16:05:21 +02:00
Kristof De Langhe
ad9852f194 54472: form-data intermediate commit 2018-09-11 14:50:23 +02:00
Kristof De Langhe
2740f69025 54472: Removed old error messages 2018-09-11 09:22:45 +02:00
Kristof De Langhe
dfb4a3bd9c 54472: Notification errors 2018-09-11 09:21:35 +02:00
Kristof De Langhe
12058cb4db 54472: Remove console logs 2018-09-11 08:31:41 +02:00
Kristof De Langhe
79afa38a67 54472: Fixed duplicate requests 2018-09-11 08:12:16 +02:00
Giuseppe
2786dbd8d8 Refactoring based on review 2018-09-10 16:15:27 +02:00
Kristof De Langhe
7f8fa9c1b7 54472: GetRequestByUUID 2018-09-10 15:20:16 +02:00
Kristof De Langhe
7b3e82c5af 54472: Removed SingleDsoSuccessResponse and replaced by GenericSuccessResponse 2018-09-10 13:48:34 +02:00
Kristof De Langhe
2f139c5c94 54472: Create request, response, responseparsingservice and data-service changes 2018-09-10 12:03:00 +02:00
Kristof De Langhe
87f5c3b8a8 Merge branch 'Authentication-issue-fix' into w2p-54472_Create-community-and-collection-pages 2018-09-10 10:33:39 +02:00
Kristof De Langhe
ea075fbd8f Correct parsing of AuthStatus and small changes 2018-09-10 08:44:56 +02:00
Kristof De Langhe
7a2e0ae851 54472: Post-merge error fixes 2018-09-07 14:32:43 +02:00
Kristof De Langhe
da3627e614 Merge branch 'master' into w2p-54472_Create-community-and-collection-pages
Conflicts:
	src/app/+collection-page/collection-page-routing.module.ts
	src/app/+collection-page/collection-page.module.ts
	src/app/+community-page/community-page-routing.module.ts
	src/app/core/data/community-data.service.ts
	src/app/core/data/dso-response-parsing.service.ts
2018-09-07 14:16:21 +02:00