Commit Graph

3554 Commits

Author SHA1 Message Date
Yana De Pauw
67feaf3178 Merge branch 'master' into Bitstream-format-registries
Conflicts:
	resources/i18n/en.json
2019-08-14 11:24:45 +02:00
Yana De Pauw
295bbc5c40 flatten en.json 2019-08-14 11:22:36 +02:00
lotte
46614f4562 fixed issue with deleting items linked to relationship from the cache 2019-08-14 10:47:57 +02:00
Yana De Pauw
228a61e7ed Fix margin and amount of returned results 2019-08-13 17:44:26 +02:00
Art Lowel
930da6dde3 fix the labels on edit collection and community pages 2019-08-13 15:13:51 +02:00
Kristof De Langhe
fc21dc2019 64225: Search results reloading correctly after object deletion 2019-08-13 14:46:10 +02:00
Kristof De Langhe
e05f44d079 64225: Import fix 2019-08-13 12:30:47 +02:00
Kristof De Langhe
9afcd48f12 Merge branch 'master' into w2p-64225_Relations-delete-feedback-3
Conflicts:
	resources/i18n/en.json
	src/app/+item-page/edit-item-page/item-metadata/item-metadata.component.ts
	src/app/+search-page/search-service/search.service.ts
	src/app/core/core.module.ts
	src/app/core/shared/item.model.ts
2019-08-13 12:03:29 +02:00
Kristof De Langhe
26e25069ad 62589: PR Feedback 2019-08-12 16:41:56 +02:00
Yana De Pauw
1bf9693952 63838: Add typedoc comments and fix unused method 2019-08-12 15:53:10 +02:00
Yana De Pauw
7d4987da5c Merge branch 'master' into Move-item-component
Conflicts:
	resources/i18n/en.json
	src/app/+item-page/edit-item-page/item-metadata/edit-in-place-field/edit-in-place-field.component.spec.ts
	src/app/+item-page/edit-item-page/item-metadata/edit-in-place-field/edit-in-place-field.component.ts
2019-08-12 15:30:04 +02:00
Kristof De Langhe
2f0a5a4065 Merge branch 'master' into w2p-62589_Item-mapper-update
Conflicts:
	resources/i18n/en.json
	src/app/+search-page/search-service/search.service.ts
	src/app/core/core.module.ts
