designproject-design-6/src/main/java/design/controller, branch league-play-refactoring Unnamed repository; edit this file 'description' to name the repository. Merge branch 'league-play-refactoring' of https://github.com/RIT-SWEN-262/designproject-design-6 into league-play-refactoring 2025-11-16T21:02:38+00:00 jrshi jrs9538@g.rit.edu 2025-11-16T21:02:38+00:00 0b43e258054b450f5007ef4d4fa34dacba2d8a9c Merging? 
Merging?
Cleaning up code 2025-11-16T20:41:52+00:00 jrshi jrs9538@g.rit.edu 2025-11-16T20:41:52+00:00 c3ea697547950c2e3b48eafeb3a13275be73c5d2 






Working on league menus
2025-11-16T20:37:32+00:00

jrshi
jrs9538@g.rit.edu

2025-11-16T20:37:32+00:00

0c2644dcb4fb6e70fb0e9b7a4d583e8b5b9af021












fixed guests viewing courses
2025-11-16T20:06:41+00:00

WillemDalton
willemhdalton@gmail.com

2025-11-16T20:06:41+00:00

af9f559a2ee427905c39363643bac2e7878fb10c












Merge branch 'main' into league-model
2025-11-16T07:15:49+00:00

sowgro
tpoke.ferrari@gmail.com

2025-11-16T07:15:49+00:00

6ffc6b4cbd9e0c5ce2dc82a7c77f39b3adf849b6

# Conflicts:
#	src/main/java/design/controller/userinput/menus/MainMenu.java
#	src/main/java/design/model/Golfer.java
#	src/main/java/design/model/ScrambleLeague.java
#	src/test/java/design/model/GolferTest.java
#	test.xml





# Conflicts:
#	src/main/java/design/controller/userinput/menus/MainMenu.java
#	src/main/java/design/model/Golfer.java
#	src/main/java/design/model/ScrambleLeague.java
#	src/test/java/design/model/GolferTest.java
#	test.xml







tweak main menu
2025-11-16T07:12:47+00:00

sowgro
tpoke.ferrari@gmail.com

2025-11-16T07:12:47+00:00

b5d46c7701716bcb2dd6127aeb97f8fcdb7774fc












Merge pull request #19 from RIT-SWEN-262/import-export
2025-11-16T07:03:16+00:00

Tyler Ferrari
69283684+Sowgro@users.noreply.github.com

2025-11-16T07:03:16+00:00

64dd072264dd59457cb195f23d17f03720b1cca0

Import export




Import export






Merge branch 'main' into import-export
2025-11-16T07:01:58+00:00

sowgro
tpoke.ferrari@gmail.com

2025-11-16T07:01:58+00:00

969b8071dd799dfaed939e10bf77b8a1ad42f9dc

# Conflicts:
#	data/personaldb.json
#	src/main/java/design/controller/userinput/menus/MainMenu.java
#	src/main/java/design/persistence/JSONLeagueDatabase.java
#	src/main/java/design/persistence/JSONPersonalDatabase.java
#	src/test/java/design/model/ClubTest.java
#	src/test/java/design/model/GolferTest.java





# Conflicts:
#	data/personaldb.json
#	src/main/java/design/controller/userinput/menus/MainMenu.java
#	src/main/java/design/persistence/JSONLeagueDatabase.java
#	src/main/java/design/persistence/JSONPersonalDatabase.java
#	src/test/java/design/model/ClubTest.java
#	src/test/java/design/model/GolferTest.java







fix nulls
2025-11-16T04:27:40+00:00

sowgro
tpoke.ferrari@gmail.com

2025-11-16T04:27:40+00:00

73cb1c77c99330360313bb07fcbc3c23a2516680












export almost working
2025-11-14T01:05:25+00:00

sowgro
tpoke.ferrari@gmail.com

2025-11-14T01:05:25+00:00

9adc51f8d74577b5c4ae9c1f88341252f2c22939