 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
|
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
|
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
|
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
|
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 |
|
|
Jan
|
645fac2e9d
|
Merge branch 'Laptop' into 'main'
Laptop docker update
See merge request JanDickmann/masterproject!3
|
2024-06-30 10:51:30 +00:00 |
|
|
Jan
|
3918d81495
|
gitignore uploads
|
2024-06-30 12:48:35 +02:00 |
|
|
Jan
|
a75efd7a5f
|
Docker Instructions in readme
|
2024-06-30 12:48:12 +02:00 |
|
|
Jan
|
3e482d2e49
|
dockerfile, fixing hardcoded url and cleanup
|
2024-06-30 12:40:39 +02:00 |
|
|
Jan
|
f4bb2959e6
|
Merge branch 'Laptop' into 'main'
Laptop merge 28.6.
See merge request JanDickmann/masterproject!2
|
2024-06-28 12:57:29 +00:00 |
|
|
Jan
|
11f051c7d9
|
Bugfixes und Inhalte/Texte anpassen für Demo
|
2024-06-27 19:38:32 +02:00 |
|
|
Jan
|
18ec49903b
|
Login requirement added to sites and tested
|
2024-06-27 18:52:23 +02:00 |
|
|
Jan
|
46f5979aef
|
added login page and functionality
|
2024-06-27 18:44:55 +02:00 |
|
|
Jan
|
2f6a42d39a
|
added endpage and tracking for completed forms
|
2024-06-27 17:45:12 +02:00 |
|
|
Jan
|
75202fe7a5
|
Better placeholder Videos, tested and works
|
2024-06-26 16:02:03 +02:00 |
|
|
Jan
|
ccf02f2e16
|
Popup seems to work well now in test
|
2024-06-26 15:57:39 +02:00 |
|
|
Jan
|
97fa30bc27
|
some better css for the dialog popup
|
2024-06-26 12:48:25 +02:00 |
|
|
Jan
|
a4fc083305
|
Popup video works in test
|
2024-06-26 11:32:16 +02:00 |
|
|
Jan
|
85fa8b4526
|
Databasetable names refactoring
|
2024-06-25 15:47:52 +02:00 |
|
|
Jan
|
eb5169af0f
|
Video uploaded titel is now in the database
|
2024-06-25 15:45:36 +02:00 |
|
|
Jan
|
5a0a8b257e
|
fixed "current_stimulus_name" bug
|
2024-06-25 15:02:57 +02:00 |
|
|
Jan
|
5d27caf107
|
exporting csv and video working
|
2024-06-25 14:51:04 +02:00 |
|
|
Jan
|
d5bfe8f360
|
simple csv export for user table implemented
|
2024-06-25 12:46:16 +02:00 |
|
|
Jan
|
23c05823ac
|
more cleanup and deleting unnecessary code
|
2024-06-25 12:00:42 +02:00 |
|
|
Jan
|
c9c3bfce12
|
CSRF removed, double video now working with everything
|
2024-06-24 13:30:51 +02:00 |
|
|
Jan
|
69220b836a
|
disable csrf and fix bugs
|
2024-06-21 11:36:47 +02:00 |
|
|
Jan
|
c600c43d79
|
disable csrf and other stuff for demo tomorrow
|
2024-06-20 17:28:13 +02:00 |
|
|
Jan
|
d3124f7caa
|
csrf added to startpage and first steps to double video
|
2024-06-20 17:09:08 +02:00 |
|
|
Jan
|
bda8907a97
|
added working sqlquery test in table_contents
|
2024-06-19 17:08:13 +02:00 |
|
|
Jan
|
78e313ad29
|
Video formats work now and CSRF protection is activ
|
2024-06-19 15:12:11 +02:00 |
|
|
Jan
|
46a8b2244f
|
CSS improvements and small fixes
|
2024-06-17 17:24:15 +02:00 |
|
|
Jan
|
88c82eec7e
|
Initial Laptop commit
|
2024-06-17 11:35:40 +02:00 |
|
|
Jan
|
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 |
|
|
Jan
|
624ac2323b
|
trying to fix video record, save before bigger changes
|
2024-06-09 15:59:19 +02:00 |
|
|
Jan
|
0a180eac6f
|
Videoscaling works, but startpage layout broken
|
2024-06-06 17:52:58 +02:00 |
|
|
Jan
|
bd750eb9a2
|
Some CSS Imporvements
|
2024-06-05 20:55:54 +02:00 |
|
|
Jan
|
71590b425b
|
Added Text Input and "required" html tag
|
2024-06-05 20:08:45 +02:00 |
|
|
Jan
|
1b1b37d108
|
likert visuals fixed, random order fixed
|
2024-06-04 18:32:54 +02:00 |
|
|
Jan
|
01a8e5f021
|
Testtemplate with questions loading now
|
2024-05-30 17:54:28 +02:00 |
|
|
Jan
|
6e6868e230
|
Some Bug fixes, block 3 TaskTemplate can now be displayed
|
2024-05-30 13:01:51 +02:00 |
|
|
Jan
|
e22b1c0737
|
Update Session should cycle through stimuli now
|
2024-05-30 12:18:30 +02:00 |
|
|
Jan
|
a3e3fd1a1b
|
Ein überflüssiges Komma aus dem Json entfernt
|
2024-05-29 20:05:18 +02:00 |
|
|
Jan
|
dba3f3076d
|
SinglePages work now, DB Tables are created and can be written
|
2024-05-29 20:04:32 +02:00 |
|
|
Jan
|
b582b5e220
|
Aufräumen, auslagern von Testcode in andere files
|
2024-05-19 16:28:51 +02:00 |
|
|
Jan
|
50fcf096eb
|
Bisschen aufräumen
|
2024-05-19 13:58:48 +02:00 |
|
|
Jan
|
3210d9c133
|
/table_contents funktioniert jetzt!
|
2024-05-19 13:32:51 +02:00 |
|
|
Jan
|
770fd3f1e1
|
dict -> tableclass -> write to table seems to work
|
2024-05-14 16:46:10 +02:00 |
|
|
Jan
|
dfa7156b9f
|
some testing prep, but probably obsolete
|
2024-04-25 16:51:08 +02:00 |
|
|
Jan
|
b14bc2d608
|
Favicon added maybe more idk
|
2024-04-23 17:24:50 +02:00 |
|
|
Jan
|
05d0200275
|
Lots of ui work
|
2024-04-16 19:05:12 +02:00 |
|
|
Jan
|
2e0426f3e2
|
Cleanup and add video page
|
2024-03-29 18:03:29 +01:00 |
|
|
Jan
|
dd7770ecb6
|
Random order working!
|
2024-03-25 19:31:18 +01:00 |
|
|
Jan
|
b02890bf71
|
Initial commit
|
2024-03-25 16:00:03 +00:00 |
|
|
Jan
|
4527b62444
|
Viel aufgeräumter und es funktioniert scheinbar
|
2024-03-25 16:43:34 +01:00 |
|
|
Jan
|
6a0d9cfd69
|
Cleaning up mostly
|
2024-03-25 16:14:00 +01:00 |
|
|
Jan
|
3959bd6295
|
Can create forms from json now, but not final
|
2024-03-22 16:23:53 +01:00 |
|
|
Jan
|
955726bae0
|
Setting cookies to remember users works now, but not yet with sessions.
|
2024-03-15 16:44:25 +01:00 |
|
|
Jan
|
9d54ae67db
|
Can read and write the database now!
|
2024-03-15 10:12:24 +01:00 |
|
|
Jan
|
d023307ccd
|
Database is there and gets initialized
|
2024-03-14 15:50:36 +01:00 |
|
|
Jan
|
4fc6765b1d
|
First commit, already played around a bit
|
2024-03-13 15:56:34 +01:00 |
|