Commit Graph

4100 Commits

Author SHA1 Message Date
Kristof De Langhe
cf15fbcca2 68346: Drag-handle in front of row 2020-01-24 15:08:16 +01:00
Kristof De Langhe
14ea71f536 68346: Test fixes 2020-01-24 14:34:11 +01:00
Kristof De Langhe
b2ef5ee2fa Merge branch 'master' into w2p-68346_Bundles-in-edit-item-Updates
Conflicts:
	package.json
	resources/i18n/en.json5
	src/app/+item-page/item-page.module.ts
	src/app/core/core.module.ts
	src/app/core/data/bundle-data.service.ts
	src/app/core/data/data.service.spec.ts
	src/app/core/data/data.service.ts
	src/app/core/data/item-data.service.ts
	src/app/core/data/object-updates/object-updates.service.ts
	src/app/core/shared/hal-endpoint.service.ts
	src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.ts
	src/app/shared/mocks/mock-request.service.ts
	src/app/shared/shared.module.ts
	src/app/shared/trackable/abstract-trackable.component.ts
	yarn.lock
2020-01-24 14:21:20 +01:00
Kristof De Langhe
53355d1fc4 65272: Test fixes 2020-01-23 17:49:41 +01:00
Kristof De Langhe
d98ce7c97e 65272: Logo spacing layout fix 2020-01-23 17:33:25 +01:00
Kristof De Langhe
98937bd240 65272: Missing JSDocs + id and uuid serializing fix for NormalizedTemplateItem 2020-01-23 17:24:46 +01:00
Tim Donohue
1472bd7df9 Merge pull request #506 from atmire/Collection-content-source-tab
Collection content source tab
2020-01-23 10:18:23 -06:00
Kristof De Langhe
a714958c04 65272: Object update PUT to PATCH requests + option to add ignored metadata fields to update 2020-01-23 16:49:31 +01:00
Kristof De Langhe
4ae5ee21b1 65272: Edit template item - Empty metadata alert + alignment fixes 2020-01-23 15:59:47 +01:00
Tim Donohue
31aff062eb Merge pull request #540 from atmire/Convert-external-source-to-entity
Convert external source to entity
2020-01-23 08:35:02 -06:00
Kristof De Langhe
24fc3e6c76 65272: TemplateItem object and normalized version 2020-01-23 15:14:25 +01:00
benbosman
e6ffec0129 Merge pull request #564 from atmire/mydspace-display-entity-type
Display the entity type in MyDSpace
2020-01-23 14:44:41 +01:00
Kristof De Langhe
4f048f59f7 Merge branch 'master' into w2p-65272_Edit-collection-item-template
Conflicts:
	resources/i18n/en.json5
	src/app/+collection-page/collection-page.module.ts
	src/app/+collection-page/edit-collection-page/collection-metadata/collection-metadata.component.html
	src/app/+collection-page/edit-collection-page/collection-metadata/collection-metadata.component.spec.ts
	src/app/+collection-page/edit-collection-page/collection-metadata/collection-metadata.component.ts
	src/app/core/core.module.ts
	src/app/core/data/data.service.ts
	src/app/shared/shared.module.ts
2020-01-23 14:30:44 +01:00
Giuseppe Digilio
68d3144bec Merge remote-tracking branch 'remotes/origin/master' into shibboleth
# Conflicts:
#	src/app/app.module.ts
2020-01-23 14:10:58 +01:00
Giuseppe Digilio
b768043bcc Add withCredentials param to ServerAuthService's checkAuthenticationCookie method 2020-01-23 09:57:49 +01:00
Giuseppe Digilio
b19aa64052 Add withCredentials param to request options instead of using http interceptor 2020-01-22 17:06:54 +01:00
Tim Donohue
fe3eea6079 Merge pull request #559 from atmire/header-search-box
Header search box
2020-01-21 11:17:30 -06:00
Tim Donohue
cc27ad5965 Merge pull request #566 from atmire/submit-this-collection
Submit this collection
2020-01-21 11:16:41 -06:00
Tim Donohue
3bc903f812 Merge pull request #567 from atmire/w2p-68276_Tabbed-display-fixedFilterQuery-fix
Fixed configuration-search-page fixedFilterQuery parameter
2020-01-21 10:36:12 -06:00
Kristof De Langhe
a403732d45 68276: Fixed configuration-search-page fixedFilterQuery parameter 2020-01-20 16:52:53 +01:00
Giuseppe Digilio
c8d516598a Fixed failed test 2020-01-17 15:15:32 +01:00
Giuseppe Digilio
2a4f8aaad8 Merge remote-tracking branch 'remotes/origin/master' into shibboleth 2020-01-17 14:39:40 +01:00
Art Lowel
f531bdd976 Merge pull request #563 from 4Science/fix_store_selectors
Fix history and bitstreamFormats store selector after moved in CoreState
2020-01-17 13:59:24 +01:00
Giuseppe Digilio
ddb787277b Fix failed test 2020-01-17 13:08:26 +01:00
Giuseppe Digilio
eb866d85ef Fixed merge 2020-01-17 12:12:03 +01:00
Giuseppe Digilio
29b2e89625 Merge remote-tracking branch 'remotes/origin/master' into shibboleth
# Conflicts:
#	src/app/core/auth/auth.interceptor.ts
#	src/app/shared/auth-nav-menu/auth-nav-menu.component.html
#	src/app/shared/shared.module.ts
2020-01-17 12:11:46 +01:00
Giuseppe Digilio
1e99071907 Added auth action that allows to retrieve token once check on authentication cooke is successful 2020-01-17 11:51:55 +01:00
Giuseppe Digilio
0eac9c6369 check Authentication Token both on SSR and CSR 2020-01-17 11:50:07 +01:00
Giuseppe Digilio
afe70bc546 added refresh token when check on authorization cookie is successful 2020-01-17 11:09:41 +01:00
Giuseppe Digilio
49e59c44e1 fixed test 2020-01-17 11:08:09 +01:00
Kristof De Langhe
7b3a2e9dc8 Merge branch 'master' into w2p-67611_Convert-external-source-to-entity
Conflicts:
	src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.ts
	src/app/shared/shared.module.ts
