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 |
|
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
|
880d9ed069
|
Merge remote-tracking branch 'remotes/origin/master' into submission
# Conflicts:
# package.json
# src/app/+item-page/edit-item-page/item-delete/item-delete.component.spec.ts
# src/app/+item-page/edit-item-page/item-private/item-private.component.spec.ts
# src/app/+item-page/edit-item-page/item-public/item-public.component.spec.ts
# src/app/+item-page/edit-item-page/item-reinstate/item-reinstate.component.spec.ts
# src/app/+item-page/edit-item-page/item-withdraw/item-withdraw.component.spec.ts
# src/app/+item-page/edit-item-page/simple-item-action/abstract-simple-item-action.component.spec.ts
# src/app/+search-page/search-service/search.service.spec.ts
# src/app/core/auth/auth-response-parsing.service.spec.ts
# src/app/core/auth/auth-response-parsing.service.ts
# src/app/core/cache/builders/remote-data-build.service.ts
# src/app/core/cache/response-cache.reducer.spec.ts
# src/app/core/cache/response-cache.service.spec.ts
# src/app/core/cache/response.models.ts
# src/app/core/config/config-response-parsing.service.ts
# src/app/core/core.effects.ts
# src/app/core/core.module.ts
# src/app/core/core.reducers.ts
# src/app/core/data/base-response-parsing.service.ts
# src/app/core/data/data.service.ts
# src/app/core/data/item-data.service.spec.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/core/integration/integration-response-parsing.service.spec.ts
# src/app/core/integration/integration-response-parsing.service.ts
# src/app/core/integration/integration.service.ts
# src/app/core/metadata/metadata.service.spec.ts
# src/app/core/registry/registry.service.spec.ts
# src/app/core/shared/hal-endpoint.service.ts
# src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control.component.ts
# src/app/shared/mocks/mock-response-cache.service.ts
# src/app/shared/shared.module.ts
|
2019-02-19 17:30:33 +01:00 |
|
Giuseppe Digilio
|
967d682962
|
Added tests
|
2019-01-08 23:25:44 +01:00 |
|
lotte
|
d37a2e051d
|
Started fixing tests
|
2018-12-21 16:22:59 +01:00 |
|
lotte
|
a7bebb1035
|
upgrade to angular 6
|
2018-12-10 13:48:48 +01:00 |
|
lotte
|
3a8f7754fa
|
55143: fixed all tests
|
2018-10-11 12:02:40 +02:00 |
|
lotte
|
14fd58dd21
|
issues with form component tests
|
2018-09-07 13:48:00 +02:00 |
|
lotte
|
14f5c97ecc
|
another intermediate commit
|
2018-09-06 11:55:13 +02:00 |
|
Giuseppe Digilio
|
683c2f2f6b
|
Added testing utils functions
|
2018-07-11 18:42:45 +02:00 |
|
Giuseppe Digilio
|
4d89674cda
|
Fixed server side form validation
|
2018-07-09 19:02:09 +02:00 |
|
Giuseppe Digilio
|
ff41b80a33
|
Renamed form.reducers.ts to form.reducer.ts
Created custom sass variable
Removed use of instanceof operator
|
2018-07-03 17:51:26 +02:00 |
|
Giuseppe Digilio
|
d49cba9090
|
Added more tests
|
2018-06-26 16:41:11 +02:00 |
|
Giuseppe Digilio
|
876dba2892
|
Added tests
|
2018-05-10 17:24:09 +02:00 |
|
Giuseppe Digilio
|
7a32d18b1b
|
Merged dynamic form module
|
2018-05-09 12:14:18 +02:00 |
|