299 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
cami	01296702d3	Merge pull request 'Removed last part from password as it's too long' (#171) from backend/change-pw into main ... Reviewed-on: #171	2021-07-21 00:23:11 +00:00
cami	213dcc9197	Renaming some files.	2021-07-21 02:22:40 +02:00
cami	966304ac3a	Refactored herosection so it is more consistent with other fiels	2021-07-21 02:21:40 +02:00
cami	a56e8ccb5c	Renamed behavior to study	2021-07-21 02:21:00 +02:00
cami	2000072a34	Removed last part from password as it's too long	2021-07-21 02:19:47 +02:00
cami	d0d097d665	Changed nginx port as it won't work otherways :-)	2021-07-21 00:17:20 +02:00
cami	d03a6e4985	Merge pull request 'Added url for my server' (#167) from infra/urlfix into main ... Reviewed-on: #167	2021-07-20 21:55:52 +00:00
cami	a0d8645593	Added url for my server	2021-07-20 23:51:48 +02:00
cami	008810151f	Refactored some things	2021-07-19 02:16:49 +02:00
cami	a5b680d948	Merge pull request 'Added backend for the analytics stuff..' (#162) from analytics/backend-deployment into main ... Reviewed-on: #162	2021-07-18 22:00:20 +00:00
cami	50b8d4f82e	Added backend for the analytics stuff..	2021-07-18 23:59:04 +02:00
cami	9808c2509c	Merge pull request 'Random passwords during study (fix #120)' (#159) from feature/random-password into main ... Reviewed-on: #159	2021-07-18 14:59:00 +00:00
cami	c67da25cc9	Add generated password to frontend	2021-07-18 16:58:02 +02:00
cami	5e07b3b7dd	Added some more words for password generator	2021-07-17 01:45:29 +02:00
cami	6da747d632	Add backend API to receive a random password	2021-07-17 01:45:11 +02:00
cami	ecb06e812d	Update branch with upstream changes	2021-07-17 00:53:49 +02:00
cami	c306acc97a	Remove unused things	2021-07-17 00:52:50 +02:00
cami	8d7b5daa48	Merge pull request 'Logger works' (#160) from feature/logger-web into main ... Reviewed-on: #160	2021-07-16 21:39:21 +00:00
cami	6ee3d16f74	Logger works	2021-07-16 23:06:38 +02:00
cami	f64406c74b	Backend implementation for random passwords	2021-07-16 04:00:01 +02:00
cami	c9e987a28f	Updated some things and logger starts only once	2021-07-16 02:16:08 +02:00
cami	0e222d3d52	Autoformatting all files	2021-07-14 21:05:16 +02:00
cami	816689acdf	Test the behaviour of the prod-containers locally	2021-07-14 17:13:03 +02:00
cami	9aa573384b	Fixing database error	2021-07-14 00:46:51 +02:00
cami	46ce8655f3	renamed some thigns	2021-07-13 20:25:02 +02:00
cami	b335a471cb	Merge pull request 'Fix broken backend connection in prod build (fix #151)' (#152) from infra/backendconnection into main ... Reviewed-on: #152	2021-07-13 18:06:06 +00:00
cami	ccd53bc2a1	replaced useState from dev.react to stable	2021-07-13 20:04:56 +02:00
cami	07e83e2f00	added working nginx configuration	2021-07-13 20:03:51 +02:00
cami	d72367ccaa	removed port mapping in backend as it's not needed	2021-07-13 20:03:20 +02:00
cami	bab0f6bce5	Merge pull request 'added proxy_pass' (#150) from infra/docker-compose-fix into main ... Reviewed-on: #150	2021-07-13 16:14:38 +00:00
cami	ee04215382	added proxy_pass	2021-07-13 18:13:46 +02:00
cami	9e16129aa5	Merge pull request 'Updated docker-compose file for production use' (#149) from infra/docker-compose-fix into main ... Reviewed-on: #149	2021-07-12 22:39:24 +00:00
cami	d28964dd1f	added nginx back :-)	2021-07-13 00:38:46 +02:00
cami	1b7aba4a70	Updated docker-compose file for production use	2021-07-13 00:08:36 +02:00
cami	7e77a67aac	Merge pull request 'Removed nginx to test if it works without' (#148) from infra/bugfix into main ... Reviewed-on: #148	2021-07-12 21:48:10 +00:00
cami	97b7bc3212	Removed nginx to test if it works without	2021-07-12 23:47:39 +02:00
cami	18094fae3c	Merge pull request 'Update' (#147) from infra/bugfix into main ... Reviewed-on: #147	2021-07-12 21:14:16 +00:00
cami	599f6a2e52	Update	2021-07-12 23:13:53 +02:00
cami	ccd7dfb0e0	Merge pull request 'new npm things..' (#146) from infra/bugfix into main ... Reviewed-on: #146	2021-07-12 21:10:25 +00:00
cami	3b0288dc35	new npm things..	2021-07-12 23:09:49 +02:00
cami	09bbb2e2a4	Merge pull request 'bugfixing..' (#145) from infra/bugfix into main ... Reviewed-on: #145	2021-07-12 20:59:56 +00:00
cami	f4e501458e	bugfixing..	2021-07-12 22:59:34 +02:00
cami	d9f87eb26d	Merge pull request 'Removed react scripts' (#144) from infra/bugfix into main ... Reviewed-on: #144	2021-07-12 20:48:36 +00:00
cami	3965859f0d	Removed react scripts	2021-07-12 22:47:47 +02:00
cami	0ea048048b	Merge pull request 'Use prod build for public things' (#143) from cicd2 into main ... Reviewed-on: #143	2021-07-12 20:38:55 +00:00
cami	5d15fbcd3d	Use prod build for public things	2021-07-12 22:38:20 +02:00
cami	a065ce33c8	Merge pull request 'update' (#142) from cicd2 into main ... Reviewed-on: #142	2021-07-12 20:25:51 +00:00
cami	e98ae905ce	update	2021-07-12 22:25:17 +02:00
cami	9475e61246	Merge pull request 'Update context' (#141) from cicd2 into main ... Reviewed-on: #141	2021-07-12 17:06:19 +00:00
cami	fbbea1a8d1	Update context	2021-07-12 19:05:33 +02:00