2020-01-16 17:54:12 +01:00
Giuseppe Digilio
57b007ffe2 fix referer url used for X-Requested-With header 2020-01-16 17:43:10 +01:00
Giuseppe Digilio
f630898eab Merge remote-tracking branch 'remotes/origin/master' into fix_store_selectors 2020-01-16 16:14:19 +01:00
Tim Donohue
1ca1fe746a Merge pull request #534 from atmire/reorder-name-variants
Reordering related entities in the submission
2020-01-16 08:49:29 -06:00
Giuseppe Digilio
4f8f4de241 Added X-Requested-With header when retrieving auth methods on SSR 2020-01-16 15:17:59 +01:00
Ben Bosman
323ac03e54 Merge remote-tracking branch 'community/master' into mydspace-display-entity-type 2020-01-16 14:50:58 +01:00
Kristof De Langhe
3fd4ecbfc4 67611: ExpressionChangedAfterItHasBeenCheckedError fix 2020-01-16 14:47:37 +01:00
Giuseppe Digilio
6560d1d112 Use status request to check an existing token and to retrieve auth methods available 2020-01-16 14:36:20 +01:00
Ben Bosman
17989667aa Merge remote-tracking branch 'community/master' into submission-upload.required 2020-01-16 14:32:43 +01:00
Ben Bosman
cc1cc08d8e Merge remote-tracking branch 'community/master' into generic-uri-metadata 2020-01-16 14:16:25 +01:00
Kristof De Langhe
010da52476 Merge branch 'master' into w2p-67611_Convert-external-source-to-entity 2020-01-16 13:59:38 +01:00
Ben Bosman
4a2e7741b7 Merge remote-tracking branch 'community/master' into submit-this-collection
# Conflicts:
#	src/app/submission/submission.service.ts
2020-01-16 12:53:59 +01:00
Ben Bosman
6010316d91 Merge remote-tracking branch 'community/master' into submit-this-collection 2020-01-16 12:51:46 +01:00
lotte
4c23d01567 Merge branch 'master' into reorder-name-variants 2020-01-16 09:30:31 +01:00
Tim Donohue
16831decca Merge pull request #551 from 4Science/pagination-on-community-page
Pagination on community page
2020-01-15 11:48:32 -06:00
Tim Donohue
fd3eea99b8 Merge pull request #539 from atmire/Search-external-sources
Lookup relations - Search external sources
2020-01-15 11:22:40 -06:00
Kristof De Langhe
32a7dcd787 Merge branch 'master' into w2p-64503_Edit-collection-Content-Source-2 2020-01-15 17:01:39 +01:00
Tim Donohue
cd39d47214 Merge pull request #562 from atmire/travis-dist-upgrade
Upgrade Travis image to 'bionic'
2020-01-15 09:55:36 -06:00
Giuseppe Digilio
4e8ec5f4a2 Fix history and bitstreamFormats store selector after moved in CoreState 2020-01-15 12:14:53 +01:00
Art Lowel
94a71b69d1 remove chrome source, doesn't work anyway and doesn't seem to be needed. Remove chromium to try to solve the issue where travis can't find chrome 2020-01-15 11:56:04 +01:00