166 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Oliver Boehlk	7d1a9ff86e	Merge pull request 'enablePWA' (#78) from enablePWA into master ... Reviewed-on: oliver/simcompanies-dashboard#78	2020-05-25 17:11:56 +02:00
Hawk	3c3a9bc511	register service worker for PWA functionality	2020-05-25 16:38:59 +02:00
Hawk	1d4bc6f765	remove package-lock file	2020-05-25 16:38:32 +02:00
falk	2f6ed68c58	Merge pull request 'damn I hate CSS (and bugs): fix #69 strange render bug in aerospace' (#75) from fix-weird-display-bug into master ... Reviewed-on: oliver/simcompanies-dashboard#75 Reviewed-by: falk <falk.ba@gmx.de>	2020-05-24 10:34:10 +02:00
Oliver Boehlk	848191140d	fix #69 strange render bug in aerospace	2020-05-24 09:47:37 +02:00
Oliver Boehlk	ffc256780f	Merge pull request 'ui-change-name-passwd' (#72) from ui-change-name-passwd into master ... Reviewed-by: Oliver Boehlk <ollitobiasb@gmail.com>	2020-05-17 10:38:47 +02:00
Oliver Boehlk	78735b7fb7	bugfix backend feedback for password changes	2020-05-17 10:36:39 +02:00
Hawk	28b3e426d1	added automatic logout	2020-05-17 00:47:07 +02:00
Hawk	3bc17e1883	added change username and pw close #68	2020-05-17 00:43:45 +02:00
Hawk	480ec85374	fixed all warnings (if it was possible)	2020-05-16 23:44:31 +02:00
falk	9cf15fee59	edit-jenkinsfile (#71) ... build and deploy only on master added deploy frontend script added script for copying backendfolder to olberry build frontend now working build only for master added scripts Co-authored-by: Hawk <falk.ba@gmx.de> Reviewed-by: Oliver Boehlk <ollitobiasb@gmail.com>	2020-05-16 00:23:12 +02:00
falk	c90a550c2b	Merge pull request 'add API endpoints for changing username and password' (#70) from change-username-password-api-endpoint into master ... Reviewed-by: falk <falk.ba@gmx.de>	2020-05-15 23:29:36 +02:00
Oliver Boehlk	babc2c8ea8	limit logout function to logged in users	2020-05-15 23:21:47 +02:00
Oliver Boehlk	ab7b2d907d	add setpassword function ... backend is #68 ready	2020-05-15 23:15:49 +02:00
Oliver Boehlk	07d601ea36	bugfix password validation	2020-05-15 23:03:04 +02:00
Oliver Boehlk	6591cf877a	require password for username change	2020-05-15 23:00:23 +02:00
Oliver Boehlk	7c67c39ca7	add external validatepassword function	2020-05-15 22:57:32 +02:00
Oliver Boehlk	7b3c262140	create endpoint for changing username ... #68	2020-05-15 21:52:51 +02:00
Oliver Boehlk	be49c3b06e	Merge pull request 'remove button and loading circle close #65' (#67) from removeButtonAndIcon into master ... Reviewed-by: Oliver Boehlk <ollitobiasb@gmail.com>	2020-05-15 01:25:41 +02:00
Hawk	eb1843d460	remove button and loading circle close #65	2020-05-15 01:19:50 +02:00
falk	abd6c45ef0	Merge pull request 'fix data order in week' (#64) from fix-data-order-in-week into master ... Reviewed-by: falk <falk.ba@gmx.de>	2020-05-15 00:06:02 +02:00
Oliver Boehlk	b87e4214a4	Merge pull request 'added loadingbar when fetching other intervals' (#63) from add-week-month-view into master ... Reviewed-by: Oliver Boehlk <ollitobiasb@gmail.com>	2020-05-14 23:16:45 +02:00
Oliver Boehlk	38177c6349	fix data order in week	2020-05-14 23:11:50 +02:00
Hawk	82eba7e932	added loadingbar when fetching other intervals	2020-05-14 22:47:56 +02:00
Oliver Boehlk	2e17dc48ca	bugfix backend return correct kind ... bugfix change order for graph display	2020-05-14 01:00:45 +02:00
Oliver Boehlk	1aea0301c2	Merge pull request 'add-week-month-view' (#62) from add-week-month-view into master ... Reviewed-by: Oliver Boehlk <ollitobiasb@gmail.com>	2020-05-14 00:04:07 +02:00
Hawk	049c4ad938	Interval selection	2020-05-13 23:56:35 +02:00
Hawk	ed52f12e7d	Merge branch 'master' into add-week-month-view	2020-05-13 23:25:23 +02:00
Hawk	abf19f1de6	added dropdown menu	2020-05-13 23:06:55 +02:00
falk	fef01f29b9	Merge pull request 'add mock data for month api endpoint' (#61) from add-moth-api-endpoint into master ... Reviewed-by: falk <falk.ba@gmx.de>	2020-05-13 23:03:37 +02:00
Oliver Boehlk	5ac5ee1e41	change id to time	2020-05-13 23:00:31 +02:00
Oliver Boehlk	66979947dd	change avg(price) to price	2020-05-13 22:58:21 +02:00
Oliver Boehlk	151e2b1dff	add mock data for month api endpoint	2020-05-13 21:08:25 +02:00
falk	33d1d1743b	Merge pull request 'add month API endpoint' (#60) from add-moth-api-endpoint into master ... Reviewed-by: falk <falk.ba@gmx.de>	2020-05-13 21:05:36 +02:00
Oliver Boehlk	18a927da3b	add month API endpoint	2020-05-13 20:59:07 +02:00
falk	25b89b3da2	Merge pull request 'add mockdata for week API endpoint' (#59) from add-weekfunction-for-backend into master ... Reviewed-by: falk <falk.ba@gmx.de>	2020-05-13 20:51:41 +02:00
Oliver Boehlk	2d03129996	add mockdata for week API endpoint	2020-05-13 20:46:53 +02:00
falk	b4d77cfb4a	Merge pull request 'add-weekfunction-for-backend' (#58) from add-weekfunction-for-backend into master ... Reviewed-by: falk <falk.ba@gmx.de>	2020-05-13 20:41:00 +02:00
Oliver Boehlk	c114ddd892	revert authentication skip	2020-05-13 20:36:12 +02:00
Oliver Boehlk	eb54f12bfd	add function week API point	2020-05-13 20:35:51 +02:00
Oliver Boehlk	f17a40504f	bugfix in day API endpoint ... add temporary data	2020-05-13 20:11:43 +02:00
Oliver Boehlk	054f77b998	Merge pull request 'fixed issue with double login close #53' (#57) from loginFix into master ... Reviewed-by: Oliver Boehlk <ollitobiasb@gmail.com>	2020-05-13 19:48:17 +02:00
Hawk	e3fe3ae881	fixed issue with double login close #53	2020-05-13 00:26:06 +02:00
falk	8e3f53baca	Merge pull request 'add jenkinsfile' (#54) from falk-patch-1 into master ... Reviewed-by: falksjenkins <jenkins1@boehlk.io>	2020-05-12 21:28:27 +02:00
falk	f0cdafe8c9	add jenkinsfile	2020-05-12 21:24:48 +02:00
Oliver Boehlk	99dfaa8b8e	Merge pull request 'addFeatures' (#51) from addFeatures into master ... Reviewed-by: Oliver Boehlk <ollitobiasb@gmail.com>	2020-05-03 22:23:10 +02:00
Hawk	5806373236	added profile #48	2020-05-03 20:56:52 +02:00
Hawk	23a0e3d8d0	added logout functionality close #47	2020-05-03 20:46:53 +02:00
Oliver Boehlk	65ce311b2c	Merge pull request 'fixed text wrap issue + restructure' (#50) from responsive into master ... Reviewed-by: Oliver Boehlk <ollitobiasb@gmail.com>	2020-05-02 20:54:54 +02:00
Hawk	06f0ac9d85	fixed text wrap issue + restructure	2020-05-02 20:43:24 +02:00