Commit Graph

113 Commits

Author SHA1 Message Date
Jan
df80e62707 Merge pull request 'video management' (#11) from working into main
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #11
2024-10-13 16:14:08 +02:00
Jan
edcd32db47 small improvement to video management page 2024-10-13 16:13:03 +02:00
Jan
e253586467 video management page now exists 2024-10-13 16:09:42 +02:00
Jan
45d2874999 Merge pull request 'More fixes, those are the final texts !!!' (#10) from working into main
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #10
2024-10-13 15:43:46 +02:00
Jan
728c282a3d try to remove database via git 2024-10-13 15:42:25 +02:00
Jan
23e6ee55c6 multiple choice bug fixed 2024-10-13 15:29:30 +02:00
Jan
52db4cc0fb fixed small bug 2024-10-13 15:22:18 +02:00
Jan
2702ce3c3c password is checked via hash now 2024-10-13 15:18:14 +02:00
Jan
ab27d70946 More fixes, those are the final texts !!! 2024-10-07 14:05:43 +02:00
Jan
39bf5861b8 Merge pull request 'small fixes' (#9) from working into main
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #9
2024-10-07 12:18:33 +02:00
Jan
73fc70917c Small fixes 2024-10-07 12:16:42 +02:00
Jan
8898f7dfb8 root page now redirects to start, /all_links exists 2024-10-07 10:29:54 +02:00
Jan
9bbbd39c9b Merge pull request 'added impressum page' (#8) from working into main
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #8
2024-10-07 10:18:59 +02:00
Jan
aa2fa44207 added impressum page 2024-10-07 10:17:53 +02:00
Jan
a329baeb78 Merge pull request 'Feedback von Ella' (#7) from working into main
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #7
2024-10-03 17:41:58 +02:00
Jan
15ae63d48b Feedback von Ella 2024-10-02 15:54:24 +02:00
Jan
97cb17733e Merge pull request 'working' (#6) from working into main
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #6
2024-10-02 13:23:44 +02:00
Jan
0d92d281e1 New Email: avatarstudy@proton.me as contact 2024-10-02 13:19:12 +02:00
Jan
38e9c9f7ed Can now export the db 2024-10-02 13:03:32 +02:00
Jan
3ca3307528 gitignore the exports 2024-10-02 12:54:15 +02:00
Jan
666a92ecd0 Now with calibration phase 2024-10-02 12:46:24 +02:00
Jan
64d89a8821 Merge pull request 'working' (#5) from working into main
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #5
2024-10-02 12:25:24 +02:00
Jan
ecf5531026 Some more finetuning of the study 2024-10-02 12:24:14 +02:00
Jan
8edfd3ef2f slight text adjustment 2024-09-23 15:56:35 +02:00
Jan
f29ba7c8e0 Merge pull request 'update für Feedback' (#4) from working into main
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #4
2024-09-23 15:17:21 +02:00
Jan
5eed494c16 Some finetuning before feedback 2024-09-23 15:15:32 +02:00
Jan
c4e312662c Video timer now implemented (videos stop after 75 seconds) 2024-09-21 11:50:34 +02:00
Jan
785b4c4ff5 Some adjustments to video sizes, max record length is now 80sek 2024-09-19 16:50:19 +02:00
Jan
915b69a775 Merge pull request 'working into main, userstudy mostly finished' (#3) from working into main
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #3
2024-09-19 15:26:30 +02:00
Jan
c630f4e54b userstudy1 finalized, also some bug fixes and small improvements 2024-09-19 15:22:33 +02:00
Jan
664c5bc1af New feature: infovide text can be html block now 2024-09-18 17:53:59 +02:00
Jan
428a9b0b44 Fixed a but with singlepages in the startpage backend 2024-09-18 16:51:57 +02:00
Jan
f4dd20e76d Added into page, some more progress and a small bugfixtypo 2024-09-18 16:40:10 +02:00
Jan
8a1c7aff42 More UI improvements 2024-09-17 17:03:44 +02:00
Jan
91802c2ecd small corrections 2024-09-15 18:42:40 +02:00
Jan
3c37288476 Small typo/bugfix and more progress 2024-09-15 18:17:42 +02:00
Jan
5ad3676b7f progress on studytest css 2024-09-15 18:12:21 +02:00
Jan
4c6ec411b1 startpage text is set up now 2024-09-13 16:39:24 +02:00
Jan
f0526555f1 Start 2024-09-13 16:38:43 +02:00
Jan
ceb5e0bec9 Added Datenschutzerklärung Page 2024-09-12 18:45:33 +02:00
Jan
d758e97001 Videos are now locally hosted, it works 2024-09-12 18:13:40 +02:00
Jan
cdbb57d50d multiple choice implemented + Dem Quest implemented 2024-09-05 16:36:44 +02:00
Jan
cf630bc040 Merge pull request 'Cleanup, now redirects work again' (#2) from working into main
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #2
2024-08-20 17:12:40 +02:00
Jan
73127d9950 Redirects uncommented again 2024-08-20 17:10:25 +02:00
Jan
7e331ba91b Leafblade git instructions in readme 2024-08-20 17:04:39 +02:00
Jan
fb82d4c19a Merge pull request 'Merging Latest changes into main' (#1) from working into main
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #1
2024-08-20 17:03:27 +02:00
56a20f4465 Merge branch 'working' into 'main'
Working again

See merge request JanDickmann/masterproject!4
2024-08-20 14:37:14 +00:00
Jan
3eac9d64cb Fixed Video upload not working 2024-08-20 16:29:51 +02:00
Jan
54e805ec50 removing comments again, but still not working 2024-08-20 15:48:05 +02:00
Jan
b1e939adeb Trying to fix video upload (not working at all yet) 2024-08-20 15:30:38 +02:00