Skip to content
Snippets Groups Projects
  1. Oct 22, 2018
  2. Oct 19, 2018
  3. Oct 11, 2018
  4. Oct 10, 2018
  5. Oct 09, 2018
  6. Oct 08, 2018
  7. Oct 05, 2018
  8. Oct 04, 2018
  9. Oct 03, 2018
  10. Sep 27, 2018
  11. Sep 25, 2018
  12. Sep 24, 2018
  13. Sep 21, 2018
  14. Sep 20, 2018
  15. Sep 19, 2018
  16. Sep 18, 2018
  17. Sep 17, 2018
    • Kristof De Langhe's avatar
      de2499b1
    • Kristof De Langhe's avatar
      Merge branch 'master' into entities-master · addea8bf
      Kristof De Langhe authored
      Conflicts:
      	src/app/+item-page/full/full-item-page.component.ts
      	src/app/+item-page/simple/item-page.component.html
      	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-options.model.ts
      	src/app/+search-page/search-page.component.html
      	src/app/+search-page/search-page.component.ts
      	src/app/+search-page/search-page.module.ts
      	src/app/+search-page/search-results/search-results.component.ts
      	src/app/+search-page/search-service/search.service.spec.ts
      	src/app/+search-page/search-service/search.service.ts
      	src/app/+search-page/search-settings/search-settings.component.ts
      	src/app/core/cache/response-cache.models.ts
      	src/app/core/core.module.ts
      	src/app/core/data/search-response-parsing.service.ts
      	src/app/core/shared/operators.ts
      	src/app/core/shared/resource-type.ts
      	src/app/shared/object-collection/object-collection.component.spec.ts
      	src/app/shared/object-collection/object-collection.component.ts
      	src/app/shared/object-collection/shared/dso-element-decorator.spec.ts
      	src/app/shared/object-collection/shared/dso-element-decorator.ts
      	src/app/shared/object-grid/collection-grid-element/collection-grid-element.component.ts
      	src/app/shared/object-grid/community-grid-element/community-grid-element.component.ts
      	src/app/shared/object-grid/item-grid-element/item-grid-element.component.ts
      	src/app/shared/object-grid/search-result-grid-element/collection-search-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.ts
      	src/app/shared/object-grid/search-result-grid-element/item-search-result/item-search-result-grid-element.component.ts
      	src/app/shared/object-grid/wrapper-grid-element/wrapper-grid-element.component.ts
      	src/app/shared/object-list/collection-list-element/collection-list-element.component.ts
      	src/app/shared/object-list/community-list-element/community-list-element.component.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.ts
      	src/app/shared/object-list/search-result-list-element/collection-search-result/collection-search-result-list-element.component.ts
      	src/app/shared/object-list/search-result-list-element/community-search-result/community-search-result-list-element.component.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.ts
      	src/app/shared/object-list/wrapper-list-element/wrapper-list-element.component.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
      	src/app/shared/view-mode-switch/view-mode-switch.component.spec.ts
      	src/app/shared/view-mode-switch/view-mode-switch.component.ts
      	src/app/thumbnail/thumbnail.component.html
      addea8bf
Loading