Giuseppe Digilio
|
11e77086ae
|
Merge remote-tracking branch 'remotes/origin/submission' into mydspace
|
2019-03-11 20:06:42 +01:00 |
|
Giuseppe Digilio
|
52906e71c4
|
Intermediate commit
|
2019-03-08 19:49:07 +01:00 |
|
lotte
|
0a1138fbbd
|
Merge branch 'master' into w2p-60113_admin-select-dso-modal
Conflicts:
src/app/shared/shared.module.ts
|
2019-03-08 16:40:52 +01:00 |
|
Giuseppe Digilio
|
2009ee566c
|
Merge remote-tracking branch 'remotes/origin/master' into submission
# Conflicts:
# src/app/core/data/browse-items-response-parsing-service.ts
# src/app/shared/shared.module.ts
|
2019-03-08 16:30:39 +01:00 |
|
Giuseppe Digilio
|
ab42f4b190
|
Merge remote-tracking branch 'remotes/origin/master' into submission
# Conflicts:
# src/app/+item-page/edit-item-page/item-status/item-status.component.spec.ts
# src/app/core/cache/builders/remote-data-build.service.ts
# src/app/core/core.effects.ts
# src/app/core/core.reducers.ts
# src/app/core/data/comcol-data.service.spec.ts
# src/app/core/data/data.service.spec.ts
# src/app/core/data/data.service.ts
# src/app/core/shared/dspace-object.model.ts
# src/app/shared/shared.module.ts
# src/styles/_custom_variables.scss
|
2019-03-08 09:52:47 +01:00 |
|
lotte
|
c60175ac80
|
fixed metadata value issues
|
2019-03-07 15:00:30 +01:00 |
|
lotte
|
9abbfa955e
|
refactored, started tests
|
2019-03-07 14:25:48 +01:00 |
|
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 |
|
Giuseppe Digilio
|
167c50e9a3
|
Dispaly an error notification when an error occured on submission save
|
2019-02-28 18:39:12 +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 |
|
Giuseppe Digilio
|
a42dd19624
|
Merge remote-tracking branch 'remotes/origin/master' into submission
# Conflicts:
# src/app/core/cache/models/normalized-object-factory.ts
# src/app/core/cache/response.models.ts
# src/app/core/data/registry-metadatafields-response-parsing.service.ts
# src/app/core/data/registry-metadataschemas-response-parsing.service.ts
# src/app/core/data/request.models.ts
# src/app/core/data/request.service.ts
# src/app/core/shared/collection.model.ts
# src/app/core/shared/dspace-object.model.ts
# src/app/core/shared/resource-type.ts
|
2019-02-22 12:20:28 +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 |
|
Giuseppe Digilio
|
83562b2f32
|
Merge remote-tracking branch 'remotes/origin/master' into submission
# Conflicts:
# src/app/core/data/browse-entries-response-parsing.service.spec.ts
# src/app/core/data/browse-entries-response-parsing.service.ts
|
2019-02-21 18:49:36 +01: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 |
|
Giuseppe Digilio
|
880d9ed069
|
Merge remote-tracking branch 'remotes/origin/master' into submission
# Conflicts:
# package.json
# src/app/+item-page/edit-item-page/item-delete/item-delete.component.spec.ts
# src/app/+item-page/edit-item-page/item-private/item-private.component.spec.ts
# src/app/+item-page/edit-item-page/item-public/item-public.component.spec.ts
# src/app/+item-page/edit-item-page/item-reinstate/item-reinstate.component.spec.ts
# src/app/+item-page/edit-item-page/item-withdraw/item-withdraw.component.spec.ts
# src/app/+item-page/edit-item-page/simple-item-action/abstract-simple-item-action.component.spec.ts
# src/app/+search-page/search-service/search.service.spec.ts
# src/app/core/auth/auth-response-parsing.service.spec.ts
# src/app/core/auth/auth-response-parsing.service.ts
# src/app/core/cache/builders/remote-data-build.service.ts
# src/app/core/cache/response-cache.reducer.spec.ts
# src/app/core/cache/response-cache.service.spec.ts
# src/app/core/cache/response.models.ts
# src/app/core/config/config-response-parsing.service.ts
# src/app/core/core.effects.ts
# src/app/core/core.module.ts
# src/app/core/core.reducers.ts
# src/app/core/data/base-response-parsing.service.ts
# src/app/core/data/data.service.ts
# src/app/core/data/item-data.service.spec.ts
# src/app/core/data/request.models.ts
# src/app/core/data/request.service.spec.ts
# src/app/core/data/request.service.ts
# src/app/core/integration/integration-response-parsing.service.spec.ts
# src/app/core/integration/integration-response-parsing.service.ts
# src/app/core/integration/integration.service.ts
# src/app/core/metadata/metadata.service.spec.ts
# src/app/core/registry/registry.service.spec.ts
# src/app/core/shared/hal-endpoint.service.ts
# src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control.component.ts
# src/app/shared/mocks/mock-response-cache.service.ts
# src/app/shared/shared.module.ts
|
2019-02-19 17:30:33 +01:00 |
|
lotte
|
bfa1e77177
|
finalised edit item page
|
2019-02-19 10:13:49 +01:00 |
|
Giuseppe Digilio
|
efdc351de0
|
fixed i18n label
|
2019-02-18 17:53:49 +01:00 |
|
Giuseppe Digilio
|
8422549d26
|
fixed subscriptions and added i18n label
|
2019-02-18 16:53:15 +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
|
2e7c9f21b2
|
Merge branch 'configurable_entities' into mixing-text-authority-entities
Conflicts:
src/app/+item-page/item-page.module.ts
src/app/+item-page/simple/item-types/journal-issue/journal-issue.component.html
|
2019-02-05 09:45:57 +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 |
|
Art Lowel
|
e0eb5448b5
|
Merge remote-tracking branch 'upstream/configurable_entities' into add-virtual-metadata-fields-for-journals
|
2019-01-22 17:23:41 +01:00 |
|
Art Lowel
|
9982254ca2
|
roll back a merge mistake
|
2019-01-22 16:13:49 +01:00 |
|
Art Lowel
|
160aba1249
|
Merge branch 'rename-entities' into mixing-text-authority-entities
|
2019-01-22 10:15:26 +01:00 |
|
Art Lowel
|
bd07b33ef2
|
Merge remote-tracking branch 'upstream/configurable_entities' into rename-entities
|
2019-01-22 10:04:18 +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 |
|
Tim Donohue
|
2e53c3e3cf
|
Merge branch 'master' into configurable_entities
|
2019-01-21 14:26:47 -06:00 |
|