lotte
|
8bf241c182
|
angular cli
|
2020-03-18 16:03:40 +01:00 |
|
Kristof De Langhe
|
30c7e563f5
|
68729: Edit version history page as tab, removed sidebar link, added under-construction notice
|
2020-03-17 16:01:00 +01:00 |
|
Kristof De Langhe
|
0f55ee8adb
|
68346: Replace Bundle dropdown with combobox + edit-bistream cache fix
|
2020-03-13 17:52:46 +01:00 |
|
lotte
|
0175b50d48
|
applied feedback
|
2020-03-12 12:49:48 +01:00 |
|
lotte
|
401393c8bd
|
grid view for admin search results
|
2020-03-10 10:49:18 +01:00 |
|
lotte
|
6c7780ca56
|
fixed translation service issues
|
2020-03-09 11:15:48 +01:00 |
|
lotte
|
f5a66c2266
|
added missing translation helper for facets
|
2020-03-06 16:22:04 +01:00 |
|
lotte
|
d5484e5c89
|
created admin search page
|
2020-03-06 13:54:46 +01:00 |
|
Kristof De Langhe
|
a054938d80
|
Merge branch 'master' into w2p-68346_Bundles-in-edit-item-Updates
Conflicts:
package.json
src/app/+item-page/item-page-routing.module.ts
src/app/core/cache/builders/remote-data-build.service.ts
src/app/core/cache/server-sync-buffer.effects.ts
src/app/core/core.module.ts
src/app/core/data/bitstream-data.service.ts
src/app/core/data/bundle-data.service.ts
src/app/core/data/data.service.ts
src/app/core/data/dso-change-analyzer.service.ts
src/app/core/data/item-data.service.ts
src/app/core/data/object-updates/object-updates.actions.ts
src/app/core/shared/bitstream.model.ts
src/app/core/shared/dspace-object.model.ts
src/app/shared/mocks/mock-request.service.ts
src/app/shared/shared.module.ts
yarn.lock
|
2020-03-05 17:21:38 +01:00 |
|
Kristof De Langhe
|
305c4ce882
|
68954: Display claimed task actions depending on config from REST API
Conflicts:
src/app/core/core.module.ts
src/app/shared/mydspace-actions/claimed-task/claimed-task-actions.component.html
|
2020-03-04 14:38:20 +01:00 |
|
Giuseppe Digilio
|
076ee8b26d
|
Merge remote-tracking branch 'remotes/origin/master' into shibboleth
# Conflicts:
# src/app/core/auth/auth.service.ts
# src/app/core/auth/models/auth-status.model.ts
# src/app/core/auth/models/normalized-auth-status.model.ts
# src/app/core/auth/server-auth.service.ts
# src/app/core/core.module.ts
# src/app/shared/shared.module.ts
|
2020-02-25 17:31:07 +01:00 |
|
Kristof De Langhe
|
0cb606877b
|
Merge branch 'master' into w2p-68729_List-version-history
Conflicts:
src/app/shared/shared.module.ts
|
2020-02-21 14:30:50 +01:00 |
|
Kristof De Langhe
|
29ff18264c
|
68729: Edit Item Version History page + sidebar menu option - moving item-versions component to shared module
|
2020-02-19 17:58:23 +01:00 |
|
lotte
|
04cb75e786
|
upgraded to angular 8
|
2020-02-13 11:09:20 +01:00 |
|
Giuseppe Digilio
|
c1db19ee03
|
Merge remote-tracking branch 'remotes/origin/master' into shibboleth
# Conflicts:
# src/app/shared/shared.module.ts
|
2020-02-07 15:04:12 +01:00 |
|
Kristof De Langhe
|
5e93a89678
|
68346: PaginatedDragAndDropBitstreamList component and refactoring item-edit-bitstream-bundle using this new component ; removed pagination-drag-and-drop
|
2020-02-06 16:57:17 +01:00 |
|
Kristof De Langhe
|
2795c1ecc7
|
68346: initial Drag-And-Drop pagination component + paginated custom-order support in field-updates store - Intermediate commit
|
2020-02-05 18:04:10 +01:00 |
|
Kristof De Langhe
|
b2ef5ee2fa
|
Merge branch 'master' into w2p-68346_Bundles-in-edit-item-Updates
Conflicts:
package.json
resources/i18n/en.json5
src/app/+item-page/item-page.module.ts
src/app/core/core.module.ts
src/app/core/data/bundle-data.service.ts
src/app/core/data/data.service.spec.ts
src/app/core/data/data.service.ts
src/app/core/data/item-data.service.ts
src/app/core/data/object-updates/object-updates.service.ts
src/app/core/shared/hal-endpoint.service.ts
src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.ts
src/app/shared/mocks/mock-request.service.ts
src/app/shared/shared.module.ts
src/app/shared/trackable/abstract-trackable.component.ts
yarn.lock
|
2020-01-24 14:21:20 +01:00 |
|
Giuseppe Digilio
|
eb866d85ef
|
Fixed merge
|
2020-01-17 12:12:03 +01:00 |
|
Giuseppe Digilio
|
29b2e89625
|
Merge remote-tracking branch 'remotes/origin/master' into shibboleth
# Conflicts:
# src/app/core/auth/auth.interceptor.ts
# src/app/shared/auth-nav-menu/auth-nav-menu.component.html
# src/app/shared/shared.module.ts
|
2020-01-17 12:11:46 +01:00 |
|
Kristof De Langhe
|
7b3a2e9dc8
|
Merge branch 'master' into w2p-67611_Convert-external-source-to-entity
Conflicts:
src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.ts
src/app/shared/shared.module.ts
|
2020-01-16 17:54:12 +01:00 |
|
lotte
|
4c23d01567
|
Merge branch 'master' into reorder-name-variants
|
2020-01-16 09:30:31 +01:00 |
|
Kristof De Langhe
|
d8bdd768ca
|
Merge branch 'w2p-67478_Search-external-sources-in-submission' into w2p-67611_Convert-external-source-to-entity
|
2020-01-14 13:07:24 +01:00 |
|
Kristof De Langhe
|
4ba3b01997
|
Merge branch 'master' into w2p-67478_Search-external-sources-in-submission
Conflicts:
src/app/core/data/data.service.ts
src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/search-tab/dynamic-lookup-relation-search-tab.component.ts
|
2020-01-14 12:46:55 +01:00 |
|
lotte
|
02802c0de1
|
Merge branch 'master' into reorder-name-variants
|
2020-01-14 12:40:39 +01:00 |
|
Kristof De Langhe
|
42d12a83ce
|
Merge branch 'master' into w2p-65240_Community-and-collection-logos
Conflicts:
src/app/shared/shared.module.ts
|
2020-01-07 16:11:24 +01:00 |
|
Giuseppe Digilio
|
fdd05d2fec
|
Refactored components' name and added missing tests
|
2020-01-02 18:21:47 +01:00 |
|
Giuseppe Digilio
|
972f0dfd60
|
Merge remote-tracking branch 'remotes/origin/master' into shibboleth
# Conflicts:
# resources/i18n/de.json5
# resources/i18n/en.json5
# src/app/shared/shared.module.ts
|
2020-01-02 11:43:19 +01:00 |
|
Kristof De Langhe
|
7a904f9bf7
|
67611: Refactored import button to separate component within object-collection + moved calling of import modal to external-source tab
|
2019-12-05 14:06:29 +01:00 |
|
Kristof De Langhe
|
0210be1a53
|
67611: External-Source-Entry import window
|
2019-12-04 17:54:01 +01:00 |
|
lotte
|
bc8e7d8fe6
|
reordering authors
|
2019-12-02 15:37:59 +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 |
|
Kristof De Langhe
|
424089312b
|
Merge branch 'master' into w2p-65240_Community-and-collection-logos
|
2019-11-28 11:39:26 +01:00 |
|
Tim Donohue
|
7f44c7751b
|
Merge pull request #513 from atmire/sidebar-refactoring
Sidebar refactoring
|
2019-11-27 10:46:40 -06:00 |
|
Kristof De Langhe
|
4887353450
|
Merge branch 'master' into w2p-65240_Community-and-collection-logos
Conflicts:
resources/i18n/en.json5
|
2019-11-18 14:42:58 +01:00 |
|
lotte
|
efc2c9933a
|
autoselect + small fixes
|
2019-11-18 11:24:01 +01:00 |
|
lotte
|
3b4d8598d5
|
implementing auto select
|
2019-11-15 16:28:41 +01:00 |
|
Antoine Snyers
|
771041a3cf
|
Implement sidebar filter and dropdown components
|
2019-11-14 13:14:47 +01:00 |
|
Antoine Snyers
|
4f7b7637cb
|
Refactor search sidebar
|
2019-11-14 13:14:47 +01:00 |
|
lotte
|
190203cb48
|
add/remove subscriptions for name variants on init/destroy
|
2019-11-12 16:34:26 +01:00 |
|
Kristof De Langhe
|
bb5103518e
|
Merge branch 'master' into w2p-65240_Community-and-collection-logos
Conflicts:
resources/i18n/en.json5
src/app/shared/shared.module.ts
|
2019-11-12 14:39:10 +01:00 |
|
lotte
|
f289c1353e
|
fixed issues with sending name variant update requests to the server
|
2019-11-08 16:05:37 +01:00 |
|
lotte
|
d8a049c550
|
Merge branch 'w2p-65195_dynamic-component-refactoring' into clean-relationships-in-submission
|
2019-11-08 13:55:08 +01:00 |
|
lotte
|
7e62ce80c2
|
Merge branch 'refactor-submission-parsers' into clean-relationships-in-submission
|
2019-11-08 08:49:12 +01:00 |
|
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 |
|
Kristof De Langhe
|
5fa2827d1b
|
Merge branch 'master' into w2p-65717_Bundles-in-edit-item
Conflicts:
src/app/+item-page/edit-item-page/edit-item-page.module.ts
src/app/core/core.module.ts
src/app/core/data/item-data.service.ts
src/app/shared/shared.module.ts
|
2019-10-18 12:42:11 +02:00 |
|
Julius Gruber
|
8d939cd35c
|
Shared module import fixed
|
2019-10-18 09:12:15 +02:00 |
|
Julius Gruber
|
8fbe6ade81
|
Merge conflicts resolved
|
2019-10-18 09:11:22 +02:00 |
|