lotte
|
9c3f226599
|
Merge branch 'master' into configurable_entities
Conflicts:
src/app/+collection-page/collection-page.component.ts
src/app/+item-page/full/full-item-page.component.ts
src/app/+item-page/simple/item-page.component.ts
src/app/+search-page/search-filters/search-filter/search-filter.service.spec.ts
src/app/+search-page/search-filters/search-filter/search-filter.service.ts
src/app/+search-page/search-page.component.spec.ts
src/app/+search-page/search-page.component.ts
src/app/+search-page/search-results/search-results.component.spec.ts
src/app/+search-page/search-results/search-results.component.ts
src/app/+search-page/search-service/search-configuration.service.spec.ts
src/app/+search-page/search-service/search-configuration.service.ts
src/app/+search-page/search-service/search.service.ts
src/app/core/cache/builders/remote-data-build.service.spec.ts
src/app/core/cache/builders/remote-data-build.service.ts
src/app/core/data/data.service.ts
src/app/core/metadata/metadata.service.ts
src/app/core/shared/item.model.ts
src/app/core/shared/operators.ts
src/app/shared/loading/loading.component.ts
src/app/shared/object-collection/object-collection.component.ts
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.spec.ts
src/app/shared/services/route.service.spec.ts
src/app/shared/services/route.service.ts
src/app/shared/shared.module.ts
src/app/shared/testing/hal-endpoint-service-stub.ts
src/app/shared/testing/search-service-stub.ts
yarn.lock
|
2018-12-10 11:13:01 +01:00 |
|
lotte
|
777facf5cd
|
intermediate commit
|
2018-08-29 15:12:01 +02:00 |
|
lotte
|
2cbe6a6d91
|
upgrade to angular6
|
2018-08-24 13:26:43 +02:00 |
|
lotte
|
3fa70523ea
|
Fixed issue #1 and some other fixes
|
2018-07-30 10:19:45 +02:00 |
|
Art Lowel
|
06d2ac74be
|
added custom item page fields for Projects, OrgUnits and People
|
2018-05-28 17:22:17 +02:00 |
|
Jonas Van Goolen
|
1f873acea4
|
#150 TSLint error fixing
|
2017-12-01 13:09:48 +01:00 |
|
Jonas Van Goolen
|
d1b225bd95
|
#150 Merge fixes
|
2017-12-01 09:59:35 +01:00 |
|
Jonas Van Goolen
|
520b7f3e12
|
#150 Moved list,grid and object-collection to shared package
|
2017-12-01 09:59:35 +01:00 |
|