Merge remote-tracking branch 'remotes/origin/master' into notification
# Conflicts: # src/app/app.reducer.ts # src/app/shared/shared.module.ts
Showing
- .travis.yml 7 additions, 1 deletion.travis.yml
- README.md 35 additions, 13 deletionsREADME.md
- package.json 45 additions, 45 deletionspackage.json
- src/app/+search-page/search-results/search-results.component.html 1 addition, 1 deletion...+search-page/search-results/search-results.component.html
- src/app/app.component.scss 1 addition, 0 deletionssrc/app/app.component.scss
- src/app/app.reducer.ts 4 additions, 1 deletionsrc/app/app.reducer.ts
- src/app/header/header.component.html 1 addition, 1 deletionsrc/app/header/header.component.html
- src/app/shared/animations/focus.ts 19 additions, 0 deletionssrc/app/shared/animations/focus.ts
- src/app/shared/animations/overlay.ts 10 additions, 0 deletionssrc/app/shared/animations/overlay.ts
- src/app/shared/object-collection/shared/collection-search-result.model.ts 5 additions, 0 deletions...bject-collection/shared/collection-search-result.model.ts
- src/app/shared/object-collection/shared/community-search-result.model.ts 5 additions, 0 deletions...object-collection/shared/community-search-result.model.ts
- src/app/shared/object-grid/collection-grid-element/collection-grid-element.component.spec.ts 39 additions, 28 deletions...on-grid-element/collection-grid-element.component.spec.ts
- src/app/shared/object-grid/community-grid-element/community-grid-element.component.spec.ts 34 additions, 30 deletions...ity-grid-element/community-grid-element.component.spec.ts
- src/app/shared/object-grid/item-grid-element/item-grid-element.component.html 2 additions, 3 deletions...t-grid/item-grid-element/item-grid-element.component.html
- src/app/shared/object-grid/item-grid-element/item-grid-element.component.spec.ts 71 additions, 30 deletions...rid/item-grid-element/item-grid-element.component.spec.ts
- src/app/shared/object-grid/object-grid.component.html 2 additions, 2 deletionssrc/app/shared/object-grid/object-grid.component.html
- src/app/shared/object-grid/object-grid.component.scss 13 additions, 16 deletionssrc/app/shared/object-grid/object-grid.component.scss
- src/app/shared/object-grid/search-result-grid-element/collection-search-result/collection-search-result-grid-element.component.spec.ts 47 additions, 28 deletions...t/collection-search-result-grid-element.component.spec.ts
- src/app/shared/object-grid/search-result-grid-element/collection-search-result/collection-search-result-grid-element.component.ts 1 addition, 1 deletion...result/collection-search-result-grid-element.component.ts
- src/app/shared/object-grid/search-result-grid-element/community-search-result/community-search-result-grid-element.component.spec.ts 46 additions, 26 deletions...lt/community-search-result-grid-element.component.spec.ts
Please register or sign in to comment