Commit Graph

219 Commits

Author SHA1 Message Date
Giuseppe Digilio
5aca8cc87d Merge remote-tracking branch 'remotes/origin/master' into upgrade-angular-7
# Conflicts:
#	src/app/+collection-page/collection-form/collection-form.component.ts
#	src/app/+community-page/community-form/community-form.component.ts
#	src/app/shared/comcol-forms/comcol-form/comcol-form.component.ts
2020-01-08 17:18:43 +01:00
Kristof De Langhe
42d12a83ce Merge branch 'master' into w2p-65240_Community-and-collection-logos
Conflicts:
	src/app/shared/shared.module.ts
2020-01-07 16:11:24 +01:00
Giuseppe Digilio
ee8293978f Merge remote-tracking branch 'remotes/origin/master' into upgrade-angular-7
# Conflicts:
#	src/app/core/services/route.service.ts
#	src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.ts
#	src/app/shared/form/builder/form-builder.service.ts
#	src/app/shared/object-list/object-list.component.spec.ts
#	src/app/submission/submission.service.ts
2019-12-24 15:57:06 +01:00
Giuseppe Digilio
ea4e9f8797 Fixed errors after upgrade to angular 7 2019-12-17 13:10:53 +01:00
lotte
c54faf69b1 Merge branch 'master' into clean-relationships-in-submission 2019-12-16 10:45:21 +01:00
Philip Vissenaekens
9df5a508f1 65240: Community and Collection logo layout 2019-12-12 13:11:54 +01:00
Philip Vissenaekens
9a921e9311 Merge remote-tracking branch 'dspace/master' into w2p-65240_Community-and-collection-logos-2
# Conflicts:
#	src/app/+collection-page/collection-page.component.html
#	src/app/core/data/comcol-data.service.ts
2019-12-12 13:08:38 +01:00
Antoine Snyers
dfa846a98e Track page views and searches in DSpace with a custom Angulartics2 provider 2019-11-28 09:54:39 +01:00
Kristof De Langhe
64978f2cfe 65240: Marking logo for deletion and request on form submit 2019-11-18 16:28:51 +01:00
Kristof De Langhe
166aab606d 65240: logo under browse 2019-11-12 14:54:16 +01:00
Kristof De Langhe
bb5103518e Merge branch 'master' into w2p-65240_Community-and-collection-logos
Conflicts:
	resources/i18n/en.json5
	src/app/shared/shared.module.ts
2019-11-12 14:39:10 +01:00
lotte
7e62ce80c2 Merge branch 'refactor-submission-parsers' into clean-relationships-in-submission 2019-11-08 08:49:12 +01:00
Kristof De Langhe
c7bb6ab17c 65240: ComCol logo delete on bitstreams endpoint + caching issue fixes when editing logos 2019-10-17 17:59:18 +02:00
lotte
99517c084c fixed issues after merge 2019-10-17 13:57:10 +02:00
lotte
f79e210959 Merge branch 'w2p-65195_dynamic-component-refactoring' into clean-relationships-in-submission 2019-10-17 12:49:22 +02:00
L. Henze
8f2a942536 Merge branch 'master' into 460-coll-pages 2019-10-15 10:57:35 -04:00
Kristof De Langhe
f7bd30cf12 62589: Item-Mapper Requests responseMsToLive to 10s 2019-10-10 13:39:59 +02:00
Kristof De Langhe
5b776b605a 62589: Review 03-10-2019 Changes and fixes 2019-10-08 13:06:31 +02:00
Kristof De Langhe
bfb2ef021a 65240: AoT build error fixes 2019-10-07 14:05:54 +02:00
Kristof De Langhe
0cd8a4ebcd Merge branch 'w2p-63669_Edit-Col/Com-Tabs' into w2p-65240_Community-and-collection-logos
Conflicts:
	resources/i18n/en.json5
	src/app/+collection-page/edit-collection-page/edit-collection-page.component.html
	src/app/+collection-page/edit-collection-page/edit-collection-page.component.spec.ts
	src/app/+collection-page/edit-collection-page/edit-collection-page.component.ts
	src/app/+community-page/edit-community-page/edit-community-page.component.html
	src/app/+community-page/edit-community-page/edit-community-page.component.spec.ts
	src/app/+community-page/edit-community-page/edit-community-page.component.ts
	src/app/shared/comcol-forms/edit-comcol-page/edit-comcol-page.component.spec.ts
	src/app/shared/comcol-forms/edit-comcol-page/edit-comcol-page.component.ts
