lotte
|
36ec68fd33
|
Merge branch 'master' into w2p-65195_dynamic-component-refactoring
|
2019-11-07 14:23:36 +01:00 |
|
Tim Donohue
|
959134fc89
|
Merge pull request #496 from atmire/Name-variants-on-item-pages
Name variants on item pages
|
2019-11-05 09:55:13 -06:00 |
|
lotte
|
bc358ec954
|
Merge branch 'master' into w2p-65195_dynamic-component-refactoring
|
2019-10-17 12:49:50 +02:00 |
|
lotte
|
437dce9b15
|
Merge branch 'master' into w2p-65195_dynamic-component-refactoring
|
2019-10-16 15:48:39 +02:00 |
|
lotte
|
d962e40c58
|
added TypeDoc
|
2019-10-16 11:21:25 +02:00 |
|
L. Henze
|
8f2a942536
|
Merge branch 'master' into 460-coll-pages
|
2019-10-15 10:57:35 -04:00 |
|
Kristof De Langhe
|
f1b4b57cdb
|
65529: AoT build error fixes
|
2019-10-15 13:58:03 +02:00 |
|
lotte
|
0fb12c4274
|
refactored mydspace/listelements etc
|
2019-10-08 15:51:31 +02:00 |
|
lotte
|
a1f144aa0b
|
replaced type input by getRenderType method
|
2019-10-04 16:06:59 +02:00 |
|
lotte
|
9badabade6
|
Split typed list/grid elements into normal and search result
|
2019-10-03 16:26:58 +02:00 |
|
lotte
|
5b6aa951ad
|
continued refactoring listable objects
|
2019-10-02 15:43:19 +02:00 |
|
L. Henze
|
01212750bf
|
handle component
|
2019-09-17 17:08:09 -04:00 |
|
Kristof De Langhe
|
4f6c3c0a9b
|
Merge branch 'master' into w2p-62589_Item-mapper-update
Conflicts:
src/app/+item-page/edit-item-page/edit-item-page.module.ts
src/app/+item-page/edit-item-page/edit-item-page.routing.module.ts
src/app/+item-page/item-page.module.ts
src/app/core/data/item-data.service.ts
src/app/shared/shared.module.ts
|
2019-09-16 13:36:42 +02:00 |
|
Yana De Pauw
|
ee76c256f8
|
Merge branch 'master' into Move-item-component
|
2019-09-09 11:06:16 +02:00 |
|
Kristof De Langhe
|
04f57b753e
|
Merge branch 'master' into w2p-62589_Item-mapper-update
Conflicts:
src/app/app.reducer.ts
src/app/shared/shared.module.ts
|
2019-09-05 14:16:13 +02:00 |
|
Yana De Pauw
|
7d4987da5c
|
Merge branch 'master' into Move-item-component
Conflicts:
resources/i18n/en.json
src/app/+item-page/edit-item-page/item-metadata/edit-in-place-field/edit-in-place-field.component.spec.ts
src/app/+item-page/edit-item-page/item-metadata/edit-in-place-field/edit-in-place-field.component.ts
|
2019-08-12 15:30:04 +02:00 |
|
Yana De Pauw
|
5c101d116a
|
63838: Refactor input suggestions to support DSpaceObjects as suggestions
|
2019-08-08 15:43:29 +02:00 |
|
Kristof De Langhe
|
3868b0aaae
|
Merge branch 'master' into w2p-62589_Item-mapper-update
|
2019-06-07 16:35:40 +02:00 |
|
Kristof De Langhe
|
16bad82564
|
62741: Entities grid templates - publication, orgunit, person, project
|
2019-06-06 18:00:54 +02:00 |
|
Kristof De Langhe
|
41e14e176c
|
Merge branch 'master' into w2p-62589_Item-mapper-update
Conflicts:
resources/i18n/en.json
src/app/+collection-page/collection-page-routing.module.ts
src/app/+collection-page/collection-page.module.ts
src/app/+community-page/community-page.component.ts
src/app/+item-page/edit-item-page/edit-item-page.component.ts
src/app/+item-page/edit-item-page/edit-item-page.module.ts
src/app/+item-page/edit-item-page/edit-item-page.routing.module.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.spec.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-status/item-status.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/+item-page/item-page-routing.module.ts
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-service/search.service.ts
src/app/app.reducer.ts
src/app/core/auth/auth-response-parsing.service.ts
src/app/core/auth/auth.service.ts
src/app/core/auth/server-auth.service.ts
src/app/core/cache/builders/remote-data-build.service.ts
src/app/core/cache/object-cache.service.ts
src/app/core/core.module.ts
src/app/core/data/collection-data.service.ts
src/app/core/data/data.service.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/data/request.reducer.ts
src/app/core/data/request.service.spec.ts
src/app/core/data/request.service.ts
src/app/core/index/index.effects.ts
src/app/core/index/index.reducer.ts
src/app/core/metadata/metadata.service.spec.ts
src/app/core/shared/operators.spec.ts
src/app/core/shared/operators.ts
src/app/header/header.component.spec.ts
src/app/shared/shared.module.ts
|
2019-05-28 16:15:47 +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 |
|