Commit Graph

134 Commits

Author SHA1 Message Date
Kristof De Langhe
d5fe5c432b Merge branch 'master' into Browse-By-Date
Conflicts:
	config/environment.default.js
	src/config/global-config.interface.ts
2019-03-04 11:15:49 +01:00
Kristof De Langhe
bb3e9c43fb 59695: PR Feedback - scope fix, startsWith fix, starts-with month 2019-02-26 13:38:46 +01:00
lotte
c40179fc88 Merge branch 'master' into w2p-59334_edit-item-metadata-branch
Conflicts:
	src/app/+community-page/community-page.component.ts
	src/app/core/auth/server-auth.service.ts
	src/app/core/data/dso-response-parsing.service.ts
	src/app/core/data/item-data.service.ts
	src/app/core/data/metadata-schema-data.service.ts
	src/app/core/data/request.models.ts
	src/app/core/metadata/metadata.service.spec.ts
	src/app/core/metadata/normalized-metadata-schema.model.ts
	src/app/core/shared/metadatum.model.ts
	src/app/core/shared/operators.spec.ts
	src/app/shared/shared.module.ts
2019-02-25 10:28:18 +01:00
lotte
35be122eea bug fixing 2019-02-25 09:57:46 +01:00
Kristof De Langhe
b85fe49670 Merge branch 'master' into w2p-60168_Alphabetic-browse-widget
Conflicts:
	src/app/core/browse/browse.service.ts
	src/app/shared/shared.module.ts
2019-02-22 09:02:46 +01:00
Tim Donohue
eb818e4d69 Merge pull request #355 from atmire/modifying-metadata-registries
Modifying metadata registries
2019-02-21 14:27:23 -06:00
Kristof De Langhe
fe5f436654 Merge branch 'master' into w2p-60168_Alphabetic-browse-widget
Conflicts:
	src/app/core/browse/browse.service.spec.ts
	src/app/core/browse/browse.service.ts
	src/app/core/data/dso-response-parsing.service.ts
	src/app/shared/shared.module.ts
2019-02-21 13:35:21 +01:00
lotte
3c104a460b 59334: removed unnecessary config entry 2019-02-21 11:59:04 +01:00
Kristof De Langhe
9a0989f240 60168: Starts-With text dropdown options + styling 2019-02-20 10:08:12 +01:00
Kristof De Langhe
16f448021b 60168: Browse-by startsWith text component 2019-02-20 08:54:51 +01:00
lotte
bfa1e77177 finalised edit item page 2019-02-19 10:13:49 +01:00
Kristof De Langhe
371f2bcd85 Merge remote-tracking branch 'atmire/master' into Browse-by-links
Conflicts:
	src/app/core/browse/browse.service.spec.ts
	src/app/core/data/dso-response-parsing.service.ts
	src/app/shared/shared.module.ts
2019-02-13 13:25:35 +01:00
Kristof De Langhe
d6a60d1adc Merge remote-tracking branch 'atmire/master' into modifying-metadata-registries
Conflicts:
	src/app/+community-page/community-page.component.ts
	src/app/+item-page/edit-item-page/item-delete/item-delete.component.spec.ts
	src/app/+item-page/edit-item-page/item-delete/item-delete.component.ts
	src/app/+item-page/edit-item-page/item-private/item-private.component.ts
	src/app/+item-page/edit-item-page/item-public/item-public.component.spec.ts
	src/app/+item-page/edit-item-page/item-public/item-public.component.ts
	src/app/+item-page/edit-item-page/item-reinstate/item-reinstate.component.spec.ts
	src/app/+item-page/edit-item-page/item-reinstate/item-reinstate.component.ts
	src/app/+item-page/edit-item-page/item-withdraw/item-withdraw.component.spec.ts
	src/app/+item-page/edit-item-page/item-withdraw/item-withdraw.component.ts
	src/app/+item-page/edit-item-page/simple-item-action/abstract-simple-item-action.component.spec.ts
	src/app/core/auth/server-auth.service.ts
	src/app/core/cache/response.models.ts
	src/app/core/data/item-data.service.spec.ts
	src/app/core/data/item-data.service.ts
	src/app/core/data/request.models.ts
	src/app/core/index/index.effects.ts
	src/app/core/metadata/metadata.service.spec.ts
	src/app/core/shared/operators.spec.ts
	src/app/header/header.component.spec.ts
	src/app/shared/form/form.component.ts
