Commit Graph

Select branches

Hide Pull Requests

main

working

#1

#10

#11

#12

#13

#14

#15

#16

#17

#2

#3

#4

#5

#6

#7

#8

#9

Mono Color

• 08c78bb568 Merge pull request 'Adding disclaimer as seperate site' (#17) from working into main main Jan 2024-11-19 16:00:02 +0100
• 807d104d06 Adding disclaimer as seperate site working Jan 2024-11-19 15:58:23 +0100
• 09d26bd73f Merge pull request 'Added new disclaimer Video' (#16) from working into main Jan 2024-11-19 14:24:22 +0100
• 053aa4bd5a Added new disclaimer Video Jan 2024-11-19 14:22:55 +0100
• 1d1f5be753 Merge pull request 'Removed the hopefuly last placeholdervideo' (#15) from working into main Jan 2024-11-13 11:22:40 +0100
• 40e24501f6 Removed the hopefuly last placeholdervideo Jan 2024-11-13 11:16:41 +0100
• aedc1cf9ea Merge pull request 'letzte kleine fixes' (#14) from working into main Jan 2024-11-13 11:11:57 +0100
• 522d10f422 Small file naming typo fixed Jan 2024-11-13 11:05:52 +0100
• 789d49a2c9 Fixed error in p3info text Jan 2024-11-13 11:02:41 +0100
• f548c60157 Merge pull request 'final study push (hopefully)' (#13) from working into main Jan 2024-11-12 16:19:17 +0100
• 86c5f3fdea Final changes (deploy without exp videos) Jan 2024-11-12 16:17:07 +0100
• 26c28cd0da 0044 as learning phase video now Jan 2024-10-23 15:51:42 +0200
• da2c959ba7 Merge pull request 'new Videos and task 3 Text corrected' (#12) from working into main Jan 2024-10-23 14:22:04 +0200
• e1b814da4f new Videos and task 3 Text corrected Jan 2024-10-23 14:20:07 +0200
• df80e62707 Merge pull request 'video management' (#11) from working into main Jan 2024-10-13 16:14:08 +0200
• edcd32db47 small improvement to video management page Jan 2024-10-13 16:13:03 +0200
• e253586467 video management page now exists Jan 2024-10-13 16:09:42 +0200
• 45d2874999 Merge pull request 'More fixes, those are the final texts !!!' (#10) from working into main Jan 2024-10-13 15:43:46 +0200
• 728c282a3d try to remove database via git Jan 2024-10-13 15:42:25 +0200
• 23e6ee55c6 multiple choice bug fixed Jan 2024-10-13 15:29:30 +0200
• 52db4cc0fb fixed small bug Jan 2024-10-13 15:22:18 +0200
• 2702ce3c3c password is checked via hash now Jan 2024-10-13 15:18:14 +0200
• ab27d70946 More fixes, those are the final texts !!! Jan 2024-10-07 14:05:43 +0200
• 39bf5861b8 Merge pull request 'small fixes' (#9) from working into main Jan 2024-10-07 12:18:33 +0200
• 73fc70917c Small fixes Jan 2024-10-07 12:16:42 +0200
• 8898f7dfb8 root page now redirects to start, /all_links exists Jan 2024-10-07 10:29:54 +0200
• 9bbbd39c9b Merge pull request 'added impressum page' (#8) from working into main Jan 2024-10-07 10:18:59 +0200
• aa2fa44207 added impressum page Jan 2024-10-07 10:17:53 +0200
• a329baeb78 Merge pull request 'Feedback von Ella' (#7) from working into main Jan 2024-10-03 17:41:58 +0200
• 15ae63d48b Feedback von Ella Jan 2024-10-02 15:54:24 +0200
• 97cb17733e Merge pull request 'working' (#6) from working into main Jan 2024-10-02 13:23:44 +0200
• 0d92d281e1 New Email: avatarstudy@proton.me as contact Jan 2024-10-02 13:19:12 +0200
• 38e9c9f7ed Can now export the db Jan 2024-10-02 13:03:32 +0200
• 3ca3307528 gitignore the exports Jan 2024-10-02 12:54:15 +0200
• 666a92ecd0 Now with calibration phase Jan 2024-10-02 12:46:24 +0200
• 64d89a8821 Merge pull request 'working' (#5) from working into main Jan 2024-10-02 12:25:24 +0200
• ecf5531026 Some more finetuning of the study Jan 2024-10-02 12:24:14 +0200
• 8edfd3ef2f slight text adjustment Jan 2024-09-23 15:56:35 +0200
• f29ba7c8e0 Merge pull request 'update für Feedback' (#4) from working into main Jan 2024-09-23 15:17:21 +0200
• 5eed494c16 Some finetuning before feedback Jan 2024-09-23 15:15:32 +0200
• c4e312662c Video timer now implemented (videos stop after 75 seconds) Jan 2024-09-21 11:50:34 +0200
• 785b4c4ff5 Some adjustments to video sizes, max record length is now 80sek Jan 2024-09-19 16:50:19 +0200
• 915b69a775 Merge pull request 'working into main, userstudy mostly finished' (#3) from working into main Jan 2024-09-19 15:26:30 +0200
• c630f4e54b userstudy1 finalized, also some bug fixes and small improvements Jan 2024-09-19 15:22:33 +0200
• 664c5bc1af New feature: infovide text can be html block now Jan 2024-09-18 17:53:59 +0200
• 428a9b0b44 Fixed a but with singlepages in the startpage backend Jan 2024-09-18 16:51:57 +0200
• f4dd20e76d Added into page, some more progress and a small bugfixtypo Jan 2024-09-18 16:40:10 +0200
• 8a1c7aff42 More UI improvements Jan 2024-09-17 17:03:44 +0200
• 91802c2ecd small corrections Jan 2024-09-15 18:42:40 +0200
• 3c37288476 Small typo/bugfix and more progress Jan 2024-09-15 18:17:42 +0200
• 5ad3676b7f progress on studytest css Jan 2024-09-15 18:12:21 +0200
• 4c6ec411b1 startpage text is set up now Jan 2024-09-13 16:39:24 +0200
• f0526555f1 Start Jan 2024-09-13 16:38:43 +0200
• ceb5e0bec9 Added Datenschutzerklärung Page Jan 2024-09-12 18:45:33 +0200
• d758e97001 Videos are now locally hosted, it works Jan 2024-09-12 18:13:40 +0200
• cdbb57d50d multiple choice implemented + Dem Quest implemented Jan 2024-09-05 16:36:44 +0200
• cf630bc040 Merge pull request 'Cleanup, now redirects work again' (#2) from working into main Jan 2024-08-20 17:12:40 +0200
• 73127d9950 Redirects uncommented again Jan 2024-08-20 17:10:25 +0200
• 7e331ba91b Leafblade git instructions in readme Jan 2024-08-20 17:04:39 +0200
• fb82d4c19a Merge pull request 'Merging Latest changes into main' (#1) from working into main Jan 2024-08-20 17:03:27 +0200
• 56a20f4465 Merge branch 'working' into 'main' Jan Dickmann 2024-08-20 14:37:14 +0000
• 3eac9d64cb Fixed Video upload not working Jan 2024-08-20 16:29:51 +0200
• 54e805ec50 removing comments again, but still not working Jan 2024-08-20 15:48:05 +0200
• b1e939adeb Trying to fix video upload (not working at all yet) Jan 2024-08-20 15:30:38 +0200
• dfb37e4a86 typo fixed Jan 2024-08-07 13:56:15 +0200
• 63ffaf02a6 Added documentation to videoscript.js Jan 2024-07-18 14:20:44 +0200
• be84a7e8b3
  
  Add CI Kai Vogelgesang 2024-07-02 12:00:33 +0200
• 645fac2e9d Merge branch 'Laptop' into 'main' Jan Dickmann 2024-06-30 10:51:30 +0000
• 3918d81495 gitignore uploads Jan Dickmann 2024-06-30 12:48:35 +0200
• a75efd7a5f Docker Instructions in readme Jan Dickmann 2024-06-30 12:48:12 +0200
• 3e482d2e49 dockerfile, fixing hardcoded url and cleanup Jan Dickmann 2024-06-30 12:40:39 +0200
• f4bb2959e6 Merge branch 'Laptop' into 'main' Jan Dickmann 2024-06-28 12:57:29 +0000
• 11f051c7d9 Bugfixes und Inhalte/Texte anpassen für Demo Jan Dickmann 2024-06-27 19:38:32 +0200
• 18ec49903b Login requirement added to sites and tested Jan Dickmann 2024-06-27 18:52:23 +0200
• 46f5979aef added login page and functionality Jan Dickmann 2024-06-27 18:44:55 +0200
• 2f6a42d39a added endpage and tracking for completed forms Jan Dickmann 2024-06-27 17:45:12 +0200
• 75202fe7a5 Better placeholder Videos, tested and works Jan Dickmann 2024-06-26 16:02:03 +0200
• ccf02f2e16 Popup seems to work well now in test Jan Dickmann 2024-06-26 15:57:39 +0200
• 97fa30bc27 some better css for the dialog popup Jan Dickmann 2024-06-26 12:48:25 +0200
• a4fc083305 Popup video works in test Jan Dickmann 2024-06-26 11:32:16 +0200
• 85fa8b4526 Databasetable names refactoring Jan Dickmann 2024-06-25 15:47:52 +0200
• eb5169af0f Video uploaded titel is now in the database Jan Dickmann 2024-06-25 15:45:36 +0200
• 5a0a8b257e fixed "current_stimulus_name" bug Jan Dickmann 2024-06-25 15:02:57 +0200
• 5d27caf107 exporting csv and video working Jan Dickmann 2024-06-25 14:51:04 +0200
• d5bfe8f360 simple csv export for user table implemented Jan Dickmann 2024-06-25 12:46:16 +0200
• 23c05823ac more cleanup and deleting unnecessary code Jan Dickmann 2024-06-25 12:00:42 +0200
• c9c3bfce12 CSRF removed, double video now working with everything Jan Dickmann 2024-06-24 13:30:51 +0200
• 69220b836a disable csrf and fix bugs Jan Dickmann 2024-06-21 11:36:47 +0200
• c600c43d79 disable csrf and other stuff for demo tomorrow Jan Dickmann 2024-06-20 17:28:13 +0200
• d3124f7caa csrf added to startpage and first steps to double video Jan Dickmann 2024-06-20 17:09:08 +0200
• bda8907a97 added working sqlquery test in table_contents Jan Dickmann 2024-06-19 17:08:13 +0200
• 78e313ad29 Video formats work now and CSRF protection is activ Jan Dickmann 2024-06-19 15:12:11 +0200
• 46a8b2244f CSS improvements and small fixes Jan Dickmann 2024-06-17 17:24:15 +0200
• 88c82eec7e Initial Laptop commit Jan Dickmann 2024-06-17 11:35:40 +0200
• 4f0591d346 Merge branch 'working' into 'main' Jan Dickmann 2024-06-17 09:20:50 +0000
• f7f5586d7a JS Code handles code 302 redirect properly now Jan 2024-06-15 19:49:41 +0200
• 3a21fb0914 new fields added but can't send video anymore Jan 2024-06-15 19:02:38 +0200
• 1fffa33fe6 Small fixes Jan 2024-06-13 19:10:15 +0200
• 1559da44d3 Saving after trying a solve for video recording not playing Jan 2024-06-10 19:13:45 +0200
• 35f37fbd30 CSS for Videopage fixed! Jan 2024-06-10 18:09:24 +0200