summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Merge branch 'main' into league-modelleague-modelsowgro11 days
|\ | | | | | | | | | | | | | | | | # 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 menusowgro11 days
| |
| * finished work on unit testing for npwWillemDalton12 days
| |
| * finished testing for statistics subsystemWillemDalton12 days
| |
| * removed unused dependencies in CSV testingWillemDalton12 days
| |
| * finished testing for persistenceWillemDalton12 days
| |
| * progress on league database testingWillemDalton13 days
| |
| * finished testing most of JSON personal databaseWillemDalton13 days
| |
| * completed courselist testingWillemDalton13 days
| |
| * finished unit testing for teams and matchesWillemDalton13 days
| |
| * completed unit testing for play classWillemDalton14 days
| |
| * completed unit testing for scrambleWillemDalton14 days
| |
| * completed coverage for stroke leagueWillemDalton14 days
| |
| * fixed broken unit tests in clubWillemDalton14 days
| |
* | Merge pull request #19 from RIT-SWEN-262/import-exportTyler Ferrari11 days
|\ \ | | | | | | Import export
| * | Merge branch 'main' into import-exportimport-exportsowgro11 days
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | # 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
| * | IMPORT-EXPORT WORKING!!!!!!!!!!!!!!!!!!!!!!!!!!import-export-expsowgro11 days
| | |
| * | fix datetime issuesowgro11 days
| | |
| * | fix nullssowgro11 days
| | |
| * | track this for comparison purposessowgro13 days
| | |
| * | export almost workingsowgro13 days
| | |
| * | added comments to adapterWillemDalton14 days
| | |
| * | more work on adapting to XMLWillemDalton14 days
| | |
| * | added league JSON import/export, still working with XML importWillemDalton14 days
| | |
| * | working on XML formattingWillemDalton2025-11-11
| | |
| * | fixed exporting xmlWillemDalton2025-11-11
| | |
| * | progress on importing exportingWillemDalton2025-11-11
| | |
| * | progress on import/exportWillemDalton2025-11-11
| | |
| * | a bit more progress on the menu for import exportWillemDalton2025-11-10
| | |
| * | working on exporting to XML and JSONWillemDalton2025-11-10
| |\ \
* | \ \ merge league-play into league-modelJacob Shimp14 days
|\ \ \ \
| * | | | potential implementation for playing in a leagueJacob Shimp2025-11-11
| | | | |
* | | | | change league printingsowgro14 days
| |_|_|/ |/| | |
* | | | fix constructorsowgro14 days
| | | |
* | | | Merge remote-tracking branch 'origin/league-model'sowgro14 days
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # src/main/java/design/controller/userinput/menus/MainMenu.java # src/main/java/design/model/Golfer.java # src/test/java/design/model/ClubTest.java # src/test/java/design/model/GolferTest.java
| * | | | stub out some menussowgro2025-11-12
| | | | |
| * | | | Fix some serialization stuffsowgro2025-11-12
| |/ / /
| * | | working with matches in leagueJacob Shimp2025-11-11
| | | |
| * | | Added list of matchesJacob Shimp2025-11-11
| |/ /
| * | fix circular dependencysowgro2025-11-10
| | |
| * | fix some testssowgro2025-11-10
| | |
| * | add invites to golfersowgro2025-11-09
| | |
| * | add serializer for leagues in golfer, reorganize serializerssowgro2025-11-09
| | |
| * | fix errorsowgro2025-11-09
| | |
| * | make id system consistentsowgro2025-11-09
| | |
| * | complete serializationsowgro2025-11-09
| | |
| * | create most of the model and league DAOssowgro2025-11-09
| | |
* | | Merge pull request #16 from RIT-SWEN-262/lizzio-ProxyGuestsMichael Lizzio2025-11-11
|\ \ \ | | | | | | | | Added isGuest to Session and updated menus
| * | | setGuest to false on setCurrentGolferMichael Lizzio2025-11-11
| | | |
| * | | Added isGuest to Session and updated menusMichael Lizzio2025-11-11
|/ / /