660 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Jonas Van Goolen	e331f7e288	#150 Rollback to previous state (not part of this issue)	2017-12-01 09:59:35 +01:00
Jonas Van Goolen	d045b67b73	150 Separate maps per viewMode	2017-12-01 09:59:35 +01:00
Jonas Van Goolen	db0db81c63	#150 Generalised AbstractListableElementComponent instead of grid/list specific implementations	2017-12-01 09:59:35 +01:00
Jonas Van Goolen	d1b225bd95	#150 Merge fixes	2017-12-01 09:59:35 +01:00
Jonas Van Goolen	ee099e275c	#150 Removal of iml file + small margin between pagination and grid	2017-12-01 09:59:35 +01:00
Jonas Van Goolen	9be1d59464	Additional IDE generated files ignored	2017-12-01 09:59:35 +01:00
Jonas Van Goolen	7ae8950be5	#150 Removal of inherited css + restyling using bootstrap classes	2017-12-01 09:59:35 +01:00
Jonas Van Goolen	68dd411ae7	#150 Grid element testing	2017-12-01 09:59:35 +01:00
Jonas Van Goolen	04218060dd	150 Backup commit	2017-12-01 09:59:35 +01:00
Jonas Van Goolen	520b7f3e12	#150 Moved list,grid and object-collection to shared package	2017-12-01 09:59:35 +01:00
Jonas Van Goolen	cc4aaa4c79	#150 Safety-commit before moving to "shared" package	2017-12-01 09:59:35 +01:00
Jonas Van Goolen	67356efaab	#150 Intermediate commit	2017-12-01 09:59:35 +01:00
Jonas Van Goolen	e7e129f80f	#150 Intermediate commit	2017-12-01 09:59:35 +01:00
Jonas Van Goolen	491d40c026	#150 Intermediate commit	2017-12-01 09:59:35 +01:00
Jonas Van Goolen	c5bfbeaa00	#150 Pre grid/list decorator generalisation commit	2017-12-01 09:59:35 +01:00
Jonas Van Goolen	17f839f9e1	#150 SortOptions config fixing	2017-12-01 09:59:35 +01:00
Jonas Van Goolen	a704157c1f	#150 Initial grid/list view implementation	2017-12-01 09:59:35 +01:00
Tim Donohue	16786a90ff	Merge pull request #208 from courtneypattison/lint-exit-status ... Let linting exit with a nonzero status	2017-12-01 03:38:28 +10:00
courtneypattison	7083503ccd	Let linting exit with a nonzero status	2017-11-29 14:08:11 -08:00
Art Lowel	b906fb2ef1	Merge pull request #207 from courtneypattison/travis-headless-chrome ... Run Travis using headless Chrome addon	2017-11-29 15:43:09 +01:00
courtneypattison	909845ebc0	Run Travis using headless Chrome addon	2017-11-28 15:33:35 -08:00
Art Lowel	821e9165aa	Merge pull request #196 from 4Science/configuration ... Configuration endpoints	2017-11-28 13:01:59 +01:00
Giuseppe Digilio	ad6d42cd42	Fix config-response-parsing.service.spec	2017-11-27 12:39:36 +01:00
Giuseppe Digilio	b36498727f	Remove empty line	2017-11-24 15:49:16 +01:00
Giuseppe Digilio	b1af25f7ee	Update config-submission-section.model	2017-11-24 15:47:11 +01:00
Giuseppe Digilio	7361a9e776	Merge remote-tracking branch 'remotes/origin/master' into configuration ... # Conflicts: # src/app/core/core.module.ts	2017-11-24 15:20:45 +01:00
Art Lowel	07cdf650f8	Merge pull request #204 from courtneypattison/re-export-routermodule ... re-export RouterModule in AppRoutingModule	2017-11-23 10:32:24 +01:00
Art Lowel	3370884768	Merge pull request #199 from LotteHofstede/w2p-45621_filter-facets-ui ... Filter facets and settings	2017-11-23 09:28:33 +01:00
courtneypattison	b257ca7033	re-export RouterModule in AppRoutingModule	2017-11-22 12:23:11 -08:00
Lotte Hofstede	27239341d9	45621: fixed e2e tests	2017-11-21 08:58:03 +01:00
Lotte Hofstede	778c8049d0	45621: finished facet branch - changed decrease to reset	2017-11-20 17:06:00 +01:00
Lotte Hofstede	a5d562fd22	45621: added more tests	2017-11-20 16:31:19 +01:00
Lotte Hofstede	c062fdf396	45621: adding more tests	2017-11-17 17:05:13 +01:00
Lotte Hofstede	970e77aed3	45621: refactored to sm full width for search page	2017-11-17 14:37:59 +01:00
Lotte Hofstede	889318f162	45621: commit before small sidebar changes	2017-11-17 11:28:48 +01:00
Lotte Hofstede	86234afc42	Merge branch '195-Rebased' into w2p-45621_filter-facets-ui	2017-11-16 15:47:40 +01:00
Lotte Hofstede	1d795ccb16	45621: open filter section on load when it's used	2017-11-16 11:29:34 +01:00
Jonas Van Goolen	69e203722f	#195 TSLint error checking, redirect using previous query params	2017-11-13 16:39:21 +01:00
Jonas Van Goolen	fccaea9c08	195 Initial testing + fixing previously broken test(s)	2017-11-13 14:16:21 +01:00
Jonas Van Goolen	152c79278a	195 Pre-test commit	2017-11-13 14:15:50 +01:00
Lotte Hofstede	202b045009	45621: finished filter facets for search sidebar	2017-11-13 13:52:21 +01:00
Giuseppe Digilio	a37b2da6a6	Add unit tests	2017-11-12 19:38:27 +01:00
Giuseppe Digilio	362525c6ea	Remove setTimeout	2017-11-10 12:04:04 +01:00
Giuseppe Digilio	d23da283ec	Merge remote-tracking branch 'remotes/origin/master' into configuration	2017-11-10 11:18:45 +01:00
Lotte Hofstede	be6f5ea9b5	Merge branch 'master' into w2p-45621_filter-facets-ui ... Conflicts: src/app/+search-page/search-page.component.html src/app/+search-page/search-page.component.ts src/app/shared/shared.module.ts	2017-11-10 11:15:36 +01:00
Lotte Hofstede	4522bc5e16	45621: added unit tests	2017-11-10 11:11:47 +01:00
Art Lowel	8682861dc6	Merge pull request #192 from LotteHofstede/w2p-44988_search-sidebar ... Search Sidebar	2017-11-10 10:05:47 +01:00
Lotte Hofstede	701d5ad124	removed console.log	2017-11-09 15:40:08 +01:00
Lotte Hofstede	b73f9fd92f	removed unnecessary async in test	2017-11-09 15:37:27 +01:00
Lotte Hofstede	54bc88fa6e	44988: solved issues after merge	2017-11-09 15:35:57 +01:00