Kristof De Langhe
|
904228127e
|
Merge remote-tracking branch 'atmire/clean-relationships-in-submission' into w2p-67478_Search-external-sources-in-submission
Conflicts:
src/app/+item-page/simple/related-items/related-items-component.ts
src/app/+search-page/configuration-search-page.component.ts
src/app/+search-page/search-page.module.ts
src/app/+search-page/search-tracker.component.ts
src/app/+search-page/search.component.ts
src/app/app.reducer.ts
src/app/core/data/data.service.ts
src/app/core/data/relationship.service.ts
src/app/core/services/route.service.ts
src/app/core/utilities/equatable.ts
src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component.ts
src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/search-tab/dynamic-lookup-relation-search-tab.component.ts
src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/selection-tab/dynamic-lookup-relation-selection-tab.component.ts
src/app/shared/form/builder/models/relationship-options.model.ts
|
2019-12-19 11:55:28 +01:00 |
|
lotte
|
b98cec011b
|
added documentation for endpoint mock service
|
2019-12-19 11:15:44 +01:00 |
|
lotte
|
c54faf69b1
|
Merge branch 'master' into clean-relationships-in-submission
|
2019-12-16 10:45:21 +01:00 |
|
Kristof De Langhe
|
b51218ad5f
|
Merge branch 'master' into w2p-67478_Search-external-sources-in-submission
Conflicts:
src/app/+collection-page/collection-page.module.ts
src/app/+item-page/simple/related-entities/related-entities-search/related-entities-search.component.html
src/app/+item-page/simple/related-items/related-items-component.ts
src/app/+search-page/configuration-search-page.component.spec.ts
src/app/+search-page/configuration-search-page.component.ts
src/app/+search-page/filtered-search-page.component.spec.ts
src/app/+search-page/filtered-search-page.component.ts
src/app/+search-page/search-page.component.html
src/app/+search-page/search-page.component.ts
src/app/+search-page/search-page.module.ts
src/app/+search-page/search.component.spec.ts
src/app/app.reducer.ts
src/app/core/data/data.service.spec.ts
src/app/core/data/data.service.ts
src/app/core/data/relationship.service.ts
src/app/core/shared/search/search-configuration.service.ts
src/app/core/shared/search/search.service.ts
|
2019-12-06 11:56:28 +01:00 |
|
Kristof De Langhe
|
edbc32604d
|
67478: LookupRelationService, external source tabs, list implementation
|
2019-12-02 17:07:28 +01:00 |
|
Kristof De Langhe
|
de4b32dcad
|
67478: Intermediate commit - Basic components
|
2019-11-29 17:51:27 +01:00 |
|
lotte
|
d1ba3d9936
|
Merge branch 'master' into clean-relationships-in-submission
|
2019-11-29 08:52:10 +01:00 |
|
Antoine Snyers
|
dfa846a98e
|
Track page views and searches in DSpace with a custom Angulartics2 provider
|
2019-11-28 09:54:39 +01:00 |
|
lotte
|
f79e210959
|
Merge branch 'w2p-65195_dynamic-component-refactoring' into clean-relationships-in-submission
|
2019-10-17 12:49:22 +02:00 |
|
Kristof De Langhe
|
8b5a3ac9b3
|
Merge branch 'master' of https://git.atmire.com/contributions/dspace-angular into w2p-62589_Item-mapper-update
|
2019-09-11 10:09:35 +02:00 |
|
lotte
|
2b24caba34
|
Merge branch 'master' into w2p-62355_optimize-search-performance
|
2019-09-06 15:22:44 +02:00 |
|
Kristof De Langhe
|
7fe0db7d7c
|
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/+search-page/search-service/search.service.ts
|
2019-09-06 12:52:36 +02:00 |
|
benbosman
|
c4c6de66de
|
Merge pull request #402 from atmire/Item-Relations-Edit-Delete
Item relations edit delete
|
2019-09-05 15:59:41 +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 |
|
lotte
|
b634799ef9
|
Merge branch 'master' into w2p-62355_optimize-search-performance
|
2019-09-05 10:16:51 +02:00 |
|
lotte
|
addc6618ba
|
solved issues with radiobuttons
|
2019-08-29 16:29:55 +02:00 |
|
lotte
|
85279c5601
|
solved tests
|
2019-08-28 16:58:21 +02:00 |
|
lotte
|
4d67c98f04
|
Merge branch 'master' into w2p-62849_relationships-in-submission
|
2019-08-27 16:41:37 +02:00 |
|
lotte
|
62880336d9
|
Merge branch 'master' into w2p-62355_optimize-search-performance
|
2019-08-14 12:31:07 +02:00 |
|
Kristof De Langhe
|
9afcd48f12
|
Merge branch 'master' into w2p-64225_Relations-delete-feedback-3
Conflicts:
resources/i18n/en.json
src/app/+item-page/edit-item-page/item-metadata/item-metadata.component.ts
src/app/+search-page/search-service/search.service.ts
src/app/core/core.module.ts
src/app/core/shared/item.model.ts
|
2019-08-13 12:03:29 +02:00 |
|
Kristof De Langhe
|
26e25069ad
|
62589: PR Feedback
|
2019-08-12 16:41:56 +02:00 |
|
Kristof De Langhe
|
2f0a5a4065
|
Merge branch 'master' into w2p-62589_Item-mapper-update
Conflicts:
resources/i18n/en.json
src/app/+search-page/search-service/search.service.ts
src/app/core/core.module.ts
|
2019-08-12 15:23:43 +02:00 |
|
Yana De Pauw
|
c325e6d61b
|
Merge branch 'master' into w2p-62769_Bitstream-format-registry
Conflicts:
src/app/+admin/admin-registries/bitstream-formats/bitstream-formats.component.spec.ts
src/app/core/core.module.ts
src/app/core/registry/registry-bitstreamformats-response.model.ts
src/app/core/registry/registry.service.ts
src/app/core/shared/bitstream-format.model.ts
|
2019-08-06 17:22:03 +02:00 |
|
Yana De Pauw
|
279b80b4de
|
62769: Bitstream format registry
|
2019-08-05 13:14:03 +02:00 |
|
lotte
|
8ece6bf79f
|
creating relationship type service
|
2019-08-02 16:43:25 +02:00 |
|
Kristof De Langhe
|
6f347868ff
|
Merge branch 'master' into w2p-63469_Relations-delete-feedback-2
Conflicts:
src/app/+item-page/simple/item-types/shared/item-relationships-utils.ts
|
2019-07-30 10:34:22 +02:00 |
|
lotte
|
650b77081f
|
Merge branch 'master' into w2p-62849_relationships-in-submission
|
2019-07-26 10:01:50 +02:00 |
|
lotte
|
f4ee930c4a
|
fixing more routing issues
|
2019-07-25 15:41:13 +02:00 |
|
lotte
|
0d34152398
|
Merge branch 'master' into w2p-62355_optimize-search-performance
|
2019-07-25 14:44:04 +02:00 |
|
lotte
|
170377f209
|
62849: fixed routing issues
|
2019-07-23 16:51:06 +02:00 |
|
lotte
|
200b29f6f8
|
Merge branch 'master' into object-factory-refactoring
Conflicts:
src/app/submission/sections/upload/section-upload.component.spec.ts
|
2019-07-19 09:08:03 +02:00 |
|
lotte
|
aff3f3df03
|
solved issues with browse pages
|
2019-07-18 16:28:07 +02:00 |
|
lotte
|
651b4100dd
|
solved issue with submission
|
2019-07-17 13:47:59 +02:00 |
|
lotte
|
f91e52f1ad
|
61949: fixed bug with adding a new md field
|
2019-07-15 09:59:29 +02:00 |
|
lotte
|
b1585ac7f2
|
progress july 11 - store/selection to object list
|
2019-07-11 15:09:28 +02:00 |
|
lotte
|
42c690dfd4
|
moved search module contents to shared
|
2019-07-10 13:17:28 +02:00 |
|
lotte
|
d55bcc93bb
|
62849: enabled mock service in prod mode
|
2019-07-09 12:12:08 +02:00 |
|
lotte
|
f420cca78c
|
layout changes, result list, fixed prod build
|
2019-07-09 12:11:04 +02:00 |
|
lotte
|
998a7107a8
|
Merge branch 'w2p-63184_Relations-delete-feedback-1' into w2p-62849_relationships-in-submission
|
2019-07-05 13:37:28 +02:00 |
|
lotte
|
0746aaed43
|
added JSON response, created new submission section
|
2019-06-25 16:35:26 +02:00 |
|
lotte
|
deef684d70
|
Added response mocking service
|
2019-06-25 13:25:26 +02:00 |
|
Alexander Sulfrian
|
9ed8722169
|
Add missing ResourcePolicyService
|
2019-06-18 16:20:55 +02:00 |
|
lotte
|
bb76015aa1
|
Solved issue with non-existing search pages
|
2019-06-18 08:58:35 +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 |
|
lotte
|
35f73708ef
|
fixed issues after merging
|
2019-05-27 15:09:51 +02:00 |
|
lotte
|
233909d6ca
|
Merge branch 'master' into w2p-61949_object-factory-refactoring
Conflicts:
src/app/core/cache/models/normalized-object-factory.ts
src/app/core/cache/response.models.ts
src/app/core/core.module.ts
src/app/core/data/base-response-parsing.service.ts
src/app/core/shared/resource-type.ts
src/app/core/submission/submission-response-parsing.service.ts
|
2019-05-24 15:42:24 +02:00 |
|
Kristof De Langhe
|
796afb3919
|
Merge branch 'master' into w2p-61142_Relations-add-edit-delete-and-permissions
Conflicts:
src/app/core/cache/object-cache.service.ts
src/app/core/core.module.ts
src/app/core/data/request.service.ts
src/app/core/shared/item.model.ts
|
2019-05-20 13:08:33 +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 |
|
lotte
|
b2ceb8e9d6
|
61949: finished refactoring, adding type doc
|
2019-04-29 16:21:36 +02:00 |
|
lotte
|
a5086b8d11
|
61949: replacing object factories with decorator
|
2019-04-24 16:51:46 +02:00 |
|