Commits · startfocussessionscreenfeature · Sandra Borst / CoFlow

View open merge request

Jan 01, 2025
- start focus session screen implemented basic frontend with all elements · 50b02ae9
  Sandra Borst authored 5 months ago
  
  50b02ae9
Dec 29, 2024
- Merge branch 'settingsScreenUpdate' into 'develop' · f52abc1b
  Sandra Borst authored 5 months ago
  
  changed settings screen: user can define seconds now individually; affirmation... See merge request !17
  f52abc1b
- changed settings screen: user can define seconds now individually; affirmation... · ee088069
  Sandra Borst authored 5 months ago
  
  changed settings screen: user can define seconds now individually; affirmation and insulting words option are now checkboxes and only visible if mascot visibility is selected
  ee088069
- Merge branch 'DistractionFeatureUpdate2' into 'develop' · e2961321
  Sandra Borst authored 5 months ago
  
  made it possible to enter custom urls (frontend and backend) as well as added... See merge request !16
  e2961321
- made it possible to enter custom urls (frontend and backend) as well as added... · 008ff074
  Sandra Borst authored 5 months ago
  
  made it possible to enter custom urls (frontend and backend) as well as added icons to distractionlist
  008ff074
- added "go back" functionality for distractionlist screen · 73b87c35
  Sandra Borst authored 5 months ago
  
  73b87c35
- ability to check and uncheck checkboxes, removing of header · cf0a8680
  Sandra Borst authored 5 months ago
  
  cf0a8680
- Merge branch 'DistractionListFeature2' into 'develop' · 180bc98f
  Sandra Borst authored 5 months ago
  
  distractionlistfeature basics See merge request !15
  180bc98f
- distractionlistfeature basics · b1e26a2e
  Sandra Borst authored 5 months ago
  
  b1e26a2e
- Merge branch 'session' into 'develop' · a2c4378c
  Martin Hustoles authored 5 months ago
  
  added Timer functionality See merge request !14
  a2c4378c
- added Timer functionality · dabd27c6
  Martin Hustoles authored 5 months ago
  
  dabd27c6
Dec 27, 2024
- Merge branch 'installer' into 'develop' · f66b88a6
  Philipp Müller authored 5 months ago
  
  Installer See merge request !12
  f66b88a6
- Installer · eb070522
  Philipp Müller authored 5 months ago
  
  eb070522
- Merge branch 'distractionFeature5' into 'develop' · 8134dd66
  Sandra Borst authored 5 months ago
  
  added distractionsScreen See merge request !11
  8134dd66
- added distractionsScreen · cbedfbf7
  Sandra Borst authored 5 months ago
  
  cbedfbf7
- Merge branch 'distractionFeature4' into 'develop' · 0207341d
  Sandra Borst authored 5 months ago
  
  test4 See merge request !10
  0207341d
- test4 · 2c7efd94
  Sandra Borst authored 5 months ago
  
  2c7efd94
- Merge branch 'distractionsFeature2' into 'develop' · a78fdec6
  Sandra Borst authored 5 months ago
  
  Distractionssss test2 See merge request !9
  a78fdec6
- Merge branch 'develop' into 'distractionsFeature2' · 5a04f5df
  Sandra Borst authored 5 months ago
  
  # Conflicts: # InnoLabProjektDektopApp/InnoLabProjektDektopApp/Screens/FirstLaunch/03_0Distractions.xaml
  5a04f5df
- Distractionssss · 9d5b2f2c
  Sandra Borst authored 5 months ago
  
  9d5b2f2c
- Merge branch 'distractionsFeature' into 'develop' · d44ecf83
  Sandra Borst authored 5 months ago
  
  test See merge request !8
  d44ecf83
- test · c5cdeaf9
  Sandra Borst authored 5 months ago
  
  c5cdeaf9
Dec 26, 2024
- Merge branch 'gitignore' into 'develop' · bc5d4e9f
  Martin Hustoles authored 5 months ago
  
  added gitignore and one folder to gitignore See merge request !7
  bc5d4e9f
- added gitignore and one folder to gitignore · c8c27591
  Martin Hustoles authored 5 months ago
  
  c8c27591
Dec 24, 2024
- frontend settings screen complete except for pagination · 66e59443
  Sandra Borst authored 5 months ago
  
  66e59443
- edited settings screen · 86eca769
  Sandra Borst authored 5 months ago
  
  86eca769
Dec 21, 2024
- Merge branch 'ProcessMonitoringFix' into 'develop' · caf448b5
  Philipp Müller authored 6 months ago
  
  process monitoring fixes and calculate distraction stage See merge request borst/procrastinator!6
  caf448b5
- process monitoring fixes and calculate distraction stage · 13e802f6
  Philipp Müller authored 6 months ago
  
  13e802f6
Dec 16, 2024
- Screen 1 and 2 · 74ed0ae0
  Marcel Kehrberg authored 6 months ago
  
  74ed0ae0
Dec 13, 2024
- Merge branch 'process-monitoring' into 'develop' · f5a847cc
  Philipp Müller authored 6 months ago
  
  Process monitoring See merge request borst/procrastinator!5
  f5a847cc
- Process monitoring · 498fdfa4
  Philipp Müller authored 6 months ago
  
  498fdfa4
Dec 10, 2024
- Merge branch 'pagesSetup' into 'develop' · 966670ce
  Martin Hustoles authored 6 months ago
  
  added all Pages See merge request borst/procrastinator!3
  966670ce
- added all Pages · f4dd3fe1
  Martin Hustoles authored 6 months ago
  
  f4dd3fe1
Dec 08, 2024
- Merge branch 'DesktopApp' into 'develop' · 7d9fdc65
  Martin Hustoles authored 6 months ago
  
  Desktop app Init See merge request borst/procrastinator!2
  7d9fdc65
- Desktop app Init · ad427b48
  Martin Hustoles authored 6 months ago
  
  ad427b48
Nov 04, 2024
- Initial commit · e2701678
  Sandra Borst authored 7 months ago
  
  e2701678