Merge branch 'master' into browse-by-features
Conflicts: src/app/shared/object-grid/item-grid-element/item-grid-element.component.html src/app/shared/object-list/item-list-element/item-list-element.component.html
Showing
- .dockerignore 21 additions, 0 deletions.dockerignore
- Dockerfile 10 additions, 0 deletionsDockerfile
- src/app/+community-page/sub-collection-list/community-page-sub-collection-list.component.html 1 addition, 1 deletion...on-list/community-page-sub-collection-list.component.html
- src/app/+community-page/sub-collection-list/community-page-sub-collection-list.component.ts 2 additions, 1 deletion...tion-list/community-page-sub-collection-list.component.ts
- src/app/+item-page/field-components/collections/collections.component.html 1 addition, 1 deletion...e/field-components/collections/collections.component.html
- src/app/+item-page/field-components/collections/collections.component.spec.ts 74 additions, 0 deletions...ield-components/collections/collections.component.spec.ts
- src/app/+item-page/field-components/collections/collections.component.ts 4 additions, 0 deletions...age/field-components/collections/collections.component.ts
- src/app/+search-page/paginated-search-options.model.ts 0 additions, 1 deletionsrc/app/+search-page/paginated-search-options.model.ts
- src/app/core/cache/builders/remote-data-build.service.ts 24 additions, 15 deletionssrc/app/core/cache/builders/remote-data-build.service.ts
- src/app/core/cache/id-to-uuid-serializer.spec.ts 34 additions, 0 deletionssrc/app/core/cache/id-to-uuid-serializer.spec.ts
- src/app/core/cache/id-to-uuid-serializer.ts 35 additions, 0 deletionssrc/app/core/cache/id-to-uuid-serializer.ts
- src/app/core/cache/models/action-type.model.ts 64 additions, 0 deletionssrc/app/core/cache/models/action-type.model.ts
- src/app/core/cache/models/normalized-bitstream-format.model.ts 66 additions, 0 deletions...pp/core/cache/models/normalized-bitstream-format.model.ts
- src/app/core/cache/models/normalized-bitstream.model.ts 3 additions, 0 deletionssrc/app/core/cache/models/normalized-bitstream.model.ts
- src/app/core/cache/models/normalized-bundle.model.ts 6 additions, 0 deletionssrc/app/core/cache/models/normalized-bundle.model.ts
- src/app/core/cache/models/normalized-collection.model.ts 7 additions, 1 deletionsrc/app/core/cache/models/normalized-collection.model.ts
- src/app/core/cache/models/normalized-community.model.ts 7 additions, 1 deletionsrc/app/core/cache/models/normalized-community.model.ts
- src/app/core/cache/models/normalized-item.model.ts 7 additions, 0 deletionssrc/app/core/cache/models/normalized-item.model.ts
- src/app/core/cache/models/normalized-object-factory.ts 8 additions, 0 deletionssrc/app/core/cache/models/normalized-object-factory.ts
- src/app/core/cache/models/normalized-resource-policy.model.ts 49 additions, 0 deletions...app/core/cache/models/normalized-resource-policy.model.ts
Please register or sign in to comment