Merge branch 'master' into w2p-65240_Community-and-collection-logos
Conflicts: resources/i18n/en.json5 src/app/shared/shared.module.ts
Showing
- .travis.yml 3 additions, 4 deletions.travis.yml
- README.md 5 additions, 0 deletionsREADME.md
- docker/README.md 79 additions, 0 deletionsdocker/README.md
- docker/cli.assetstore.yml 23 additions, 0 deletionsdocker/cli.assetstore.yml
- docker/cli.ingest.yml 32 additions, 0 deletionsdocker/cli.ingest.yml
- docker/cli.yml 22 additions, 0 deletionsdocker/cli.yml
- docker/db.entities.yml 16 additions, 0 deletionsdocker/db.entities.yml
- docker/docker-compose-rest.yml 59 additions, 0 deletionsdocker/docker-compose-rest.yml
- docker/docker-compose-travis.yml 53 additions, 0 deletionsdocker/docker-compose-travis.yml
- docker/docker-compose.yml 26 additions, 0 deletionsdocker/docker-compose.yml
- docker/environment.dev.js 16 additions, 0 deletionsdocker/environment.dev.js
- docker/local.cfg 6 additions, 0 deletionsdocker/local.cfg
- package.json 1 addition, 1 deletionpackage.json
- resources/i18n/en.json5 54 additions, 0 deletionsresources/i18n/en.json5
- src/app/+browse-by/+browse-by-date-page/browse-by-date-page.component.spec.ts 2 additions, 1 deletion...browse-by-date-page/browse-by-date-page.component.spec.ts
- src/app/+browse-by/+browse-by-metadata-page/browse-by-metadata-page.component.html 38 additions, 1 deletion...e-by-metadata-page/browse-by-metadata-page.component.html
- src/app/+browse-by/+browse-by-metadata-page/browse-by-metadata-page.component.spec.ts 2 additions, 1 deletion...y-metadata-page/browse-by-metadata-page.component.spec.ts
- src/app/+browse-by/+browse-by-title-page/browse-by-title-page.component.spec.ts 2 additions, 1 deletion...owse-by-title-page/browse-by-title-page.component.spec.ts
- src/app/+collection-page/collection-item-mapper/collection-item-mapper.component.html 57 additions, 0 deletions...lection-item-mapper/collection-item-mapper.component.html
- src/app/+collection-page/collection-item-mapper/collection-item-mapper.component.scss 1 addition, 0 deletions...lection-item-mapper/collection-item-mapper.component.scss
Please register or sign in to comment