Commit Graph

127 Commits

Author SHA1 Message Date
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
Jan
dfb37e4a86 typo fixed 2024-08-07 13:56:15 +02:00
Jan
63ffaf02a6 Added documentation to videoscript.js 2024-07-18 14:20:44 +02:00
be84a7e8b3
Add CI
All checks were successful
continuous-integration/drone/push Build is passing
2024-07-02 12:00:33 +02:00
645fac2e9d Merge branch 'Laptop' into 'main'
Laptop docker update

See merge request JanDickmann/masterproject!3
2024-06-30 10:51:30 +00:00
3918d81495 gitignore uploads 2024-06-30 12:48:35 +02:00
a75efd7a5f Docker Instructions in readme 2024-06-30 12:48:12 +02:00
3e482d2e49 dockerfile, fixing hardcoded url and cleanup 2024-06-30 12:40:39 +02:00
f4bb2959e6 Merge branch 'Laptop' into 'main'
Laptop merge 28.6.

See merge request JanDickmann/masterproject!2
2024-06-28 12:57:29 +00:00
11f051c7d9 Bugfixes und Inhalte/Texte anpassen für Demo 2024-06-27 19:38:32 +02:00
18ec49903b Login requirement added to sites and tested 2024-06-27 18:52:23 +02:00
46f5979aef added login page and functionality 2024-06-27 18:44:55 +02:00
2f6a42d39a added endpage and tracking for completed forms 2024-06-27 17:45:12 +02:00
75202fe7a5 Better placeholder Videos, tested and works 2024-06-26 16:02:03 +02:00
ccf02f2e16 Popup seems to work well now in test 2024-06-26 15:57:39 +02:00
97fa30bc27 some better css for the dialog popup 2024-06-26 12:48:25 +02:00
a4fc083305 Popup video works in test 2024-06-26 11:32:16 +02:00
85fa8b4526 Databasetable names refactoring 2024-06-25 15:47:52 +02:00
eb5169af0f Video uploaded titel is now in the database 2024-06-25 15:45:36 +02:00
5a0a8b257e fixed "current_stimulus_name" bug 2024-06-25 15:02:57 +02:00
5d27caf107 exporting csv and video working 2024-06-25 14:51:04 +02:00
d5bfe8f360 simple csv export for user table implemented 2024-06-25 12:46:16 +02:00
23c05823ac more cleanup and deleting unnecessary code 2024-06-25 12:00:42 +02:00
c9c3bfce12 CSRF removed, double video now working with everything 2024-06-24 13:30:51 +02:00
69220b836a disable csrf and fix bugs 2024-06-21 11:36:47 +02:00
c600c43d79 disable csrf and other stuff for demo tomorrow 2024-06-20 17:28:13 +02:00
d3124f7caa csrf added to startpage and first steps to double video 2024-06-20 17:09:08 +02:00
bda8907a97 added working sqlquery test in table_contents 2024-06-19 17:08:13 +02:00
78e313ad29 Video formats work now and CSRF protection is activ 2024-06-19 15:12:11 +02:00
46a8b2244f CSS improvements and small fixes 2024-06-17 17:24:15 +02:00
88c82eec7e Initial Laptop commit 2024-06-17 11:35:40 +02:00
4f0591d346 Merge branch 'working' into 'main'
Merge Working 17.6.24

See merge request JanDickmann/masterproject!1
2024-06-17 09:20:50 +00:00
Jan
f7f5586d7a JS Code handles code 302 redirect properly now 2024-06-15 19:49:41 +02:00
Jan
3a21fb0914 new fields added but can't send video anymore 2024-06-15 19:02:38 +02:00
Jan
1fffa33fe6 Small fixes 2024-06-13 19:10:15 +02:00
Jan
1559da44d3 Saving after trying a solve for video recording not playing 2024-06-10 19:13:45 +02:00
Jan
35f37fbd30 CSS for Videopage fixed! 2024-06-10 18:09:24 +02:00