Commits · 71a8fc8dd9b40576beb7bec944e10dd91aca586c · Sandra Borst / CoFlow

Browse files

Dec 29, 2024
- merge · 71a8fc8d
  Sandra Borst authored 9 months ago
  
  71a8fc8d
Dec 27, 2024
- TEST · 7483ae6e
  Sandra Borst authored 9 months ago
  
  7483ae6e
- added dynamic loading from distractingWebsites.json · 88d7c0c3
  Sandra Borst authored 9 months ago
  
  88d7c0c3
- Merge branch 'installer' into 'develop' · f66b88a6
  Philipp Müller authored 9 months ago
  f66b88a6
- Installer · eb070522
  Philipp Müller authored 9 months ago
  
  eb070522
- basic structure for distractionlistscreen · 44b113f6
  Sandra Borst authored 9 months ago
  
  44b113f6
- distractingWebsites and nagivation to distractionlistscreen · 2a0256ad
  Sandra Borst authored 9 months ago
  
  2a0256ad
- Merge branch 'distractionFeature5' into 'develop' · 8134dd66
  Sandra Borst authored 9 months ago
  8134dd66
- added distractionsScreen · cbedfbf7
  Sandra Borst authored 9 months ago
  
  cbedfbf7
- Merge branch 'distractionFeature4' into 'develop' · 0207341d
  Sandra Borst authored 9 months ago
  0207341d
- test4 · 2c7efd94
  Sandra Borst authored 9 months ago
  
  2c7efd94
- Merge branch 'distractionsFeature2' into 'develop' · a78fdec6
  Sandra Borst authored 9 months ago
  a78fdec6
- Merge branch 'develop' into 'distractionsFeature2' · 5a04f5df
  Sandra Borst authored 9 months ago
  5a04f5df
- Distractionssss · 9d5b2f2c
  Sandra Borst authored 9 months ago
  
  9d5b2f2c
- Merge branch 'distractionsFeature' into 'develop' · d44ecf83
  Sandra Borst authored 9 months ago
  d44ecf83
- test · c5cdeaf9
  Sandra Borst authored 9 months ago
  
  c5cdeaf9
Dec 26, 2024
- Merge branch 'gitignore' into 'develop' · bc5d4e9f
  Martin Hustoles authored 9 months ago
  bc5d4e9f
- added gitignore and one folder to gitignore · c8c27591
  Martin Hustoles authored 9 months ago
  
  c8c27591
Dec 24, 2024
- frontend settings screen complete except for pagination · 66e59443
  Sandra Borst authored 9 months ago
  
  66e59443
- edited settings screen · 86eca769
  Sandra Borst authored 9 months ago
  
  86eca769
Dec 21, 2024
- Merge branch 'ProcessMonitoringFix' into 'develop' · caf448b5
  Philipp Müller authored 9 months ago
  caf448b5
- process monitoring fixes and calculate distraction stage · 13e802f6
  Philipp Müller authored 9 months ago
  
  13e802f6
Dec 16, 2024
- Screen 1 and 2 · 74ed0ae0
  Marcel Kehrberg authored 9 months ago
  
  74ed0ae0
Dec 13, 2024
- Merge branch 'process-monitoring' into 'develop' · f5a847cc
  Philipp Müller authored 9 months ago
  f5a847cc
- Process monitoring · 498fdfa4
  Philipp Müller authored 9 months ago
  
  498fdfa4
Dec 10, 2024
- Merge branch 'pagesSetup' into 'develop' · 966670ce
  Martin Hustoles authored 9 months ago
  966670ce
- added all Pages · f4dd3fe1
  Martin Hustoles authored 9 months ago
  
  f4dd3fe1
Dec 08, 2024
- Merge branch 'DesktopApp' into 'develop' · 7d9fdc65
  Martin Hustoles authored 10 months ago
  7d9fdc65
- Desktop app Init · ad427b48
  Martin Hustoles authored 10 months ago
  
  ad427b48
Nov 04, 2024
- Initial commit · e2701678
  Sandra Borst authored 11 months ago
  
  e2701678