hazza/dspace-angular
1
0
Fork 1
mirror of https://github.com/DSpace/dspace-angular.git synced 2025-10-07 01:54:15 +00:00
Code Issues Packages Projects Releases Wiki Activity
2,419 Commits 24 Branches 25 Tags
cfdc227563ba12955d0fbfe2e8efa6e103e9ad1c
Commit Graph

2419 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Kristof De Langhe
cfdc227563 65272: CollectionMetadataComponent test import fixes 2019-10-04 14:46:59 +02:00
Kristof De Langhe
2eae641703 Merge branch 'master' into w2p-65272_Edit-collection-item-template 2019-10-04 13:35:19 +02:00
Kristof De Langhe
90beee9a85 65272: Existing test fixes 2019-10-04 13:34:56 +02:00
Kristof De Langhe
644ab2cfab 65272: JSDocs 2019-10-04 13:05:15 +02:00
Kristof De Langhe
cf8bba7112 65272: Revert testing changes 2019-10-04 12:38:47 +02:00
Kristof De Langhe
ba436a6467 65272: Functional EditItemTemplatePageComponent 2019-10-04 11:46:14 +02:00
Tim Donohue
262b33261e Merge pull request #494 from atmire/Changes-to-relationship-type-fix 
Small bug-fix due to changes to relationship-type
 2019-10-03 19:18:29 +02:00
Kristof De Langhe
4cc1f55272 65272: EditItemTemplatePageComponent 2019-10-03 17:50:48 +02:00
Kristof De Langhe
cddaf539aa 65272: add, delete and edit button for collection item template 2019-10-03 16:36:07 +02:00
Kristof De Langhe
556475318d Fixed remaining left/right-labels 2019-10-03 15:22:45 +02:00
Kristof De Langhe
143604fa4d 65272: Intermediate commit 2019-10-03 15:07:05 +02:00
Kristof De Langhe
a1fea1d6a2 leftLabel/rightLabel renaming to leftwardType/rightwardType in test case 2019-10-03 14:53:00 +02:00
Kristof De Langhe
ef9976cf09 Merge branch 'w2p-63669_Edit-Col/Com-Tabs' into w2p-65272_Edit-collection-item-template 2019-10-03 14:41:15 +02:00
Kristof De Langhe
e10a5bb8f8 63669: Hide return button for metadata edit on com/col 2019-10-03 14:39:46 +02:00
Kristof De Langhe
36d3ddd691 leftLabel/rightLabel renaming to leftwardType/rightwardType 2019-10-03 13:55:57 +02:00
Kristof De Langhe
97de2b8ef3 Merge branch 'master' into w2p-63669_Edit-Col/Com-Tabs 
Conflicts:
	resources/i18n/en.json
	src/app/shared/comcol-forms/edit-comcol-page/edit-comcol-page.component.spec.ts
	src/app/shared/shared.module.ts
 2019-10-03 13:46:11 +02:00
Kristof De Langhe
12be9101e5 65272: ItemTemplateDataService 2019-10-03 13:16:46 +02:00
benbosman
b85c76f40e Merge pull request #461 from atmire/changes-to-relationship-type 
Rename relationship type properties
 2019-10-02 18:23:04 +02:00
Tim Donohue
2789996000 Merge pull request #486 from atmire/add-header-icon-color-variable 
Add header icon color variable
 2019-09-27 20:20:24 +02:00
Art Lowel
e68cbcd28c add header icon color variable and add !default to all themeable 
variables
 2019-09-27 14:57:07 +02:00
Tim Donohue
eea250664d Merge pull request #432 from 4Science/submission-miscellaneous-fixes 
Submission miscellaneous fixes
 2019-09-26 23:22:42 +02:00
Art Lowel
69a0ae8722 Merge pull request #491 from paulo-graca/patch-1 
Remove duplicated "SearchFilterService"
 2019-09-26 11:36:40 +02:00
Paulo Graça
ef832d34dc Remove duplicated "SearchFilterService" 2019-09-26 10:04:21 +01:00
Tim Donohue
d85cc0a0f2 Merge pull request #467 from mspalti/login_redirect_url 
Redirecting user to same page after login.
 2019-09-19 17:30:00 +02:00
