Commit Graph

55 Commits

Author SHA1 Message Date
lotte
6dba02ca67 Merge branch 'master' into community-and-collection-forms
Conflicts:
	src/app/core/data/item-data.service.spec.ts
	src/app/core/data/item-data.service.ts
	src/app/core/shared/operators.spec.ts
	src/app/core/shared/operators.ts
	src/app/shared/shared.module.ts
2019-01-22 08:34:51 +01:00
Art Lowel
e387f9446f remove unused 'first' imports 2019-01-17 13:53:34 +01:00
Bram Luyten
17be7a34e0 Issue 298 Language switch 2019-01-16 20:01:14 +01:00
lotte
42d1bdb3d8 Merge branch 'master' into w2p-54472_Create-community-and-collection-pages
Conflicts:
	resources/i18n/en.json
	src/app/+community-page/community-page.component.html
	src/app/+community-page/community-page.module.ts
	src/app/core/auth/server-auth.service.ts
	src/app/core/core.module.ts
	src/app/core/index/index.effects.ts
	src/app/core/index/index.reducer.spec.ts
	src/app/core/index/index.reducer.ts
	src/app/header/header.component.spec.ts
2018-12-20 15:59:23 +01:00
Art Lowel
9911578bcc remove all instances of first as it can cause an error if it's never triggered 2018-12-19 14:53:11 +01:00
lotte
cc53dda46b fixed issue with hostwindowservice, search filter bug, changed sidebar toggle text to pin, fixed mobile view of header 2018-12-17 12:08:12 +01:00
lotte
6498d7dfbf added all tests 2018-12-13 14:18:14 +01:00
lotte
e13d743e32 added type doc to menu related files 2018-12-11 15:47:41 +01:00
lotte
c0a4fdc797 57053: added menu preview 2018-12-07 17:06:44 +01:00
lotte
38652b7a6a fixed sidebar set-off 2018-12-07 13:53:21 +01:00
lotte
cd5c7b72c2 57053: progress menu bar 2018-11-16 17:00:06 +01:00
lotte
777facf5cd intermediate commit 2018-08-29 15:12:01 +02:00
Art Lowel
9a6390e011 fixed an issue where the resolver wouldn't hand over responsability to the page component, and added a loading screen for resolving routes 2018-08-06 17:47:48 +02:00
Giuseppe Digilio
e0efa5f8e5 changes based on review comments 2018-05-23 18:13:34 +02:00
Giuseppe Digilio
f8b3cc516c Merge remote-tracking branch 'remotes/origin/master' into authentication
# Conflicts:
#	src/app/+search-page/search-filters/search-filter/search-filter.component.ts
#	src/app/+search-page/search-filters/search-filter/search-filter.service.ts
#	src/app/+search-page/search-service/search.service.spec.ts
#	src/app/+search-page/search-service/search.service.ts
#	src/app/app.component.spec.ts
#	src/app/app.component.ts
#	src/app/core/cache/response-cache.models.ts
#	src/app/core/core.effects.ts
#	src/app/core/core.module.ts
#	src/app/core/shared/hal-endpoint.service.ts
#	src/app/shared/services/route.service.ts
#	src/app/shared/view-mode-switch/view-mode-switch.component.spec.ts
#	src/modules/app/browser-app.module.ts
#	src/modules/app/server-app.module.ts
2018-05-08 10:57:15 +02:00
Giuseppe Digilio
c8a1fe0860 Removed use of platform service and created different service for SSR and CSR 2018-05-03 19:08:07 +02:00
Kristof De Langhe
35cbedf6fe 50479: Added google analytics support 2018-03-20 15:29:05 +01:00
Giuseppe Digilio
b7cff01dab fixed auth module 2018-02-10 13:01:58 +01:00
Giuseppe Digilio
c9ab2cee2f Grouped shared services into a directory 2018-02-09 12:26:36 +01:00
Art Lowel
4fbceab1b9 Switched to angular 5's built-in transfer state api 2018-02-01 13:17:59 +01:00
Lotte Hofstede
df5aca9e26 Merge branch 'master' into w2p-44988_search-sidebar
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
2017-11-09 15:33:50 +01:00
Lotte Hofstede
7d5dad94a1 44988: added reducer, angular animation, tests... 2017-10-30 17:04:52 +01:00
Art Lowel
ee84399d23 fixed an issue where a rehydrate would sometimes leave the app in a broken state 2017-10-26 12:58:42 +02:00
Art Lowel
feca366290 refactor done, todo fix tests 2017-10-25 13:31:10 +02:00
William Welling
f4c0df176e metadata service 2017-10-12 19:08:03 -05:00
William Welling
26e2da93fb recursive merge of config 2017-09-26 19:13:32 -05:00
William Welling
066bba28af fixed lint errors 2017-07-13 11:19:02 -05:00
William Welling
ff934d048b upgraded to ngx-pagination 2017-07-13 07:47:22 -05:00
William Welling
c08f5c672b dependency upgrades, server and platform module updates, linting wip 2017-07-12 14:33:16 -05:00
Giuseppe Digilio
c5c0bb776b Add host-window.service 2017-05-25 17:27:31 +02:00
Art Lowel
4eaa5e8471 Merge pull request #94 from artlowel/upgrade-to-ngx-translate
upgraded to ngx-translate
2017-05-18 17:43:03 +02:00
Art Lowel
cdb5f01198 upgraded to ngx-translate 2017-05-18 16:49:33 +02:00
Art Lowel
f5e5b72f47 added initial home page content 2017-05-18 15:02:33 +02:00
William Welling
2974d8aab1 Build setting some configs. Configs used by server. 2017-03-24 20:56:14 -05:00
William Welling
9b23393121 Working on config providor. 2017-03-24 16:57:11 -05:00
William Welling
415a52f011 Bring config into server. 2017-03-24 16:48:43 -05:00
William Welling
99f936ff45 Providing global config as an opaque token. 2017-03-24 16:15:01 -05:00
Giuseppe
9b6d2b4a3d Merge branch 'master' into Environments 2017-01-27 19:03:12 +01:00
Giuseppe Digilio
845e921fe7 app.component.ts and app.component.html changed 2017-01-27 18:40:27 +01:00
Giuseppe Digilio
589c9d5822 Default configuration file added 2017-01-27 18:34:24 +01:00
Giuseppe Digilio
5ada934e67 Add a mechanism to configure environment variables. 2017-01-20 15:08:30 +01:00
Art Lowel
58b4b381e7 added test for window resize to app.component.spec.ts 2017-01-18 11:27:39 +01:00
Art Lowel
e1d69e0efd header component tests 2017-01-17 18:50:07 +01:00
Art Lowel
8e4bec9c30 added tests for hostReducer and Header Effects, and switch to typed actions 2017-01-13 11:25:07 +01:00
Art Lowel
5d281fb828 removing unused router from app.component 2016-12-13 12:51:21 +01:00
Art Lowel
5fbf07d838 removed test onResize call 2016-12-13 10:33:51 +01:00
Art Lowel
2846dc9446 header, isNavBarCollapsed observable: filter out undefined state that can occur when using AoT compilation 2016-12-13 10:14:47 +01:00
Art Lowel
20632a8d12 rewrote window resize event using redux 2016-12-12 16:02:27 +01:00
Art Lowel
9aa74b863e moved header to its own component 2016-12-12 13:36:02 +01:00
William Welling
82143578fd App component styleUrls point to generated css 2016-12-02 08:13:47 -06:00