Commit graph

  • 3b83ebf3fb Merge pull request 'survey-end' (#211) from survey-end into main main cami 2021-07-30 09:04:42 +0000
  • a626e32cbe Remove apiurl so that no longer the data will get logged cami 2021-07-30 11:01:19 +0200
  • 4c01e68264 Make a box that the study is finished cami 2021-07-30 11:00:02 +0200
  • 7026909c61 Merge pull request 'Remove logging of password and update privacy(fix #203)' (#210) from frontend/remove-log into main cami 2021-07-25 21:36:41 +0000
  • d01a70f925 Updated licenses and privacy cami 2021-07-25 23:36:05 +0200
  • 41143c361b Remove logging of password cami 2021-07-25 23:27:49 +0200
  • 3f6b622088 Merge pull request 'backend/update-requirements' (#209) from backend/update-requirements into main cami 2021-07-24 22:19:50 +0000
  • d5c6aad834 Updated dockerfile cami 2021-07-25 00:19:26 +0200
  • fe5b563139 Updated python requirements cami 2021-07-25 00:15:05 +0200
  • ae82024e94 Merge pull request 'infra/bumpversion' (#208) from infra/bumpversion into main cami 2021-07-24 22:07:26 +0000
  • c5b595ad40 Updated some things for infrastructure cami 2021-07-25 00:05:11 +0200
  • 8bb37bbc21 Updated to upstream cami 2021-07-24 02:11:17 +0200
  • 74ca8d8973 Merge branch 'main' into infra/bumpversion cami 2021-07-24 02:08:39 +0200
  • deecf9ccad Removed unused function cami 2021-07-24 01:16:39 +0200
  • 94070d8f75 Merge pull request 'Update logger config and create a session usermapping (fix #178 and fix #188)' (#206) from frontend/logger-update into main cami 2021-07-23 23:15:34 +0000
  • c52308e623 Update logger config and create a session usermapping cami 2021-07-24 01:14:25 +0200
  • d220f86cb8 Remove the input if someone typed the wrong password cami 2021-07-24 01:10:40 +0200
  • a97c95f762 Bumped version of mongodb cami 2021-07-24 01:08:17 +0200
  • 5816d4f914 Remove unused fontawesome usages cami 2021-07-23 03:46:43 +0200
  • 617741218c Add things about privacy for the user cami 2021-07-23 03:35:09 +0200
  • a373ad4dce Merge pull request 'Fix various issues in the frontend (fix #197 & fix #192)' (#200) from frontend/fix-paste-errormessage into main cami 2021-07-22 23:07:18 +0000
  • 9f4e097e27 Merge branch 'main' into frontend/fix-paste-errormessage cami 2021-07-23 01:05:32 +0200
  • 8e6a74d30c Added a bugfix in the backend cami 2021-07-23 00:52:36 +0200
  • a50c9c924c Merge branch 'main' into backend/bugfix-request cami 2021-07-23 01:04:36 +0200
  • d168b0c87e Add errormessage if username or password are not correct cami 2021-07-23 01:00:14 +0200
  • 1d0f898fc9 Do not allow copy and paste in survey (fix #197) cami 2021-07-23 00:59:39 +0200
  • 90e77bf450 Clean up some things cami 2021-07-23 00:58:34 +0200
  • 31513f4824 Make it not possible to copy the password with css cami 2021-07-23 00:54:29 +0200
  • ffef8f66d2 Added a bugfix in the backend cami 2021-07-23 00:52:36 +0200
  • a1a719088d Added some more options to requests-script cami 2021-07-23 00:51:28 +0200
  • 85e484bf0b Renaming and autoformatting cami 2021-07-22 20:18:01 +0200
  • e762032f00 Merge pull request 'frontend/refactoring' (#195) from frontend/refactoring into main cami 2021-07-22 18:03:20 +0000
  • dcd4215efa Renamed lizenzen.js to Lizenzen.js cami 2021-07-22 20:02:35 +0200
  • 52131aa3dd Refactoring.. cami 2021-07-22 19:55:06 +0200
  • fd205273fc Added content in license page cami 2021-07-22 19:01:40 +0200
  • 9cf2c50d01 Added study button cami 2021-07-22 17:10:35 +0200
  • 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 cami 2021-07-22 14:55:26 +0000
  • 396b45df67 Add text at the end of the study cami 2021-07-22 16:54:24 +0200
  • eaa4d8937a use property to show the value of the actual password cami 2021-07-22 16:53:57 +0200
  • 2f7d733591 Receive password and check if it's the same cami 2021-07-22 16:53:08 +0200
  • f5e58ccb09 Merge branch 'main' into frontend/check-username-pw-survey cami 2021-07-22 07:31:17 +0200
  • ca49c0d0f1 Merge pull request 'Added content' (#187) from content into main cami 2021-07-22 05:30:32 +0000
  • d1bc91bcb7 Added content cami 2021-07-22 07:29:54 +0200
  • 58bd327377 Update some change password things.. cami 2021-07-22 05:20:37 +0200
  • a6346d7496 Password validation works but password is not shown in generated password thing cami 2021-07-22 04:44:31 +0200
  • c1fce5bf4a Change api for random password cami 2021-07-22 03:24:31 +0200
  • 7a930c20b6 Permissions for requests.sh cami 2021-07-22 03:11:50 +0200
  • 130088756d Check if username is the same as in the current session cami 2021-07-22 03:11:28 +0200
  • 770e3e0285 Started implementing username and password check cami 2021-07-22 02:41:24 +0200
  • e7407fd40b Refactoring and removing unused things cami 2021-07-22 02:40:58 +0200
  • 959912bd9b Refactored so that the studyEnd also has its own component cami 2021-07-22 02:40:17 +0200
  • fbbdbd4332 Updated requests script cami 2021-07-22 02:37:04 +0200
  • 117e63e189 Added requests script to not enter all the things always cami 2021-07-22 02:26:06 +0200
  • f00bc19994 Add special character and numbers inside the password cami 2021-07-22 00:02:57 +0200
  • 060f20d25c Merge pull request 'Add multiple subpages for the survey...' (#177) from frontend/survey-multiple-sites into main cami 2021-07-21 21:41:32 +0000
  • 1553f92adf Added multiple situations so the survey is more complete cami 2021-07-21 23:41:10 +0200
  • 146b018ad1 Start logger when starting survey cami 2021-07-21 22:38:31 +0200
  • 65fcf8e4ab Working things cami 2021-07-21 22:04:23 +0200
  • cf481d42e1 Refactoring.. cami 2021-07-21 21:53:57 +0200
  • c5788a00d2 Forceupdate things cami 2021-07-21 21:33:16 +0200
  • d162a4005d Merge pull request 'Refactored some things in the frontend' (#175) from frontend/buttons into main cami 2021-07-21 02:34:24 +0000
  • d055e693aa Refactored some things in the frontend cami 2021-07-21 04:33:52 +0200
  • 1751a37511 Updated and removed some npm packages cami 2021-07-21 04:26:23 +0200
  • e71a64785a Merge branch 'main' into frontend/refactoring cami 2021-07-21 00:23:45 +0000
  • 20da4043a8 Merge pull request 'frontend/refactoring' (#172) from frontend/refactoring into main cami 2021-07-21 00:23:40 +0000
  • 01296702d3 Merge pull request 'Removed last part from password as it's too long' (#171) from backend/change-pw into main cami 2021-07-21 00:23:11 +0000
  • 213dcc9197 Renaming some files. cami 2021-07-21 02:22:40 +0200
  • 966304ac3a Refactored herosection so it is more consistent with other fiels cami 2021-07-21 02:21:40 +0200
  • a56e8ccb5c Renamed behavior to study cami 2021-07-21 02:21:00 +0200
  • 2000072a34 Removed last part from password as it's too long cami 2021-07-21 02:19:47 +0200
  • d0d097d665 Changed nginx port as it won't work otherways :-) cami 2021-07-21 00:17:20 +0200
  • d03a6e4985 Merge pull request 'Added url for my server' (#167) from infra/urlfix into main cami 2021-07-20 21:55:52 +0000
  • a0d8645593 Added url for my server cami 2021-07-20 23:51:48 +0200
  • 008810151f Refactored some things cami 2021-07-19 02:16:49 +0200
  • a5b680d948 Merge pull request 'Added backend for the analytics stuff..' (#162) from analytics/backend-deployment into main cami 2021-07-18 22:00:20 +0000
  • 50b8d4f82e Added backend for the analytics stuff.. cami 2021-07-18 23:59:04 +0200
  • 9808c2509c Merge pull request 'Random passwords during study (fix #120)' (#159) from feature/random-password into main cami 2021-07-18 14:59:00 +0000
  • c67da25cc9 Add generated password to frontend cami 2021-07-18 16:58:02 +0200
  • 5e07b3b7dd Added some more words for password generator cami 2021-07-17 01:45:29 +0200
  • 6da747d632 Add backend API to receive a random password cami 2021-07-17 01:45:11 +0200
  • ecb06e812d Update branch with upstream changes cami 2021-07-17 00:53:49 +0200
  • c306acc97a Remove unused things cami 2021-07-17 00:52:50 +0200
  • 8d7b5daa48 Merge pull request 'Logger works' (#160) from feature/logger-web into main cami 2021-07-16 21:39:21 +0000
  • 6ee3d16f74 Logger works cami 2021-07-16 23:06:38 +0200
  • f64406c74b Backend implementation for random passwords cami 2021-07-16 04:00:01 +0200
  • c9e987a28f Updated some things and logger starts only once cami 2021-07-16 02:16:08 +0200
  • 0e222d3d52 Autoformatting all files cami 2021-07-14 21:05:16 +0200
  • 816689acdf Test the behaviour of the prod-containers locally cami 2021-07-14 17:13:03 +0200
  • 9aa573384b Fixing database error cami 2021-07-14 00:46:51 +0200
  • 46ce8655f3 renamed some thigns cami 2021-07-13 20:25:02 +0200
  • b335a471cb Merge pull request 'Fix broken backend connection in prod build (fix #151)' (#152) from infra/backendconnection into main cami 2021-07-13 18:06:06 +0000
  • ccd53bc2a1 replaced useState from dev.react to stable cami 2021-07-13 20:04:56 +0200
  • 07e83e2f00 added working nginx configuration cami 2021-07-13 20:03:51 +0200
  • d72367ccaa removed port mapping in backend as it's not needed cami 2021-07-13 20:03:20 +0200
  • bab0f6bce5 Merge pull request 'added proxy_pass' (#150) from infra/docker-compose-fix into main cami 2021-07-13 16:14:38 +0000
  • ee04215382 added proxy_pass cami 2021-07-13 18:13:46 +0200
  • 9e16129aa5 Merge pull request 'Updated docker-compose file for production use' (#149) from infra/docker-compose-fix into main cami 2021-07-12 22:39:24 +0000
  • d28964dd1f added nginx back :-) cami 2021-07-13 00:38:46 +0200
  • 1b7aba4a70 Updated docker-compose file for production use cami 2021-07-13 00:08:36 +0200
  • 7e77a67aac Merge pull request 'Removed nginx to test if it works without' (#148) from infra/bugfix into main cami 2021-07-12 21:48:10 +0000