Michael W Spalti
ca048736b5 Removed unnecessary import in unit test. 2019-09-18 12:13:41 -07:00
Michael W Spalti
73dd0147bc Minor update of the imports in unit test. 2019-09-18 10:37:12 -07:00
Michael W Spalti
e70b9c5994 Added new auth redirect code for ssr. 2019-09-17 12:44:02 -07:00
Art Lowel
5917d92a07 Merge pull request #484 from atmire/fix-CVE-2019-10747 
Update set-value to fix CVE-2019-10747
 2019-09-17 10:33:06 +02:00
Michael W Spalti
8fe617bd74 Changed method name. 2019-09-16 13:14:45 -07:00
Tim Donohue
6ae9efde59 Merge pull request #477 from atmire/64644-Removal-of-filtered-discovery-page 
Removal of filtered-discovery-page in Angular
 2019-09-16 19:08:21 +02:00
Tim Donohue
f429483c93 Merge pull request #479 from terrywbrady/compose-v2 
Use the improved DSpace Docker Compose files to create the ci image
 2019-09-16 19:06:52 +02:00
Art Lowel
d088f0a504 update set-value to fix CVE-2019-10747 2019-09-16 18:35:17 +02:00
Art Lowel
b4d5bff1e6 update set-value to fix CVE-2019-10747 2019-09-16 18:28:40 +02:00
Art Lowel
f45bc3124a Merge pull request #483 from DSpace/dependabot/npm_and_yarn/mixin-deep-1.3.2 
Bump mixin-deep from 1.3.1 to 1.3.2
 2019-09-16 18:06:51 +02:00
dependabot[bot]
95005ef110 Bump mixin-deep from 1.3.1 to 1.3.2 
Bumps [mixin-deep](https://github.com/jonschlinkert/mixin-deep) from 1.3.1 to 1.3.2.
- [Release notes](https://github.com/jonschlinkert/mixin-deep/releases)
- [Commits](https://github.com/jonschlinkert/mixin-deep/compare/1.3.1...1.3.2)

Signed-off-by: dependabot[bot] <support@github.com>
 2019-09-16 15:36:17 +00:00
Art Lowel
5fd8a12489 Merge pull request #439 from atmire/improve-i18n-files 
Convert i18n files to JSON5 format
 2019-09-16 17:28:41 +02:00
Art Lowel
ed958c1232 Merge branch 'master' into improve-i18n-files 2019-09-16 16:57:17 +02:00
Giuseppe Digilio
95d1495397 Merge remote-tracking branch 'remotes/origin/master' into submission-miscellaneous-fixes 2019-09-16 16:36:52 +02:00
Tim Donohue
8ffd44f1ed Merge pull request #480 from atmire/upgrade-travis-image 
Fix travis chrome install issue
 2019-09-16 16:16:07 +02:00
Art Lowel
7d947291e4 add dpkg to prevent chrome install issues 2019-09-16 11:04:35 +02:00
Giuseppe Digilio
25c6491962 Merge remote-tracking branch 'remotes/origin/master' into submission-miscellaneous-fixes 2019-09-16 10:02:00 +02:00
helix84
6c0aaa7bee Update cs.json5 2019-09-16 08:28:56 +02:00
Tim Donohue
ef8f857fe8 Merge pull request #335 from atmire/Move-item-component 
Move item component
 2019-09-13 18:14:17 +02:00
Giuseppe Digilio
0b878af92a Fix issue with find operator on SSR 2019-09-13 17:38:12 +02:00
Giuseppe Digilio
4cc7432e91 Print error message when error occurred on SSR 2019-09-13 17:37:08 +02:00
Giuseppe Digilio
aea83ed662 Merge remote-tracking branch 'remotes/origin/master' into submission-miscellaneous-fixes 2019-09-13 17:26:16 +02:00
Art Lowel
154fc83930 fix typo 2019-09-12 17:14:19 +02:00
Art Lowel
b186ec635e Merge branch 'master' into improve-i18n-files 2019-09-12 17:13:43 +02:00
Ben Bosman
da0b70faa4 Merge remote-tracking branch 'atmire-git/w2p-64644_Removal-of-filtered-discovery-page' into 64644-Removal-of-filtered-discovery-page 2019-09-10 12:38:24 +02:00
Ben Bosman
4c5d4427dc Merge remote-tracking branch 'atmire-git/64644-Removal-of-filtered-discovery-page' into 64644-Removal-of-filtered-discovery-page 2019-09-10 09:24:44 +02:00