2019-02-13 12:47:17 +01:00
lotte
714811dc07 59334: added validation 2019-02-12 12:48:32 +01:00
Kristof De Langhe
b1b239d451 59695: Wait for startsWithOptions to prevent empty dropdown + loading message 2019-02-12 11:50:35 +01:00
Kristof De Langhe
c49f9f2ef6 59695: Browse-by-date style finetuning + navigation + parsing service fix for empty pages 2019-02-12 11:27:24 +01:00
Kristof De Langhe
cdcacedfae 59695: Starts-with implementation for browse-by date 2019-02-12 10:40:47 +01:00
Kristof De Langhe
30c0bd8ebb 59695: Browse by date base 2019-02-11 13:11:47 +01:00
lotte
ace523ed14 intermediate commit for tests 2019-02-08 14:42:34 +01:00
Kristof De Langhe
fde2e1cc6e 59415: Browse-Entries empty response handling and doc fix 2019-01-29 17:44:28 +01:00
Kristof De Langhe
64f301d1dd 59415: messages, subject link on comcol pages and documentation updates 2019-01-29 17:22:23 +01:00
Kristof De Langhe
3fdd32b383 59415: Refactored Browse-By-Author to Browse-By-Metadata to support multiple metadata definitions 2019-01-29 17:00:25 +01:00
lotte
953c0ecfc8 Merge branch 'delete-communities-and-collections' into w2p-59334_edit-item-metadata-branch
Conflicts:
	src/app/+community-page/community-page.component.ts
	src/app/+item-page/edit-item-page/item-delete/item-delete.component.spec.ts
	src/app/+item-page/edit-item-page/item-delete/item-delete.component.ts
	src/app/+item-page/edit-item-page/item-private/item-private.component.ts
	src/app/+item-page/edit-item-page/item-public/item-public.component.spec.ts
	src/app/+item-page/edit-item-page/item-public/item-public.component.ts
	src/app/+item-page/edit-item-page/item-reinstate/item-reinstate.component.spec.ts
	src/app/+item-page/edit-item-page/item-reinstate/item-reinstate.component.ts
	src/app/+item-page/edit-item-page/item-withdraw/item-withdraw.component.spec.ts
	src/app/+item-page/edit-item-page/item-withdraw/item-withdraw.component.ts
	src/app/+item-page/edit-item-page/simple-item-action/abstract-simple-item-action.component.spec.ts
	src/app/core/auth/server-auth.service.ts
	src/app/core/cache/response.models.ts
	src/app/core/data/item-data.service.spec.ts
	src/app/core/data/item-data.service.ts
	src/app/core/data/request.models.ts
	src/app/core/index/index.effects.ts
	src/app/core/metadata/metadata.service.spec.ts
	src/app/core/shared/operators.spec.ts
	src/app/header/header.component.spec.ts
	src/app/shared/form/form.component.ts
2019-01-25 13:34:09 +01:00
lotte
b1a2571858 59334: basic edit metadata implementation 2019-01-25 13:27:18 +01:00
Kristof De Langhe
31b3a1fdaa Merge branch 'master' into w2p-58789_Metadata-Registry-UI-Part-2
Conflicts:
	src/app/+admin/admin-registries/metadata-schema/metadata-schema.component.ts
	src/app/+community-page/community-page.component.html
	src/app/app.reducer.ts
	src/app/core/auth/server-auth.service.ts
	src/app/core/core.module.ts
	src/app/core/data/item-data.service.spec.ts
	src/app/core/data/item-data.service.ts
	src/app/core/index/index.effects.ts
	src/app/core/index/index.reducer.spec.ts
	src/app/core/index/index.reducer.ts
	src/app/core/shared/operators.spec.ts
	src/app/core/shared/operators.ts
	src/app/header/header.component.spec.ts
