|
|
b1e939adeb
|
Trying to fix video upload (not working at all yet)
|
2024-08-20 15:30:38 +02:00 |
|
|
|
dfb37e4a86
|
typo fixed
|
2024-08-07 13:56:15 +02:00 |
|
|
|
63ffaf02a6
|
Added documentation to videoscript.js
|
2024-07-18 14:20:44 +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 |
|
|
|
f7f5586d7a
|
JS Code handles code 302 redirect properly now
|
2024-06-15 19:49:41 +02:00 |
|
|
|
3a21fb0914
|
new fields added but can't send video anymore
|
2024-06-15 19:02:38 +02:00 |
|
|
|
1fffa33fe6
|
Small fixes
|
2024-06-13 19:10:15 +02:00 |
|
|
|
1559da44d3
|
Saving after trying a solve for video recording not playing
|
2024-06-10 19:13:45 +02:00 |
|
|
|
35f37fbd30
|
CSS for Videopage fixed!
|
2024-06-10 18:09:24 +02:00 |
|
|
|
624ac2323b
|
trying to fix video record, save before bigger changes
|
2024-06-09 15:59:19 +02:00 |
|
|
|
0a180eac6f
|
Videoscaling works, but startpage layout broken
|
2024-06-06 17:52:58 +02:00 |
|
|
|
bd750eb9a2
|
Some CSS Imporvements
|
2024-06-05 20:55:54 +02:00 |
|
|
|
71590b425b
|
Added Text Input and "required" html tag
|
2024-06-05 20:08:45 +02:00 |
|
|
|
1b1b37d108
|
likert visuals fixed, random order fixed
|
2024-06-04 18:32:54 +02:00 |
|
|
|
01a8e5f021
|
Testtemplate with questions loading now
|
2024-05-30 17:54:28 +02:00 |
|
|
|
6e6868e230
|
Some Bug fixes, block 3 TaskTemplate can now be displayed
|
2024-05-30 13:01:51 +02:00 |
|
|
|
e22b1c0737
|
Update Session should cycle through stimuli now
|
2024-05-30 12:18:30 +02:00 |
|
|
|
a3e3fd1a1b
|
Ein überflüssiges Komma aus dem Json entfernt
|
2024-05-29 20:05:18 +02:00 |
|
|
|
dba3f3076d
|
SinglePages work now, DB Tables are created and can be written
|
2024-05-29 20:04:32 +02:00 |
|
|
|
b582b5e220
|
Aufräumen, auslagern von Testcode in andere files
|
2024-05-19 16:28:51 +02:00 |
|
|
|
50fcf096eb
|
Bisschen aufräumen
|
2024-05-19 13:58:48 +02:00 |
|
|
|
3210d9c133
|
/table_contents funktioniert jetzt!
|
2024-05-19 13:32:51 +02:00 |
|
|
|
770fd3f1e1
|
dict -> tableclass -> write to table seems to work
|
2024-05-14 16:46:10 +02:00 |
|
