lotte
|
170377f209
|
62849: fixed routing issues
|
2019-07-23 16:51:06 +02:00 |
|
lotte
|
42c690dfd4
|
moved search module contents to shared
|
2019-07-10 13:17:28 +02:00 |
|
lotte
|
96959b401c
|
added new input field type and started on lookup modal
|
2019-06-26 16:46:15 +02:00 |
|
Kristof De Langhe
|
e9bfb77300
|
Merge branch 'master' into w2p-62264_Group-logical-entity-types-together
|
2019-05-20 10:09:20 +02:00 |
|
Kristof De Langhe
|
0390f67d01
|
Merge branch 'master' into w2p-62372_Final-master-merge
Conflicts:
config/environment.default.js
resources/i18n/en.json
src/app/+search-page/paginated-search-options.model.ts
src/app/+search-page/search-filters/search-filter/search-filter.service.spec.ts
src/app/+search-page/search-options.model.ts
src/app/+search-page/search-page.component.spec.ts
src/app/+search-page/search-page.component.ts
src/app/+search-page/search-page.module.ts
src/app/+search-page/search-service/search-configuration.service.ts
src/app/core/cache/response.models.ts
src/app/shared/object-list/search-result-list-element/item-search-result/item-search-result-list-element.component.spec.ts
src/app/shared/object-list/search-result-list-element/search-result-list-element.component.ts
src/app/shared/object-list/wrapper-list-element/wrapper-list-element.component.ts
src/app/shared/services/route.service.ts
|
2019-05-13 12:47:21 +02:00 |
|
Kristof De Langhe
|
2166e0633c
|
62264: Grouped logical entity types together into separate modules
|
2019-05-09 17:51:11 +02:00 |
|
Art Lowel
|
21953a07d8
|
fix issue where ItemMetadataRepresentations didn't get their entity type from the item
|
2019-04-30 11:22:44 +02:00 |
|
Giuseppe Digilio
|
330a70657d
|
Refactored ItemDetailPreviewComponent
|
2019-04-05 16:33:58 +02:00 |
|
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 |
|
Kristof De Langhe
|
9766a65c3a
|
Merge branch 'master' into w2p-61493_Configurable-entities-master-merge
Conflicts:
src/app/+item-page/item-page.module.ts
src/app/+search-page/search-filters/search-filter/search-filter.service.ts
src/app/+search-page/search-page.component.ts
src/app/+search-page/search-page.module.ts
src/app/core/shared/dspace-object.model.ts
src/app/core/shared/item.model.ts
src/app/core/shared/metadata.models.ts
src/app/core/shared/resource-type.ts
src/app/shared/services/route.service.spec.ts
src/app/shared/services/route.service.ts
src/app/thumbnail/thumbnail.component.html
|
2019-04-01 15:52:53 +02:00 |
|
Art Lowel
|
8996716d71
|
Merge remote-tracking branch 'upstream/master' into configurable_entities
|
2019-03-29 13:23:05 +01: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 |
|
Tim Donohue
|
f396da34b4
|
Merge branch 'master' into configurable_entities
|
2019-03-15 15:11:53 -05:00 |
|
Kristof De Langhe
|
6c3fb556d8
|
Merge remote-tracking branch 'atmire/mixing-text-authority-entities' into w2p-61133_Merge-345-and-master
Conflicts:
src/app/+collection-page/collection-page.component.ts
src/app/+collection-page/collection-page.module.ts
src/app/+item-page/field-components/metadata-uri-values/metadata-uri-values.component.ts
src/app/+item-page/field-components/metadata-values/metadata-values.component.ts
src/app/+item-page/simple/field-components/specific-field/item-page-field.component.html
src/app/+item-page/simple/field-components/specific-field/uri/item-page-uri-field.component.html
src/app/+search-page/search-service/search.service.ts
src/app/core/core.module.ts
src/app/core/data/base-response-parsing.service.ts
src/app/core/data/data.service.ts
src/app/core/data/request.service.spec.ts
src/app/core/metadata/metadata.service.spec.ts
src/app/core/shared/dspace-object.model.ts
src/app/core/shared/metadatum.model.ts
src/app/core/shared/operators.ts
src/app/core/shared/resource-type.ts
src/app/shared/object-list/item-list-element/item-list-element.component.html
src/app/shared/object-list/item-list-element/item-list-element.component.spec.ts
src/app/shared/object-list/search-result-list-element/item-search-result/item-search-result-list-element.component.html
src/app/shared/object-list/search-result-list-element/item-search-result/item-search-result-list-element.component.spec.ts
src/app/shared/object-list/search-result-list-element/search-result-list-element.component.ts
src/app/shared/services/route.service.ts
src/app/shared/shared.module.ts
|
2019-03-15 09:59:30 +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 |
|
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 |
|
Art Lowel
|
57999ad382
|
add the ability to mix text based metadata fields, authority controlled fields and typed items in the same section
|
2019-01-21 18:27:07 +01:00 |
|