Commits · develop · Sandra Borst / CoFlow

Mar 13, 2025
- Merge branch 'server-fix' into 'develop' · 8a4d2288
  Marcel Kehrberg authored 2 months ago
  
  kleiner fix wegen dem true und false See merge request !76
  8a4d2288
- kleiner fix wegen dem true und false · 0beaeffa
  Marcel Kehrberg authored 2 months ago
  
  0beaeffa
Mar 12, 2025
- Merge branch 'logging-boxes' into 'develop' · 5a3d6a9b
  Sandra Borst authored 2 months ago
  
  changed statistics session colors, removed logging boxes See merge request !75
  5a3d6a9b
- changed statistics session colors, removed logging boxes · f02da51f
  Sandra Borst authored 2 months ago
  
  f02da51f
Mar 11, 2025
- Merge branch 'FixAddon' into 'develop' · d04011bb
  Marcel Kehrberg authored 2 months ago
  
  console log ist wider aktiv See merge request !74
  d04011bb
- console log ist wider aktiv · 6761cb10
  Marcel Kehrberg authored 2 months ago
  
  6761cb10
- Merge branch 'fix-back-from-session' into 'develop' · 134ad01b
  Philipp Müller authored 2 months ago
  
  fix See merge request !73
  134ad01b
- fix · 05cd45f2
  Philipp Müller authored 2 months ago
  
  05cd45f2
- Merge branch 'fix-mascott-hidden' into 'develop' · 9add6126
  Philipp Müller authored 2 months ago
  
  fix mascott hidden crash See merge request !72
  9add6126
- fix mascott hidden crash · ff3d49ec
  Philipp Müller authored 2 months ago
  
  ff3d49ec
- Merge branch 'ProfilesToProjects' into 'develop' · 6a424ff7
  Jessica Paul authored 2 months ago
  
  added the basic functionality of profiles (projects) See merge request !71
  6a424ff7
- added the basic functionality of profiles (projects) · 2705f8c5
  Jessica Paul authored 2 months ago
  
  2705f8c5
Mar 10, 2025
- Merge branch 'actually-tray-icon-fix' into 'develop' · e22f4871
  Philipp Müller authored 2 months ago
  
  added dpi compatibility mode See merge request !70
  e22f4871
- added dpi compatibility mode · 2b6c6d13
  Philipp Müller authored 2 months ago
  
  2b6c6d13
- Merge branch 'trayiconFix' into 'develop' · acd60079
  Marcel Kehrberg authored 2 months ago
  
  Tray Icon position Fix See merge request !69
  acd60079
- Tray Icon position Fix · adb2d051
  Marcel Kehrberg authored 2 months ago
  
  adb2d051
- Merge branch 'BrowserAddonV1.1' into 'develop' · df56a359
  Marcel Kehrberg authored 2 months ago
  
  Änderungen See merge request !68
  df56a359
- Änderungen · fa23741f
  Marcel Kehrberg authored 2 months ago
  
  - wenn das Addon reconenter widerherstellung allter informationen - block Einstellungen werden übergeben - Beim Ende, beim Abbruch oder beim Beednen des Programs wird das Addon benachrichtigt - das Distration Objekt wird jetzt richtig im addon erstellt
  fa23741f
- Merge branch 'refresh-button-spin' into 'develop' · 8090b1c3
  Philipp Müller authored 2 months ago
  
  do some spinny thingy See merge request !67
  8090b1c3
- do some spinny thingy · 7fb51e2d
  Philipp Müller authored 2 months ago
  
  7fb51e2d
- Merge branch 'bugfixes' into 'develop' · bccc515d
  Martin Hustoles authored 2 months ago
  
  updated burger menu style, added burger menu to overview See merge request !66
  bccc515d
- updated burger menu style, added burger menu to overview · 7d57d88b
  Your Name authored 2 months ago
  
  7d57d88b
- marked Mascott Frames as Resource · 20e43a3c
  Your Name authored 2 months ago
  
  20e43a3c
- Merge branch 'bugfixes' into 'develop' · c3b15ce6
  Martin Hustoles authored 2 months ago
  
  marked Mascott Frames as Resource See merge request !65
  c3b15ce6
- Merge branch 'BrowserAddon' into 'develop' · 69cfeddb
  Marcel Kehrberg authored 2 months ago
  
  Browser addon See merge request !64
  69cfeddb
- Addon jetzt auch in git · 274fcb66
  Marcel Kehrberg authored 2 months ago
  
  274fcb66
Mar 09, 2025
- Merge branch 'develop' of https://gitlab.reutlingen-university.de/borst/CoFlow into develop · 71af0d37
  Marcel Kehrberg authored 2 months ago
  
  71af0d37
- Merge branch 'delete-option' into 'develop' · 7bfcb80e
  Philipp Müller authored 2 months ago
  
  Delete option, Navbar fix See merge request !63
  7bfcb80e
- translation · 3a190adb
  Philipp Müller authored 2 months ago
  
  3a190adb
- delete button added. fix navigation bar · b8efcd8b
  Philipp Müller authored 2 months ago
  
  b8efcd8b
- Merge branch 'develop' of https://gitlab.reutlingen-university.de/borst/CoFlow into develop · e07c63f3
  Marcel Kehrberg authored 2 months ago
  
  e07c63f3
- Merge branch 'fix-x-button' into 'develop' · ee672a09
  Philipp Müller authored 2 months ago
  
  Fix x button See merge request !62
  ee672a09
- Merge branch 'WebSocketServer' into 'develop' · 0e310fba
  Marcel Kehrberg authored 2 months ago
  
  Install-Package Fleck See merge request !61
  0e310fba
- added app.manifest to enable admin mode · 4e6a36d8
  Philipp Müller authored 2 months ago
  
  4e6a36d8
- Install-Package Fleck · b2f713e6
  Marcel Kehrberg authored 2 months ago
  
  b2f713e6
- fix startscreen scaling, maybe fix mascot animation stuck · 89d9ee0e
  Philipp Müller authored 2 months ago
  
  89d9ee0e
- Fleck hinzugefügt · d1529bcc
  Marcel Kehrberg authored 2 months ago
  
  d1529bcc
- Merge branch 'WebSocketServer' into 'develop' · 11536485
  Marcel Kehrberg authored 2 months ago
  
  Web socket server See merge request !60
  11536485
- Overview aufruf der Send methode für distractingWebsites · 8b3a4249
  Marcel Kehrberg authored 2 months ago
  
  8b3a4249
- fix X button · 4627983c
  Philipp Müller authored 2 months ago
  
  4627983c