Tim Donohue
|
17ca2c4a21
|
Merge pull request #965 from atmire/Issue-964-getEntityTypeByLabel-impl
issue 964 properly impl getEntityTypeByLabel
|
2020-12-11 13:56:34 -06:00 |
|
Giuseppe Digilio
|
574caeb528
|
fix lint error
|
2020-12-11 18:55:06 +01:00 |
|
Giuseppe Digilio
|
caa4700d06
|
Fixed merge with main
|
2020-12-11 18:37:24 +01:00 |
|
Giuseppe Digilio
|
dfa91e04fd
|
Merge remote-tracking branch 'remotes/origin/main' into upgrade_angular10
# Conflicts:
# src/app/+item-page/item-page.module.ts
# src/app/core/shared/item.model.ts
# src/app/shared/object-grid/item-grid-element/item-types/item/item-grid-element.component.spec.ts
# src/app/shared/search/search-filters/search-filter/search-authority-filter/search-authority-filter.component.ts
# src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-option/search-facet-option.component.ts
# src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-selected-option/search-facet-selected-option.component.ts
# src/app/shared/search/search-filters/search-filter/search-facet-filter/search-facet-filter.component.ts
# src/app/shared/shared.module.ts
|
2020-12-11 18:13:47 +01:00 |
|
Giuseppe Digilio
|
fcec66ebb7
|
Update dependencies
|
2020-12-11 18:08:43 +01:00 |
|
Tim Donohue
|
f4853972cc
|
Merge pull request #937 from 4Science/comcol-resource-policies
Comcol resource policies
|
2020-12-11 10:02:46 -06:00 |
|
Giuseppe Digilio
|
752e415dce
|
Fixed issue with components extends a component without a super call in the constructor
|
2020-12-11 16:38:47 +01:00 |
|
Giuseppe Digilio
|
c2e0ba9d98
|
fixed issue with failed request of resource policy edit
|
2020-12-11 09:53:37 +01:00 |
|
Giuseppe Digilio
|
f86f95e0f9
|
Merge remote-tracking branch 'remotes/origin/main' into comcol-resource-policies
# Conflicts:
# src/app/shared/shared.module.ts
|
2020-12-11 09:30:38 +01:00 |
|
Tim Donohue
|
63e0c2f29a
|
Merge pull request #967 from atmire/item-view-relationship-query-fix
Item view relationship query fix
|
2020-12-10 16:44:32 -06:00 |
|
Tim Donohue
|
ab9d5b409d
|
Merge pull request #952 from atmire/Filter-queries-correct-operators
Filter queries using correct operators
|
2020-12-10 16:39:02 -06:00 |
|
Tim Donohue
|
f587170a11
|
Merge pull request #951 from atmire/w2p-74199_Admin-search-dialogs
Separate components for untyped items
|
2020-12-10 16:13:22 -06:00 |
|
Andrew Wood
|
06bb213078
|
Issue 964 make solution synchronous
|
2020-12-10 12:49:05 -05:00 |
|
Andrew Wood
|
10e09b69be
|
issue 964 properly impl getEntityTypeByLabel
|
2020-12-10 11:08:22 -05:00 |
|
Yana De Pauw
|
5323477c49
|
Merge remote-tracking branch 'upstream/main' into w2p-74199_Admin-search-dialogs
|
2020-12-10 13:57:18 +01:00 |
|
Kevin Van de Velde
|
c0143c0ece
|
Merge remote-tracking branch 'dspace/main' into item-view-relationship-query-fix
|
2020-12-10 11:04:30 +01:00 |
|
Raf Ponsaerts
|
7610f9cf50
|
Merge remote-tracking branch 'dspace/main' into w2p-74647_Add-meta-generator-page-header
|
2020-12-10 11:03:35 +01:00 |
|
Tim Donohue
|
39582c9243
|
Merge pull request #969 from tdonohue/sync_docker_with_backend
Sync Docker compose scripts with backend (DSpace/DSpace)
|
2020-12-09 17:19:13 -06:00 |
|
Tim Donohue
|
804905d62e
|
Sync Docker compose scripts with backend (DSpace/DSpace)
|
2020-12-09 13:38:17 -06:00 |
|
Giuseppe Digilio
|
b1d851a3a8
|
Fix issue with _font_awesome_imports helper that can't import scss files properly
|
2020-12-09 14:13:30 +01:00 |
|
Kristof De Langhe
|
f7f784157d
|
74647: Add Generator meta tag on all pages
|
2020-12-08 14:51:40 +01:00 |
|
Kevin Van de Velde
|
01d81783fc
|
Fixing an issue where the relationship query did a fuzzy query with UUID's (Test fix)
|
2020-12-08 14:40:48 +01:00 |
|
Kevin Van de Velde
|
9e9c07b9d7
|
Fixing an issue where the relationship query did a fuzzy query with UUID's
|
2020-12-08 14:21:35 +01:00 |
|
Kristof De Langhe
|
2087a20151
|
75058: message fix, badge placement for entity types grid, alerts on full item pages
|
2020-12-08 14:07:20 +01:00 |
|
Yana De Pauw
|
52d11932cb
|
Fix issues with type badges in tests
|
2020-12-08 13:30:31 +01:00 |
|
Kristof De Langhe
|
fa36b3518d
|
75058: multiple badges fix, item alerts, tests
|
2020-12-08 13:07:18 +01:00 |
|
Yana De Pauw
|
1cc9349608
|
Merge remote-tracking branch 'upstream/main' into w2p-74199_Admin-search-dialogs
|
2020-12-08 10:59:09 +01:00 |
|
Kristof De Langhe
|
d50dd12d3d
|
75058: Added Withdrawn and Private badges for item list/grid components everywhere
|
2020-12-07 17:54:30 +01:00 |
|
Kristof De Langhe
|
be05647e5d
|
74647: Generator meta
|
2020-12-07 16:42:33 +01:00 |
|
Giuseppe Digilio
|
6da28c1e29
|
Temporary disable import for themed scss variables
|
2020-12-07 14:32:44 +01:00 |
|
Giuseppe Digilio
|
eed458569f
|
Fix issue with sass-loader options
|
2020-12-07 14:28:57 +01:00 |
|
Giuseppe Digilio
|
5db5e0978a
|
update sass-resources-loader
|
2020-12-07 11:27:59 +01:00 |
|
Giuseppe Digilio
|
84840678d2
|
Several fixes after merge with main
|
2020-12-04 14:16:40 +01:00 |
|
Giuseppe Digilio
|
948e002225
|
Merge remote-tracking branch 'remotes/origin/main' into upgrade_angular10
# Conflicts:
# package.json
# server.ts
# src/app/+admin/admin-access-control/epeople-registry/epeople-registry.component.ts
# src/app/+admin/admin-access-control/group-registry/group-form/group-form.component.ts
# src/app/+admin/admin-access-control/group-registry/groups-registry.component.spec.ts
# src/app/+admin/admin-access-control/group-registry/groups-registry.component.ts
# src/app/+collection-page/collection-page.component.ts
# src/app/+item-page/edit-item-page/item-page-reinstate.guard.ts
# src/app/+item-page/edit-item-page/item-page-withdraw.guard.ts
# src/app/+item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.ts
# src/app/+item-page/edit-item-page/item-relationships/item-relationships.component.ts
# src/app/+item-page/item-page-administrator.guard.ts
# src/app/app-routing.module.ts
# src/app/community-list-page/community-list-service.ts
# src/app/core/data/entity-type.service.ts
# src/app/core/data/feature-authorization/feature-authorization-guard/dso-page-feature.guard.spec.ts
# src/app/core/data/feature-authorization/feature-authorization-guard/feature-authorization.guard.spec.ts
# src/app/core/data/feature-authorization/feature-authorization-guard/feature-authorization.guard.ts
# src/app/core/data/feature-authorization/feature-authorization-guard/site-administrator.guard.ts
# src/app/core/data/feature-authorization/feature-authorization-guard/site-register.guard.ts
# src/app/core/data/object-updates/object-updates.reducer.ts
# src/app/core/shared/operators.ts
# src/app/process-page/detail/process-detail.component.ts
# src/app/shared/comcol-forms/delete-comcol-page/delete-comcol-page.component.ts
# src/app/shared/dso-selector/dso-selector/dso-selector.component.ts
# src/app/shared/input-suggestions/filter-suggestions/filter-input-suggestions.component.ts
# src/app/shared/object-grid/grid-thumbnail/grid-thumbnail.component.ts
# src/app/shared/shared.module.ts
# yarn.lock
|
2020-12-04 11:36:48 +01:00 |
|
Giuseppe Digilio
|
79fa93bea9
|
Set providedIn root for services using inject tokens
|
2020-12-04 11:18:59 +01:00 |
|
Giuseppe Digilio
|
0f77e5cd92
|
Merge remote-tracking branch 'remotes/origin/main' into comcol-resource-policies
|
2020-12-04 10:52:30 +01:00 |
|
Giuseppe Digilio
|
18a07b571b
|
Fix build error
|
2020-12-04 10:46:54 +01:00 |
|
Giuseppe Digilio
|
20b5721e3c
|
Fixed lint errors and add lint fix script
|
2020-12-04 10:32:46 +01:00 |
|
Giuseppe Digilio
|
587affd064
|
added missing decorator for classes that use Angular features
|
2020-12-04 10:30:45 +01:00 |
|
Giuseppe Digilio
|
30d4c6ab5a
|
fixed tests
|
2020-12-04 09:22:31 +01:00 |
|
Tim Donohue
|
32a29c4a17
|
Merge pull request #925 from atmire/w2p-74179_Deleting-groups
Fix delete and edit for Groups
|
2020-12-03 15:59:04 -06:00 |
|
Tim Donohue
|
6e9c129b6e
|
Merge pull request #955 from atmire/401-login-page-and-403-page
401 login page and 403 page
|
2020-12-03 15:44:30 -06:00 |
|
Giuseppe Digilio
|
09101e83f3
|
temporary disabled problematic tests
|
2020-12-03 19:59:00 +01:00 |
|
Giuseppe Digilio
|
6123962e47
|
further changes for angular 10
|
2020-12-03 19:55:19 +01:00 |
|
Giuseppe Digilio
|
10d0c2e518
|
fixed tests after angular 10 upgrade
|
2020-12-03 19:45:05 +01:00 |
|
Giuseppe Digilio
|
9ed1c74f29
|
optimized module imports
|
2020-12-03 19:36:19 +01:00 |
|
Giuseppe Digilio
|
c841a135c9
|
Merge remote-tracking branch 'remotes/origin/main' into comcol-resource-policies
# Conflicts:
# src/app/shared/shared.module.ts
|
2020-12-03 17:21:52 +01:00 |
|
Kristof De Langhe
|
411e2bd746
|
74612: Remove 401 pages and add login redirect to feature-authorization guards
|
2020-12-03 14:38:27 +01:00 |
|
Dániel Péter Sipos
|
152923aba7
|
#885 remove elements form test
|
2020-12-03 11:19:51 +01:00 |
|
Dániel Péter Sipos
|
84bb449c8e
|
Merge branch 'main' into #885-media-viewer
|
2020-12-03 11:17:08 +01:00 |
|