Commits · 0032a73ec29d720a93080680e648f0bca1bf2b9a · vtechworks / Dspace7 Angular

Nov 30, 2017
- #150 Intermediate commit · 0032a73e
  Jonas Van Goolen authored 7 years ago
  
  0032a73e
- #150 Intermediate commit · 6a4500b8
  Jonas Van Goolen authored 7 years ago
  
  6a4500b8
- #150 Pre grid/list decorator generalisation commit · 1acd8a95
  Jonas Van Goolen authored 7 years ago
  
  1acd8a95
- #150 SortOptions config fixing · a65dd805
  Jonas Van Goolen authored 7 years ago
  
  a65dd805
- #150 Initial grid/list view implementation · d2135ab0
  Jonas Van Goolen authored 7 years ago
  
  d2135ab0
Nov 29, 2017
- Merge pull request #207 from courtneypattison/travis-headless-chrome · b906fb2e
  Art Lowel authored 7 years ago
  
  Run Travis using headless Chrome addon
  Unverified
  
  b906fb2e
Nov 28, 2017
- Run Travis using headless Chrome addon · 909845eb
  courtneypattison authored 7 years ago
  
  909845eb
- Merge pull request #196 from 4Science/configuration · 821e9165
  Art Lowel authored 7 years ago
  
  Configuration endpoints
  Unverified
  
  821e9165
Nov 27, 2017
- Fix config-response-parsing.service.spec · ad6d42cd
  Giuseppe Digilio authored 7 years ago
  
  ad6d42cd
Nov 24, 2017
- Remove empty line · b3649872
  Giuseppe Digilio authored 7 years ago
  
  b3649872
- Update config-submission-section.model · b1af25f7
  Giuseppe Digilio authored 7 years ago
  
  b1af25f7
- Merge remote-tracking branch 'remotes/origin/master' into configuration · 7361a9e7
  Giuseppe Digilio authored 7 years ago
  
  # Conflicts: # src/app/core/core.module.ts
  7361a9e7
Nov 23, 2017
- Merge pull request #204 from courtneypattison/re-export-routermodule · 07cdf650
  Art Lowel authored 7 years ago
  
  re-export RouterModule in AppRoutingModule
  Unverified
  
  07cdf650
- Merge pull request #199 from LotteHofstede/w2p-45621_filter-facets-ui · 33708847
  Art Lowel authored 7 years ago
  
  Filter facets and settings
  Unverified
  
  33708847
Nov 22, 2017
- re-export RouterModule in AppRoutingModule · b257ca70
  courtneypattison authored 7 years ago
  
  b257ca70
Nov 21, 2017
- 45621: fixed e2e tests · 27239341
  Lotte Hofstede authored 7 years ago
  
  27239341
Nov 20, 2017
- 45621: finished facet branch - changed decrease to reset · 778c8049
  Lotte Hofstede authored 7 years ago
  
  778c8049
- 45621: added more tests · a5d562fd
  Lotte Hofstede authored 7 years ago
  
  a5d562fd
Nov 17, 2017
- 45621: adding more tests · c062fdf3
  Lotte Hofstede authored 7 years ago
  
  c062fdf3
- 45621: refactored to sm full width for search page · 970e77ae
  Lotte Hofstede authored 7 years ago
  
  970e77ae
- 45621: commit before small sidebar changes · 889318f1
  Lotte Hofstede authored 7 years ago
  
  889318f1
Nov 16, 2017
- Merge branch '195-Rebased' into w2p-45621_filter-facets-ui · 86234afc
  Lotte Hofstede authored 7 years ago
  
  86234afc
- 45621: open filter section on load when it's used · 1d795ccb
  Lotte Hofstede authored 7 years ago
  
  1d795ccb
Nov 13, 2017
- #195 TSLint error checking, redirect using previous query params · 69e20372
  Jonas Van Goolen authored 7 years ago
  
  69e20372
- 195 Initial testing + fixing previously broken test(s) · fccaea9c
  Jonas Van Goolen authored 7 years ago
  
  fccaea9c
- 195 Pre-test commit · 152c7927
  Jonas Van Goolen authored 7 years ago
  
  152c7927
- 45621: finished filter facets for search sidebar · 202b0450
  Lotte Hofstede authored 7 years ago
  
  202b0450
Nov 12, 2017
- Add unit tests · a37b2da6
  Giuseppe Digilio authored 7 years ago
  
  a37b2da6
Nov 10, 2017
- Remove setTimeout · 362525c6
  Giuseppe Digilio authored 7 years ago
  
  362525c6
- Merge remote-tracking branch 'remotes/origin/master' into configuration · d23da283
  Giuseppe Digilio authored 7 years ago
  
  d23da283
- Merge branch 'master' into w2p-45621_filter-facets-ui · be6f5ea9
  Lotte Hofstede authored 7 years ago
  
  Conflicts: src/app/+search-page/search-page.component.html src/app/+search-page/search-page.component.ts src/app/shared/shared.module.ts
  be6f5ea9
- 45621: added unit tests · 4522bc5e
  Lotte Hofstede authored 7 years ago
  
  4522bc5e
- Merge pull request #192 from LotteHofstede/w2p-44988_search-sidebar · 8682861d
  Art Lowel authored 7 years ago
  
  Search Sidebar
  Unverified
  
  8682861d
Nov 09, 2017
- removed console.log · 701d5ad1
  Lotte Hofstede authored 7 years ago
  
  701d5ad1
- removed unnecessary async in test · b73f9fd9
  Lotte Hofstede authored 7 years ago
  
  b73f9fd9
- 44988: solved issues after merge · 54bc88fa
  Lotte Hofstede authored 7 years ago
  
  54bc88fa
- Merge branch 'master' into w2p-44988_search-sidebar · df5aca9e
  Lotte Hofstede authored 7 years ago
  
  Conflicts: src/app/+search-page/search-page.component.html src/app/+search-page/search-page.component.spec.ts src/app/+search-page/search-page.component.ts src/app/shared/shared.module.ts
  df5aca9e
- 45621: filters facet route service · 569d7a63
  Lotte Hofstede authored 7 years ago
  
  569d7a63
Nov 08, 2017

solved merge issues · 57c525d1
Lotte Hofstede authored 7 years ago

57c525d1

Merge branch 'master' into w2p-45621_filter-facets-ui · 1ff29621

Lotte Hofstede authored 7 years ago

Conflicts:
	src/app/+search-page/search-page.component.html
	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.html
	src/app/+search-page/search-service/search.service.ts
	src/app/shared/search-form/search-form.component.html
	src/app/shared/shared.module.ts

1ff29621