2019-01-24 13:18:20 +01:00
lotte
a733eb5834 Merge branch 'community-and-collection-forms' into w2p-58522_delete-collections-and-communities
Conflicts:
	src/app/core/data/data.service.ts
	src/app/shared/shared.module.ts
2019-01-24 12:58:05 +01:00
Kristof De Langhe
c150b5f350 58789: Feedback 2019-01-24 2019-01-24 12:45:46 +01:00
Kristof De Langhe
d2a918b8e9 58789: Changed delete button labels to Delete selected 2019-01-24 11:18:56 +01:00
Kristof De Langhe
2521bafa92 58789: Forms using messages 2019-01-23 11:06:20 +01:00
Kristof De Langhe
7f991d2a06 58789: Notifications loaded through messages 2019-01-22 17:52:32 +01:00
lotte
6dba02ca67 Merge branch 'master' into community-and-collection-forms
Conflicts:
	src/app/core/data/item-data.service.spec.ts
	src/app/core/data/item-data.service.ts
	src/app/core/shared/operators.spec.ts
	src/app/core/shared/operators.ts
	src/app/shared/shared.module.ts
2019-01-22 08:34:51 +01:00
Yana De Pauw
a93f3e4357 Merge branch 'master' into Item-Status-Edit-Actions 2019-01-10 14:37:27 +01:00
lotte
ab5cc1c961 58522: implemented delete for coll and comms 2019-01-04 16:30:25 +01:00
lotte
a35dffbe95 refactoring comcol forms 2018-12-23 00:12:46 +01:00
lotte
d37a2e051d Started fixing tests 2018-12-21 16:22:59 +01:00
courtneypattison
91f8eba6d8 Merged with dspace logo svg 2018-12-20 09:14:02 -08:00
lotte
42d1bdb3d8 Merge branch 'master' into w2p-54472_Create-community-and-collection-pages
Conflicts:
	resources/i18n/en.json
	src/app/+community-page/community-page.component.html
	src/app/+community-page/community-page.module.ts
	src/app/core/auth/server-auth.service.ts
	src/app/core/core.module.ts
	src/app/core/index/index.effects.ts
	src/app/core/index/index.reducer.spec.ts
	src/app/core/index/index.reducer.ts
	src/app/header/header.component.spec.ts
2018-12-20 15:59:23 +01:00
lotte
7a12332d70 Edit and create communities 2018-12-20 15:54:47 +01:00
Art Lowel
2055f3216d Merge pull request #338 from atmire/dynamic_menus
Dynamic menus
2018-12-20 14:46:11 +01:00
courtneypattison
b305462449 Made home news responsive 2018-12-19 13:53:19 -08:00
lotte
6163d159f7 applied feedback 2018-12-19 13:38:37 +01:00
Yana De Pauw
2c78f98097 Merge branch 'master' into DS249_Display-subcommunities 2018-12-19 10:16:39 +01:00
Yana De Pauw
d9a393c8e6 Add Item Status Edit Actions
Add the Item Withdraw and Reistate action
Add the make Item Private and Public action
Add the Permanently Delete action
2018-12-18 16:52:11 +01:00
lotte
01b4a7ff01 Merge branch 'response-cache-refactoring' into w2p-54472_Create-community-and-collection-pages
Conflicts:
	src/app/core/metadata/metadata.service.spec.ts
2018-12-17 12:50:33 +01:00
lotte
cc53dda46b fixed issue with hostwindowservice, search filter bug, changed sidebar toggle text to pin, fixed mobile view of header 2018-12-17 12:08:12 +01:00
lotte
dceb835e53 latest fixes 2018-12-13 16:17:21 +01:00
lotte
07c9927b6a finished dynamic menus 2018-12-06 15:50:12 +01:00
lotte
c17b395ba0 57053: intermediate commit active issue 2018-12-05 12:46:22 +01:00
lotte
567d4dc331 sidebar animations 2018-11-23 14:44:11 +01:00
lotte
83bf3ab8b8 start of vertical menu 2018-11-09 17:00:58 +01:00