Commits · main · Valdidan-EDtools / EDMC Merit Tracker · GitLab

Aug 12, 2025
- Merge branch 'hotfix/1.1.2' · 4d4345be
  CMDR Valdidan authored Aug 12, 2025
  
  View commits for tag v1.1.2 v1.1.2
  
  4d4345be
- Add screenshot and update README. · f7f73b70
  CMDR Valdidan authored Aug 12, 2025
  
  f7f73b70
Aug 01, 2025
- Merge branch 'hotfix/1.1.1' · abcb6a2f
  CMDR Valdidan authored Jul 31, 2025
  
  View commits for tag v1.1.1 v1.1.1
  
  abcb6a2f
- Fix float to string f-str problem. · 27086346
  CMDR Valdidan authored Jul 31, 2025
  
  27086346
Jul 28, 2025
- Merge branch 'release/1.1' · 672043af
  CMDR Valdidan authored Jul 27, 2025
  
  View commits for tag v1.1 v1.1
  
  672043af
- Version number bumped and release doc updated. · cf10e63a
  CMDR Valdidan authored Jul 27, 2025
  
  cf10e63a
- Merge branch 'feature/merits_per_hour' into develop · 88e015a2
  CMDR Valdidan authored Jul 27, 2025
  
  88e015a2
- Fix functional bugs. · a4497bdb
  CMDR Valdidan authored Jul 27, 2025
  
  a4497bdb
Jul 21, 2025
- Fix startup bugs. · 5572318a
  CMDR Valdidan authored Jul 21, 2025
  
  5572318a
- Rework for merits per hour tracking. · 1fdb72e8
  CMDR Valdidan authored Jul 21, 2025
  
  1fdb72e8
Jul 13, 2025
- Merge tag 'v1.0' into develop · db8989bb
  CMDR Valdidan authored Jul 13, 2025
  db8989bb
- Merge branch 'release/1.0' · 8b5c8776
  CMDR Valdidan authored Jul 13, 2025
  
  View commits for tag v1.0 v1.0
  
  8b5c8776
- Screenshot added · fd10cc53
  CMDR Valdidan authored Jul 13, 2025
  
  fd10cc53
- Version bump. README and doc updated for release. · 151a1f4b
  CMDR Valdidan authored Jul 13, 2025
  
  151a1f4b
- Merge branch 'feature/gui-adv' into develop · 90f4a377
  CMDR Valdidan authored Jul 13, 2025
  
  90f4a377
Jul 12, 2025
- Improve (?) reset merits button's method. · 66e8c79a
  CMDR Valdidan authored Jul 12, 2025
  
  66e8c79a
- Bugfix after first test. · 4e7eacc1
  CMDR Valdidan authored Jul 12, 2025
  
  4e7eacc1
- Refactor merit tracker variables into a Class. · dffee126
  CMDR Valdidan authored Jul 11, 2025
  
  dffee126
- Add variable to track accumulated merits and show in GUI. · 3da78d62
  CMDR Valdidan authored Jul 11, 2025
  
  3da78d62
Jul 08, 2025
- Improve gui positioning · 1269d025
  CMDR Valdidan authored Jul 07, 2025
  
  1269d025
- fix typo. · d343ea44
  CMDR Valdidan authored Jul 07, 2025
  
  d343ea44
- GUI: use tk.Frame instead of "loose" labels. · b17090ec
  CMDR Valdidan authored Jul 07, 2025
  
  b17090ec
Jul 07, 2025
- Merge tag 'v0.2-alpha' into develop · 6fae8f7e
  CMDR Valdidan authored Jul 06, 2025
  6fae8f7e
- Merge branch 'release/0.2-alpha' · 2ea2e9d6
  CMDR Valdidan authored Jul 06, 2025
  
  View commits for tag v0.2-alpha v0.2-alpha
  
  2ea2e9d6
- Bumped version number. README update. · b64d082e
  CMDR Valdidan authored Jul 06, 2025
  
  b64d082e
- Merge branch 'feature/gui' into develop · 32e76b47
  CMDR Valdidan authored Jul 06, 2025
  
  32e76b47
- Fix number-string convertions (was the other way around). Add some informative text. · 3b1ce64a
  CMDR Valdidan authored Jul 06, 2025
  
  3b1ce64a
- gui code · 92f9ee5f
  CMDR Valdidan authored Jul 06, 2025
  
  92f9ee5f
Jul 06, 2025
- Merge branch 'feature/doc' into develop · 3f44e4f2
  CMDR Valdidan authored Jul 06, 2025
  
  3f44e4f2
- Documentation update. · bdfd35f5
  CMDR Valdidan authored Jul 06, 2025
  
  bdfd35f5
- Add a document explaining how this works and when it doesn't. · be4f7f60
  CMDR Valdidan authored Jul 06, 2025
  
  be4f7f60
Jul 05, 2025
- Merge tag 'vAlpha.1.1' into develop · 92020f0b
  CMDR Valdidan authored Jul 05, 2025
  92020f0b
- Merge branch 'hotfix/Alpha.1.1' · 122bf2a2
  CMDR Valdidan authored Jul 05, 2025
  
  View commits for tag vAlpha.1.1 vAlpha.1.1
  
  122bf2a2
- README: add sample output. · 7eeb0693
  CMDR Valdidan authored Jul 05, 2025
  
  7eeb0693
- Fix system info variable. · 5ec51b55
  CMDR Valdidan authored Jul 05, 2025
  
  5ec51b55
- Add System information to logged data. · e4f0e6e4
  CMDR Valdidan authored Jul 05, 2025
  
  e4f0e6e4
- README update. · 9964675e
  CMDR Valdidan authored Jul 05, 2025
  
  9964675e
- Merge tag 'vAlpha.1' into develop · 4632eb10
  CMDR Valdidan authored Jul 05, 2025
  4632eb10
- Merge branch 'release/Alpha.1' · b4051227
  CMDR Valdidan authored Jul 05, 2025
  
  View commits for tag vAlpha.1 vAlpha.1
  
  b4051227
- Last-minute README update for Alpha.1 release. · c9799aab
  CMDR Valdidan authored Jul 05, 2025
  
  c9799aab