Commit graph

311 commits

Author SHA1 Message Date
3b83ebf3fb Merge pull request 'survey-end' (#211) from survey-end into main
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #211
2021-07-30 09:04:42 +00:00
a626e32cbe Remove apiurl so that no longer the data will get logged
All checks were successful
continuous-integration/drone/push Build is passing
continuous-integration/drone/pr Build is passing
2021-07-30 11:01:19 +02:00
4c01e68264 Make a box that the study is finished 2021-07-30 11:00:02 +02:00
7026909c61 Merge pull request 'Remove logging of password and update privacy(fix #203)' (#210) from frontend/remove-log into main
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #210
2021-07-25 21:36:41 +00:00
d01a70f925 Updated licenses and privacy
All checks were successful
continuous-integration/drone/push Build is passing
continuous-integration/drone/pr Build is passing
2021-07-25 23:36:05 +02:00
41143c361b Remove logging of password
All checks were successful
continuous-integration/drone/push Build is passing
continuous-integration/drone/pr Build is passing
2021-07-25 23:27:49 +02:00
3f6b622088 Merge pull request 'backend/update-requirements' (#209) from backend/update-requirements into main
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #209
2021-07-24 22:19:50 +00:00
d5c6aad834 Updated dockerfile
All checks were successful
continuous-integration/drone/push Build is passing
continuous-integration/drone/pr Build is passing
2021-07-25 00:19:26 +02:00
fe5b563139 Updated python requirements
All checks were successful
continuous-integration/drone/push Build is passing
2021-07-25 00:15:05 +02:00
ae82024e94 Merge pull request 'infra/bumpversion' (#208) from infra/bumpversion into main
Some checks failed
continuous-integration/drone/push Build is failing
Reviewed-on: #208
2021-07-24 22:07:26 +00:00
c5b595ad40 Updated some things for infrastructure
All checks were successful
continuous-integration/drone/push Build is passing
continuous-integration/drone/pr Build is passing
2021-07-25 00:05:11 +02:00
8bb37bbc21 Updated to upstream
All checks were successful
continuous-integration/drone/push Build is passing
2021-07-24 02:11:17 +02:00
74ca8d8973 Merge branch 'main' into infra/bumpversion 2021-07-24 02:08:39 +02:00
deecf9ccad Removed unused function
All checks were successful
continuous-integration/drone/pr Build is passing
continuous-integration/drone/push Build is passing
2021-07-24 01:16:39 +02:00
94070d8f75 Merge pull request 'Update logger config and create a session usermapping (fix #178 and fix #188)' (#206) from frontend/logger-update into main
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #206
2021-07-23 23:15:34 +00:00
c52308e623 Update logger config and create a session usermapping
All checks were successful
continuous-integration/drone/push Build is passing
continuous-integration/drone/pr Build is passing
2021-07-24 01:14:25 +02:00
d220f86cb8 Remove the input if someone typed the wrong password
All checks were successful
continuous-integration/drone/pr Build is passing
continuous-integration/drone/push Build is passing
2021-07-24 01:10:40 +02:00
a97c95f762 Bumped version of mongodb 2021-07-24 01:08:17 +02:00
5816d4f914 Remove unused fontawesome usages
All checks were successful
continuous-integration/drone/pr Build is passing
continuous-integration/drone/push Build is passing
2021-07-23 03:46:43 +02:00
617741218c Add things about privacy for the user
All checks were successful
continuous-integration/drone/pr Build is passing
continuous-integration/drone/push Build is passing
2021-07-23 03:35:09 +02:00
a373ad4dce Merge pull request 'Fix various issues in the frontend (fix #197 & fix #192)' (#200) from frontend/fix-paste-errormessage into main
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #200
2021-07-22 23:07:18 +00:00
9f4e097e27 Merge branch 'main' into frontend/fix-paste-errormessage
All checks were successful
continuous-integration/drone/push Build is passing
continuous-integration/drone/pr Build is passing
2021-07-23 01:05:32 +02:00
8e6a74d30c Added a bugfix in the backend
All checks were successful
continuous-integration/drone/push Build is passing
2021-07-22 23:05:13 +00:00
d168b0c87e Add errormessage if username or password are not correct
All checks were successful
continuous-integration/drone/push Build is passing
2021-07-23 01:00:14 +02:00
1d0f898fc9 Do not allow copy and paste in survey (fix #197) 2021-07-23 00:59:39 +02:00
90e77bf450 Clean up some things 2021-07-23 00:58:34 +02:00
31513f4824 Make it not possible to copy the password with css 2021-07-23 00:54:29 +02:00
a1a719088d Added some more options to requests-script
All checks were successful
continuous-integration/drone/pr Build is passing
continuous-integration/drone/push Build is passing
2021-07-23 00:51:28 +02:00
85e484bf0b Renaming and autoformatting
All checks were successful
continuous-integration/drone/pr Build is passing
continuous-integration/drone/push Build is passing
- renamed the react files to jsx
- autoformat with vscode
2021-07-22 20:18:01 +02:00
e762032f00 Merge pull request 'frontend/refactoring' (#195) from frontend/refactoring into main
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #195
2021-07-22 18:03:20 +00:00
dcd4215efa Renamed lizenzen.js to Lizenzen.js
All checks were successful
continuous-integration/drone/push Build is passing
continuous-integration/drone/pr Build is passing
2021-07-22 20:02:35 +02:00
52131aa3dd Refactoring..
All checks were successful
continuous-integration/drone/push Build is passing
- use STATES instead of multiple different variables
- add check if password is correct
-
2021-07-22 19:55:06 +02:00
fd205273fc Added content in license page
All checks were successful
continuous-integration/drone/pr Build is passing
continuous-integration/drone/push Build is passing
2021-07-22 19:01:40 +02:00
9cf2c50d01 Added study button
All checks were successful
continuous-integration/drone/pr Build is passing
continuous-integration/drone/push Build is passing
2021-07-22 17:10:35 +02:00
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
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #185
2021-07-22 14:55:26 +00:00
396b45df67 Add text at the end of the study
All checks were successful
continuous-integration/drone/push Build is passing
continuous-integration/drone/pr Build is passing
2021-07-22 16:54:24 +02:00
eaa4d8937a use property to show the value of the actual password 2021-07-22 16:53:57 +02:00
2f7d733591 Receive password and check if it's the same 2021-07-22 16:53:08 +02:00
f5e58ccb09 Merge branch 'main' into frontend/check-username-pw-survey
All checks were successful
continuous-integration/drone/push Build is passing
continuous-integration/drone/pr Build is passing
2021-07-22 07:31:17 +02:00
ca49c0d0f1 Merge pull request 'Added content' (#187) from content into main
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #187
2021-07-22 05:30:32 +00:00
d1bc91bcb7 Added content
All checks were successful
continuous-integration/drone/push Build is passing
continuous-integration/drone/pr Build is passing
2021-07-22 07:29:54 +02:00
58bd327377 Update some change password things..
All checks were successful
continuous-integration/drone/push Build is passing
continuous-integration/drone/pr Build is passing
2021-07-22 05:20:37 +02:00
a6346d7496 Password validation works but password is not shown in generated password thing
All checks were successful
continuous-integration/drone/push Build is passing
continuous-integration/drone/pr Build is passing
2021-07-22 04:44:31 +02:00
c1fce5bf4a Change api for random password
All checks were successful
continuous-integration/drone/push Build is passing
continuous-integration/drone/pr Build is passing
2021-07-22 03:24:31 +02:00
7a930c20b6 Permissions for requests.sh
All checks were successful
continuous-integration/drone/push Build is passing
continuous-integration/drone/pr Build is passing
2021-07-22 03:11:50 +02:00
130088756d Check if username is the same as in the current session 2021-07-22 03:11:28 +02:00
770e3e0285 Started implementing username and password check 2021-07-22 02:41:24 +02:00
e7407fd40b Refactoring and removing unused things 2021-07-22 02:40:58 +02:00
959912bd9b Refactored so that the studyEnd also has its own component 2021-07-22 02:40:17 +02:00
fbbdbd4332 Updated requests script
All checks were successful
continuous-integration/drone/pr Build is passing
continuous-integration/drone/push Build is passing
2021-07-22 02:37:04 +02:00