2019-10-07 13:39:53 +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
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
37a18fdaa7 65240: Success notification on submitting comcol form 2019-10-02 13:40:06 +02:00
Kristof De Langhe
ed91e96d42 65240: Message cleanup 2019-10-01 15:26:09 +02:00
Kristof De Langhe
a2695edbac 65240: Add community/collection logo on create/edit pages 2019-10-01 14:42:25 +02:00
Kristof De Langhe
8652c4bce8 62589: Fixed test imports 2019-09-30 16:37:44 +02:00
Kristof De Langhe
b8a466d12b 62589: Loading components for item and collection select lists 2019-09-30 16:17:18 +02:00
Kristof De Langhe
a2fb8a316b 62589: Added tests for more coverage 2019-09-30 10:35:52 +02:00
Kristof De Langhe
145ed346c8 62589: Feedback improvements and fixes 2019-09-27 16:40:47 +02:00
L. Henze
300aeb435e Some visual / layout improvements 2019-09-18 17:42:20 -04:00
L. Henze
f4a1d5eb8a Header, section, and footer consistently 2019-09-18 14:42:44 -04:00
L. Henze
3c03ec8ede License not used 2019-09-18 14:20:46 -04:00
L. Henze
ea55e7333e Browse nav out of header 2019-09-18 14:13:56 -04:00
L. Henze
4d6e57337b Browse pages' browse sections' header hidden visually
Remains for screenreaders
2019-09-18 13:50:30 -04:00
L. Henze
5341beae1e Merge branch '460-coll-pages-revisions' into 460-coll-pages 2019-09-18 13:20:07 -04:00
L. Henze
4a77dec870 Fixing some work that was rolled back 2019-09-17 17:38:46 -04:00
L. Henze
af3005c863 wip 2019-09-17 17:19:34 -04:00
Kristof De Langhe
1b0b1d7797 62589: Fixed import 2019-09-11 10:44:03 +02:00
Kristof De Langhe
8b5a3ac9b3 Merge branch 'master' of https://git.atmire.com/contributions/dspace-angular into w2p-62589_Item-mapper-update 2019-09-11 10:09:35 +02:00
Kristof De Langhe
02b007a0f6 62589: Exclude owning collection + redirect to first tab after mapping + page reload fix 2019-09-10 16:29:15 +02:00
lhenze
1099c42eb1 Merge branch 'master' into 460-coll-pages 2019-09-06 16:10:23 -04:00
Kristof De Langhe
04f57b753e Merge branch 'master' into w2p-62589_Item-mapper-update
Conflicts:
	src/app/app.reducer.ts
	src/app/shared/shared.module.ts
2019-09-05 14:16:13 +02:00
lotte
b634799ef9 Merge branch 'master' into w2p-62355_optimize-search-performance 2019-09-05 10:16:51 +02:00
lhenze
20bc4d1c2d tidying - whitespace only 2019-09-04 17:12:52 -04:00
lhenze
2845578d07 Tidying 2019-09-04 16:13:39 -04:00
lhenze
d6bcdda8a0 Adding i18n keys for the labels for handles 2019-09-04 14:57:26 -04:00
lhenze
f609476270 New key 2019-09-03 17:19:13 -04:00
lhenze
64db1c242e New key created for *no recent items in this collection* 2019-09-03 17:02:09 -04:00
lotte
4d67c98f04 Merge branch 'master' into w2p-62849_relationships-in-submission 2019-08-27 16:41:37 +02:00
lhenze
f49fab3599 Added "empty" message
Modeled on browse-by.component.html
2019-08-26 08:56:13 -04:00