Commit Graph

128 Commits

Author SHA1 Message Date
Giuseppe Digilio
5491534ff8 Removed message board components 2019-04-05 12:45:49 +02:00
Giuseppe Digilio
bbc27febdd refactored ItemDetailPreviewComponent 2019-04-03 18:42:36 +02:00
Giuseppe Digilio
16b8e91585 Added tests and comments 2019-04-02 15:18:06 +02:00
Giuseppe Digilio
7b63d145d8 Added more tests and comments 2019-03-28 19:33:40 +01:00
Giuseppe Digilio
60f9df901e Merge remote-tracking branch 'remotes/origin/submission' into mydspace
# Conflicts:
#	resources/i18n/en.json
#	src/app/core/data/request.service.spec.ts
#	src/app/core/data/request.service.ts
#	src/app/core/json-patch/selectors.ts
#	src/app/shared/shared.module.ts
2019-03-27 16:01:26 +01:00
Giuseppe Digilio
b871148cc9 fixes after merge 2019-03-26 10:04:05 +01:00
Giuseppe Digilio
c9cd9ce215 Merge remote-tracking branch 'remotes/upstreamatmire/Search-optimizations' into mydspace
# Conflicts:
#	resources/i18n/en.json
#	src/app/+search-page/search-filters/search-filter/search-facet-filter/search-facet-filter.component.ts
#	src/app/+search-page/search-filters/search-filter/search-filter.component.ts
#	src/app/+search-page/search-filters/search-filters.component.html
#	src/app/+search-page/search-filters/search-filters.component.ts
#	src/app/+search-page/search-page.component.ts
#	src/app/+search-page/search-page.module.ts
#	src/app/+search-page/search-service/search.service.ts
#	src/app/core/cache/builders/remote-data-build.service.ts
#	src/app/core/core.module.ts
#	src/app/core/data/paginated-list.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/shared/services/route.service.ts
#	src/app/shared/shared.module.ts
2019-03-26 10:01:57 +01:00
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
a87900c132 Renamed AlertsComponent to AlertComponent and added tests 2019-03-21 13:16:38 +01:00
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
31d24284fb added tests for popups 2019-03-07 14:25:52 +01:00
lotte
9abbfa955e refactored, started tests 2019-03-07 14:25:48 +01:00
lotte
9f02f65a0a implemented edit popups and added actions 2019-03-07 14:24:51 +01:00
lotte
61a5620efe refactored lookup 2019-03-07 14:24:24 +01:00
lotte
bc305e2aa6 60113: context sensitive popup started from submission branch 2019-03-07 14:23:02 +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
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
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
Kristof De Langhe
a0501b0c3c 60168: Refactor browse-by-starts-with components to starts-with components + further refactoring by seperating date from text 2019-02-20 09:24:07 +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
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
lotte
7eec961fa7 59334: edit item metadata finished 2019-02-13 11:39:32 +01:00
Kristof De Langhe
b956dbfe08 59695: Browse-By-Starts-With components and switcher 2019-02-11 17:30:05 +01:00
lotte
ace523ed14 intermediate commit for tests 2019-02-08 14:42:34 +01:00
Kristof De Langhe
0312e659a4 59415: Browse-By links on community and collection pages' 2019-01-29 16:07:53 +01:00
Giuseppe Digilio
a33f2c2136 Merge remote-tracking branch 'remotes/origin/master' into submission
# Conflicts:
#	src/app/shared/shared.module.ts
2019-01-25 10:00:52 +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
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
Bram Luyten
17be7a34e0 Issue 298 Language switch 2019-01-16 20:01:14 +01:00
Giuseppe Digilio
c3965a15cc Added DsDatePickerInlineComponent 2019-01-15 19:04:32 +01:00
lotte
ab5cc1c961 58522: implemented delete for coll and comms 2019-01-04 16:30:25 +01:00
lotte
1ebd6f0e86 Finished refactoring, guards, docs, tests 2019-01-03 10:29:29 +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
Giuseppe Digilio
1935b61c7e Fixed dynamic form to make it work after Angular 6 upgrade 2018-12-20 11:09:38 +01:00
Giuseppe Digilio
ff97a4cc8b Merge remote-tracking branch 'remotes/origin/master' into submission
# Conflicts:
#	package.json
#	src/app/+admin/admin-registries/metadata-schema/metadata-schema.component.spec.ts
#	src/app/+search-page/search-service/search.service.spec.ts
#	src/app/app.module.ts
#	src/app/core/auth/auth.interceptor.ts
#	src/app/core/cache/response-cache.service.spec.ts
#	src/app/core/data/browse-response-parsing.service.spec.ts
#	src/app/core/data/data.service.spec.ts
#	src/app/core/data/request.service.spec.ts
#	src/app/core/data/request.service.ts
#	src/app/core/dspace-rest-v2/dspace-rest-v2.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/collection.model.ts
#	src/app/core/shared/item.model.ts
#	src/app/shared/form/builder/ds-dynamic-form-ui/models/dynamic-group/dynamic-group.component.spec.ts
#	src/app/shared/form/builder/ds-dynamic-form-ui/models/dynamic-group/dynamic-group.components.ts
#	src/app/shared/form/builder/ds-dynamic-form-ui/models/list/dynamic-list.component.ts
#	src/app/shared/form/builder/ds-dynamic-form-ui/models/lookup/dynamic-lookup.component.spec.ts
#	src/app/shared/form/builder/ds-dynamic-form-ui/models/lookup/dynamic-lookup.component.ts
#	src/app/shared/form/builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.component.ts
#	src/app/shared/form/builder/ds-dynamic-form-ui/models/tag/dynamic-tag.component.spec.ts
#	src/app/shared/form/builder/ds-dynamic-form-ui/models/tag/dynamic-tag.component.ts
#	src/app/shared/form/builder/ds-dynamic-form-ui/models/typeahead/dynamic-typeahead.component.ts
#	src/app/shared/form/builder/form-builder.service.spec.ts
#	src/app/shared/form/form.service.spec.ts
#	src/app/shared/notifications/notification/notification.component.spec.ts
#	src/app/shared/services/route.service.spec.ts
#	src/app/shared/services/route.service.ts
#	src/app/shared/shared.module.ts
#	yarn.lock
2018-12-13 20:28:11 +01:00
Giuseppe Digilio
2d20d524de Manage different level of confidence in the submission 2018-12-13 15:36:09 +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
0c4784346b progress vertical menu 2018-11-14 15:56:23 +01: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
Giuseppe
618e689258 Intermediate commit detect duplicate 2018-10-10 11:55:48 +02:00
lotte
e025f3bc4d Merge branch 'master' into resolvers-branch-angular6
Conflicts:
	package.json
	src/app/+search-page/search-filters/search-filters.component.ts
	src/app/core/auth/auth.effects.ts
	src/app/core/auth/auth.service.ts
	src/app/core/auth/server-auth.service.ts
	src/app/core/data/comcol-data.service.ts
	src/app/core/data/community-data.service.ts
	src/app/core/data/data.service.ts
	src/app/core/data/item-data.service.ts
	src/app/core/shared/dspace-object.model.ts
	src/app/header/header.component.spec.ts
	src/app/shared/auth-nav-menu/auth-nav-menu.component.ts
	src/app/shared/testing/auth-service-stub.ts
	yarn.lock
2018-10-08 12:28:08 +02:00
lotte
777facf5cd intermediate commit 2018-08-29 15:12: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