286 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
cami	a50c9c924c	Merge branch 'main' into backend/bugfix-request	2021-07-23 01:04:36 +02:00
cami	ffef8f66d2	Added a bugfix in the backend	2021-07-23 00:52:36 +02:00
cami	a1a719088d	Added some more options to requests-script	2021-07-23 00:51:28 +02:00
cami	85e484bf0b	Renaming and autoformatting ... - renamed the react files to jsx - autoformat with vscode	2021-07-22 20:18:01 +02:00
cami	e762032f00	Merge pull request 'frontend/refactoring' (#195) from frontend/refactoring into main ... Reviewed-on: #195	2021-07-22 18:03:20 +00:00
cami	dcd4215efa	Renamed lizenzen.js to Lizenzen.js	2021-07-22 20:02:35 +02:00
cami	52131aa3dd	Refactoring.. ... - use STATES instead of multiple different variables - add check if password is correct -	2021-07-22 19:55:06 +02:00
cami	fd205273fc	Added content in license page	2021-07-22 19:01:40 +02:00
cami	9cf2c50d01	Added study button	2021-07-22 17:10:35 +02:00
cami	47166c6345	Merge pull request 'Check in the frontend if the username and password in the survey are correct (fix #179)' (#185) from frontend/check-username-pw-survey into main ... Reviewed-on: #185	2021-07-22 14:55:26 +00:00
cami	396b45df67	Add text at the end of the study	2021-07-22 16:54:24 +02:00
cami	eaa4d8937a	use property to show the value of the actual password	2021-07-22 16:53:57 +02:00
cami	2f7d733591	Receive password and check if it's the same	2021-07-22 16:53:08 +02:00
cami	f5e58ccb09	Merge branch 'main' into frontend/check-username-pw-survey	2021-07-22 07:31:17 +02:00
cami	ca49c0d0f1	Merge pull request 'Added content' (#187) from content into main ... Reviewed-on: #187	2021-07-22 05:30:32 +00:00
cami	d1bc91bcb7	Added content	2021-07-22 07:29:54 +02:00
cami	58bd327377	Update some change password things..	2021-07-22 05:20:37 +02:00
cami	a6346d7496	Password validation works but password is not shown in generated password thing	2021-07-22 04:44:31 +02:00
cami	c1fce5bf4a	Change api for random password	2021-07-22 03:24:31 +02:00
cami	7a930c20b6	Permissions for requests.sh	2021-07-22 03:11:50 +02:00
cami	130088756d	Check if username is the same as in the current session	2021-07-22 03:11:28 +02:00
cami	770e3e0285	Started implementing username and password check	2021-07-22 02:41:24 +02:00
cami	e7407fd40b	Refactoring and removing unused things	2021-07-22 02:40:58 +02:00
cami	959912bd9b	Refactored so that the studyEnd also has its own component	2021-07-22 02:40:17 +02:00
cami	fbbdbd4332	Updated requests script	2021-07-22 02:37:04 +02:00
cami	117e63e189	Added requests script to not enter all the things always	2021-07-22 02:26:06 +02:00
cami	f00bc19994	Add special character and numbers inside the password	2021-07-22 00:02:57 +02:00
cami	060f20d25c	Merge pull request 'Add multiple subpages for the survey...' (#177) from frontend/survey-multiple-sites into main ... Reviewed-on: #177	2021-07-21 21:41:32 +00:00
cami	1553f92adf	Added multiple situations so the survey is more complete	2021-07-21 23:41:10 +02:00
cami	146b018ad1	Start logger when starting survey	2021-07-21 22:38:31 +02:00
cami	65fcf8e4ab	Working things	2021-07-21 22:04:23 +02:00
cami	cf481d42e1	Refactoring..	2021-07-21 21:53:57 +02:00
cami	c5788a00d2	Forceupdate things	2021-07-21 21:33:16 +02:00
cami	d162a4005d	Merge pull request 'Refactored some things in the frontend' (#175) from frontend/buttons into main ... Reviewed-on: #175	2021-07-21 02:34:24 +00:00
cami	d055e693aa	Refactored some things in the frontend ... - use button insted of inputfield - make use of conditional rendering	2021-07-21 04:33:52 +02:00
cami	1751a37511	Updated and removed some npm packages	2021-07-21 04:26:23 +02:00
cami	20da4043a8	Merge pull request 'frontend/refactoring' (#172) from frontend/refactoring into main ... Reviewed-on: #172	2021-07-21 00:23:40 +00:00
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