2019-08-12 15:23:43 +02:00
Kristof De Langhe
1be7f4e550 62741: Grid template field changes 2019-08-12 11:05:45 +02:00
Art Lowel
0ad505ba30 Merge pull request #442 from atmire/ConfigurationSearchPageComponent
Configuration search page component
2019-08-12 10:40:35 +02:00
Kristof De Langhe
2db0bf44f3 62741: PR Feedback changes 2019-08-12 10:22:49 +02:00
Tim Donohue
64b657507c Merge pull request #440 from atmire/Edit-current-item-query
Edit current item query
2019-08-09 22:48:09 +02:00
Tim Donohue
2fc6f9ea77 Merge pull request #457 from atmire/flatten-i18n-files
Flatten i18n files
2019-08-09 17:32:50 +02:00
lotte
7406ab5d47 62849: fixed delete/add relationships 2019-08-09 16:57:06 +02:00
lotte
827ffc2d79 fixed relationship service finished 2019-08-09 12:54:01 +02:00
Julius Gruber
e846aa801f authService startShibAuth() changed 2019-08-09 08:10:32 +02:00
Tim Donohue
3a7926eebe Merge pull request #454 from atmire/remove-e2e-from-ci
Remove e2e tests from the ci task
2019-08-08 22:14:04 +02:00
lotte
9907087dc3 62849: progress refactoring relationships 2019-08-08 16:02:58 +02:00
Yana De Pauw
ad863b62a7 63838: Fix feedback
Add a title to the move page
Disable submit button when no target is selected
Add operation in progress indicator
Use updated inputSuggestion to fix bug with value selection
2019-08-08 15:44:54 +02:00
Yana De Pauw
5c101d116a 63838: Refactor input suggestions to support DSpaceObjects as suggestions 2019-08-08 15:43:29 +02:00
lotte
719d0e791c intermediate commit to see whats wrong 2019-08-08 15:33:13 +02:00
Art Lowel
44aabe19d7 Merge branch 'master' into improve-i18n-files 2019-08-08 13:50:10 +02:00
Art Lowel
746567ab52 Merge branch 'master' into flatten-i18n-files 2019-08-08 13:49:13 +02:00
Julius Gruber
ad2b98e780 Merge branch 'master' into shibbolethDev4 2019-08-08 12:26:54 +02:00
Julius Gruber
8883793b06 Changed modifier of dynamicLoginMethods 2019-08-08 12:24:02 +02:00
Julius Gruber
aca60642a9 Removed dev log statemnet from lon-in-container 2019-08-08 11:30:31 +02:00
Julius Gruber
d3e93fed24 Removed hardcoded shibbolethUrl 2019-08-08 11:17:18 +02:00
Julius Gruber
3b6a20bf67 Added further dynamic authentication methods 2019-08-08 11:05:12 +02:00
Julius Gruber
bcc6daa39f Added mock components for dynamic login components 2019-08-08 09:29:00 +02:00
Julius Gruber
68968ca70a First functional prototype 2019-08-07 17:57:31 +02:00
lotte
b6e9c5b840 refactorting relationship service functions 2019-08-07 16:21:49 +02:00
Art Lowel
c81f589338 Update the Quick Start docs to include node 10 2019-08-06 17:41:22 +02:00
Yana De Pauw
c325e6d61b Merge branch 'master' into w2p-62769_Bitstream-format-registry
Conflicts:
	src/app/+admin/admin-registries/bitstream-formats/bitstream-formats.component.spec.ts
	src/app/core/core.module.ts
	src/app/core/registry/registry-bitstreamformats-response.model.ts
	src/app/core/registry/registry.service.ts
	src/app/core/shared/bitstream-format.model.ts
2019-08-06 17:22:03 +02:00
Art Lowel
d1ba6ab610 restore protractor timeouts to their default values 2019-08-06 17:19:49 +02:00
Art Lowel
588fc484a4 remove e2e tests from the ci task 2019-08-06 17:08:43 +02:00
lotte
848b700f84 refactoring relationship service code 2019-08-06 16:59:27 +02:00
Tim Donohue
5221615c42 Merge pull request #452 from atmire/security-fixes
Upgrade dependencies to prevent vulnerabilities
2019-08-06 15:37:17 +02:00
lotte
28b450498f 62849: intermediate commit, fixed issue with retrieving relationship type id 2019-08-06 15:30:44 +02:00
Art Lowel
004f4ce38c increase protractor timeouts again 2019-08-06 14:40:53 +02:00
Art Lowel
1fb38fe56d increase protractor allScriptsTimeout 2019-08-06 13:31:32 +02:00
Art Lowel
dc868853a8 remove node 9, add node 10 2019-08-06 11:17:17 +02:00
Art Lowel
73f67827f3 upgrade dependencies to prevent CVE-2019-10744, CVE-2019-13173, CVE-2018-14732, CVE-2018-16469, CVE-2018-1000620, CVE-2019-10744 and WS-2018-0236 2019-08-05 18:23:27 +02:00
Julius Gruber
92989a618a Added null/undefined check for authMethodModels 2019-08-05 17:16:15 +02:00
lotte
07d876348e submitting relationships to the REST server 2019-08-05 16:30:56 +02:00
Julius Gruber
9234f8bc46 Removed unused methods from auth.interceptor 2019-08-05 15:42:07 +02:00
Julius Gruber
12941640a4 Removed old shibboleth code 2019-08-05 15:32:41 +02:00