Giuseppe Digilio
|
dee38f3043
|
Merge remote-tracking branch 'remotes/origin/master' into submission
# Conflicts:
# resources/i18n/en.json
# src/app/core/cache/builders/remote-data-build.service.ts
# src/app/core/data/request.service.spec.ts
# src/app/core/data/request.service.ts
|
2019-03-21 15:10:15 +01:00 |
|
Giuseppe Digilio
|
bbd6225cd4
|
Move SubmissionRestService to submission core dir
|
2019-03-18 09:57:31 +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
|
61a5620efe
|
refactored lookup
|
2019-03-07 14:24:24 +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 |
|
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
|
0ebb0de3dd
|
59334: edit metadata finetuning
|
2019-02-19 14:49:26 +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
|
ace523ed14
|
intermediate commit for tests
|
2019-02-08 14:42:34 +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 |
|
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 |
|
Kristof De Langhe
|
73f24a5dc1
|
58789: Rest call for creating metadata schemas
|
2019-01-22 10:39:32 +01:00 |
|
Samuel
|
962bafcce2
|
taskid 58789 Metadata Registry UI Part 2
|
2019-01-19 20:53:15 +01:00 |
|
Art Lowel
|
586a4ac35b
|
add docs, rename classes for clarity
|
2019-01-17 14:59:48 +01:00 |
|
Giuseppe Digilio
|
6b75da27a4
|
Renamed SectionFormOperationsService from FormOperationsService
|
2019-01-12 16:11:16 +01:00 |
|
Giuseppe Digilio
|
feb8172b32
|
Made JsonPatchOperationsService an abstract class
|
2018-12-28 18:31:14 +01:00 |
|
Giuseppe Digilio
|
eda0ebb21c
|
Merge remote-tracking branch 'origin/master' into submission
# Conflicts:
# resources/i18n/en.json
# src/app/app.component.scss
# src/app/app.component.spec.ts
# src/app/app.component.ts
# src/app/app.module.ts
# src/app/shared/chips/chips.component.spec.ts
# src/app/shared/chips/models/chips-item.model.spec.ts
# src/app/shared/form/builder/ds-dynamic-form-ui/models/tag/dynamic-tag.component.html
# src/app/shared/form/builder/ds-dynamic-form-ui/models/typeahead/dynamic-typeahead.component.html
# src/app/shared/shared.module.ts
# yarn.lock
|
2018-12-20 17:02:46 +01: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 |
|
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
|
cd5c7b72c2
|
57053: progress menu bar
|
2018-11-16 17:00:06 +01:00 |
|
Giuseppe
|
ea227aef64
|
Move all config stuff to a single directory
|
2018-10-17 15:01:55 +02:00 |
|
lotte
|
2330e96158
|
intermediate commit
|
2018-10-17 13:18:01 +02:00 |
|
Giuseppe
|
b27e3d9e2f
|
Merge remote-tracking branch 'remotes/origin/master' into submission
# Conflicts:
# src/app/+search-page/search-service/search.service.spec.ts
# src/app/app.component.spec.ts
# src/app/app.component.ts
# src/app/core/auth/auth-response-parsing.service.ts
# src/app/core/cache/models/normalized-object-factory.ts
# src/app/core/cache/models/normalized-resource-policy.model.ts
# src/app/core/core.module.ts
# src/app/core/data/base-response-parsing.service.ts
# src/app/core/data/config-response-parsing.service.spec.ts
# src/app/core/data/config-response-parsing.service.ts
# src/app/core/data/dso-response-parsing.service.ts
# src/app/core/data/request.models.ts
# src/app/core/data/search-response-parsing.service.ts
# src/app/core/integration/integration-response-parsing.service.spec.ts
# src/app/core/integration/integration-response-parsing.service.ts
# src/app/core/shared/item.model.ts
# src/app/core/shared/resource-policy.model.ts
# src/app/core/shared/resource-type.ts
# src/app/shared/shared.module.ts
# src/app/thumbnail/thumbnail.component.html
|
2018-10-15 19:21:01 +02:00 |
|
Kristof De Langhe
|
4590264d5a
|
Merge branch 'master' into browse-by-features
Conflicts:
src/app/core/core.module.ts
src/app/core/shared/operators.ts
src/app/shared/object-grid/item-grid-element/item-grid-element.component.html
src/app/shared/object-list/item-list-element/item-list-element.component.html
src/app/shared/shared.module.ts
|
2018-08-29 14:24:45 +02:00 |
|
lotte
|
9a410d02d9
|
scope now uses DSO endpoint instead of PID
|
2018-08-23 15:38:10 +02:00 |
|
Kristof De Langhe
|
883a1d8881
|
Issues 252,253: Browse by title and browse by metadata (author)
|
2018-08-08 11:36:42 +02:00 |
|
lotte
|
117a0cd3ff
|
Merge branch 'master' into search-features
Conflicts:
package.json
src/app/shared/shared.module.ts
yarn.lock
|
2018-08-02 14:21:28 +02:00 |
|
Giuseppe
|
6f60cd68e2
|
Merged submission module code
|
2018-07-26 18:36:36 +02:00 |
|
Art Lowel
|
0207aa14e8
|
Added PIDService
|
2018-07-18 16:18:02 +02:00 |
|
Giuseppe Digilio
|
10d90e4325
|
Merge remote-tracking branch 'remotes/origin/master' into dynamic_forms
# Conflicts:
# resources/i18n/en.json
# src/app/core/cache/response-cache.models.ts
# src/app/core/data/request.models.ts
# src/app/shared/shared.module.ts
# src/styles/_custom_variables.scss
|
2018-07-12 14:56:57 +02:00 |
|
Kristof De Langhe
|
079b8b7679
|
Merge remote-tracking branch 'dspace/master' into w2p-50632_Replace-mock-registry-service-with-implementation
Conflicts:
src/app/app-routing.module.ts
src/app/core/cache/response-cache.models.ts
|
2018-07-09 14:09:24 +02:00 |
|
Giuseppe Digilio
|
b17cb180bb
|
Merge remote-tracking branch 'remotes/origin/master' into dynamic_forms
|
2018-06-11 11:14:32 +02:00 |
|
Giuseppe Digilio
|
e0efa5f8e5
|
changes based on review comments
|
2018-05-23 18:13:34 +02:00 |
|
Kristof De Langhe
|
c5b05a2553
|
Merge branch 'master' into w2p-50632_Replace-mock-registry-service-with-implementation
Conflicts:
src/app/core/core.module.ts
|
2018-05-22 13:41:40 +02:00 |
|
Giuseppe Digilio
|
4a697c09f6
|
Merge remote-tracking branch 'remotes/origin/master' into authentication
# Conflicts:
# src/app/core/core.module.ts
|
2018-05-21 17:22:45 +02:00 |
|
Art Lowel
|
44b031a234
|
#255 Fetching and parsing browse entries
|
2018-05-17 14:52:09 +02:00 |
|
Giuseppe Digilio
|
1e4bc0563a
|
Merge remote-tracking branch 'remotes/origin/master' into dynamic_forms
# Conflicts:
# src/app/app.reducer.ts
# src/app/core/core.module.ts
# src/app/shared/shared.module.ts
|
2018-05-15 18:44:51 +02:00 |
|
Giuseppe Digilio
|
989a405947
|
Fixed merge
|
2018-05-15 17:14:39 +02:00 |
|
Giuseppe Digilio
|
478cbaf57c
|
Merge remote-tracking branch 'remotes/origin/master' into authentication
# Conflicts:
# src/app/app.effects.ts
# src/app/app.module.ts
# src/app/app.reducer.ts
# src/app/core/core.module.ts
# src/app/shared/shared.module.ts
|
2018-05-15 17:01:26 +02:00 |
|
Giuseppe Digilio
|
a114650564
|
fixes and adjustments
|
2018-05-09 19:23:09 +02:00 |
|
Giuseppe Digilio
|
7a32d18b1b
|
Merged dynamic form module
|
2018-05-09 12:14:18 +02:00 |
|
Giuseppe Digilio
|
f8b3cc516c
|
Merge remote-tracking branch 'remotes/origin/master' into authentication
# Conflicts:
# src/app/+search-page/search-filters/search-filter/search-filter.component.ts
# src/app/+search-page/search-filters/search-filter/search-filter.service.ts
# src/app/+search-page/search-service/search.service.spec.ts
# src/app/+search-page/search-service/search.service.ts
# src/app/app.component.spec.ts
# src/app/app.component.ts
# src/app/core/cache/response-cache.models.ts
# src/app/core/core.effects.ts
# src/app/core/core.module.ts
# src/app/core/shared/hal-endpoint.service.ts
# src/app/shared/services/route.service.ts
# src/app/shared/view-mode-switch/view-mode-switch.component.spec.ts
# src/modules/app/browser-app.module.ts
# src/modules/app/server-app.module.ts
|
2018-05-08 10:57:15 +02:00 |
|
Giuseppe Digilio
|
ada577c2be
|
Merge remote-tracking branch 'remotes/origin/master' into notifications
# Conflicts:
# src/app/app.component.ts
# src/app/core/core.module.ts
|
2018-05-07 16:10:17 +02:00 |
|
Giuseppe Digilio
|
c8a1fe0860
|
Removed use of platform service and created different service for SSR and CSR
|
2018-05-03 19:08:07 +02:00 |
|
Kristof De Langhe
|
0d70faffae
|
50632: Replaced mock registry service with implementation and added pagination
|
2018-04-04 13:03:15 +02:00 |
|
Kristof De Langhe
|
683b58eaaf
|
50632: Working metadataschema registry service
|
2018-03-30 17:18:44 +02:00 |
|
Kristof De Langhe
|
889a2f716e
|
Merge remote-tracking branch 'lotte/search-backend' into w2p-50632_Replace-mock-registry-service-with-implementation
Conflicts:
src/app/core/core.module.ts
|
2018-03-29 16:07:25 +02:00 |
|
Kristof De Langhe
|
d78aea63ec
|
conflict fix
|
2018-03-29 16:01:26 +02:00 |
|