Kristof De Langhe
404729faa3
64503: Feedback 2019-10-24 ; loading, message fix, notification clearing
2019-10-31 12:41:03 +01:00
Kristof De Langhe
dc9520a832
Merge branch 'master' into w2p-64503_Edit-collection-Content-Source-2
...
Conflicts:
resources/i18n/en.json5
src/app/core/core.module.ts
src/app/core/data/collection-data.service.spec.ts
src/app/core/data/collection-data.service.ts
src/app/core/data/request.models.ts
src/app/shared/shared.module.ts
2019-10-29 17:36:42 +01:00
lotte
f79e210959
Merge branch 'w2p-65195_dynamic-component-refactoring' into clean-relationships-in-submission
2019-10-17 12:49:22 +02:00
L. Henze
8f2a942536
Merge branch 'master' into 460-coll-pages
2019-10-15 10:57:35 -04:00
Kristof De Langhe
e7b72d6df7
Merge branch 'master' into w2p-64574_Item-page-entities
...
Conflicts:
src/app/core/data/relationship.service.spec.ts
2019-10-08 13:40:28 +02:00
Kristof De Langhe
5b776b605a
62589: Review 03-10-2019 Changes and fixes
2019-10-08 13:06:31 +02:00
Kristof De Langhe
0cd8a4ebcd
Merge branch 'w2p-63669_Edit-Col/Com-Tabs' into w2p-65240_Community-and-collection-logos
...
Conflicts:
resources/i18n/en.json5
src/app/+collection-page/edit-collection-page/edit-collection-page.component.html
src/app/+collection-page/edit-collection-page/edit-collection-page.component.spec.ts
src/app/+collection-page/edit-collection-page/edit-collection-page.component.ts
src/app/+community-page/edit-community-page/edit-community-page.component.html
src/app/+community-page/edit-community-page/edit-community-page.component.spec.ts
src/app/+community-page/edit-community-page/edit-community-page.component.ts
src/app/shared/comcol-forms/edit-comcol-page/edit-comcol-page.component.spec.ts
src/app/shared/comcol-forms/edit-comcol-page/edit-comcol-page.component.ts
2019-10-07 13:39:53 +02:00
Kristof De Langhe
97de2b8ef3
Merge branch 'master' into w2p-63669_Edit-Col/Com-Tabs
...
Conflicts:
resources/i18n/en.json
src/app/shared/comcol-forms/edit-comcol-page/edit-comcol-page.component.spec.ts
src/app/shared/shared.module.ts
2019-10-03 13:46:11 +02:00
Kristof De Langhe
37a18fdaa7
65240: Success notification on submitting comcol form
2019-10-02 13:40:06 +02:00
Kristof De Langhe
ecef1b35d1
65240: Delete logo button and service method
2019-10-01 16:12:08 +02:00
Kristof De Langhe
a2695edbac
65240: Add community/collection logo on create/edit pages
2019-10-01 14:42:25 +02:00
Kristof De Langhe
b8a466d12b
62589: Loading components for item and collection select lists
2019-09-30 16:17:18 +02:00
Kristof De Langhe
145ed346c8
62589: Feedback improvements and fixes
2019-09-27 16:40:47 +02:00
Kristof De Langhe
a87dc89ff1
Merge branch 'master' into w2p-62589_Item-mapper-update
...
Conflicts:
resources/i18n/en.json5
2019-09-19 17:29:32 +02:00
L. Henze
b91220368c
Alternate default text
2019-09-18 16:37:58 -04:00
L. Henze
8cec08b29f
118n keys
2019-09-18 13:41:32 -04:00
L. Henze
af3005c863
wip
2019-09-17 17:19:34 -04:00
Art Lowel
ed958c1232
Merge branch 'master' into improve-i18n-files
2019-09-16 16:57:17 +02: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
helix84
6c0aaa7bee
Update cs.json5
2019-09-16 08:28:56 +02:00
Art Lowel
154fc83930
fix typo
2019-09-12 17:14:19 +02:00
Art Lowel
b186ec635e
Merge branch 'master' into improve-i18n-files
2019-09-12 17:13:43 +02:00
Yana De Pauw
ee76c256f8
Merge branch 'master' into Move-item-component
2019-09-09 11:06:16 +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
e6a051e9c6
Merge branch 'master' into w2p-64574_Item-page-entities
2019-09-05 15:43:59 +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
11ad52c120
finished second selection tab
2019-09-04 15:45:08 +02:00
lhenze
64db1c242e
New key created for *no recent items in this collection*
2019-09-03 17:02:09 -04:00
lotte
dc3302e73b
Merge branch 'w2p-64574_Item-page-entities' into w2p-62849_relationships-in-submission
2019-08-28 14:28:06 +02:00
lotte
35056959bb
test fixes
2019-08-28 13:05:46 +02:00
lotte
89be29ad7f
solved issues after merge
2019-08-27 16:48:18 +02:00
Kristof De Langhe
4afb35c53e
64574: View-more/less for related-items + refactoring item pages
2019-08-27 14:12:39 +02:00
Kristof De Langhe
ff2083941a
64503: Removal of unnecessary messages
2019-08-21 14:42:35 +02:00
Kristof De Langhe
1b9bc2f7a3
64503: Content Source PUT request on form submit
2019-08-20 17:28:28 +02:00
Kristof De Langhe
764f532b99
64503: Content Source fetched from API
2019-08-20 16:25:40 +02:00
Kristof De Langhe
2d3dfde6bb
Merge branch 'master' into w2p-64503_Edit-collection-Content-Source-2
...
Conflicts:
config/environment.default.js
resources/i18n/en.json
src/app/shared/comcol-forms/edit-comcol-page/edit-comcol-page.component.spec.ts
src/config/global-config.interface.ts
2019-08-20 12:43:16 +02:00
Yana De Pauw
88c8fddbce
Fix to message, margin and deletion page reset
2019-08-19 17:25:41 +02:00
Yana De Pauw
1d05680126
Implement feedback
...
Change padding into margin
Change 'Create link' to a button
Add placeholder to extension field
Fix pagination
2019-08-16 13:00:04 +02:00
Yana De Pauw
863189b2e5
fix missing , in messages file
2019-08-14 11:48:51 +02:00
Yana De Pauw
67feaf3178
Merge branch 'master' into Bitstream-format-registries
...
Conflicts:
resources/i18n/en.json
2019-08-14 11:24:45 +02:00
Yana De Pauw
295bbc5c40
flatten en.json
2019-08-14 11:22:36 +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
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
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
ad863b62a7
63838: Fix feedback
...
Add a title to the move page
Disable submit button when no target is selected
Add operation in progress indicator
Use updated inputSuggestion to fix bug with value selection
2019-08-08 15:44:54 +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
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
Art Lowel
359cb10fa3
add json5 support
2019-07-26 17:21:57 +02:00
