summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Merge pull request #19 from RIT-SWEN-262/import-exportTyler Ferrari12 days
|\ | | | | Import export
| * Merge branch 'main' into import-exportimport-exportsowgro12 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-expsowgro12 days
| | |
| * | fix datetime issuesowgro12 days
| | |
| * | fix nullssowgro12 days
| | |
| * | track this for comparison purposessowgro14 days
| | |
| * | export almost workingsowgro14 days
| | |
| * | added comments to adapterWillemDalton2025-11-13
| | |
| * | more work on adapting to XMLWillemDalton2025-11-13
| | |
| * | added league JSON import/export, still working with XML importWillemDalton2025-11-13
| | |
| * | 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 Shimp2025-11-13
|\ \ \ \
| * | | | potential implementation for playing in a leagueJacob Shimp2025-11-11
| | | | |
* | | | | change league printingsowgro2025-11-13
| |_|_|/ |/| | |
* | | | fix constructorsowgro2025-11-13
| | | |
* | | | Merge remote-tracking branch 'origin/league-model'sowgro2025-11-13
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # 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
|/ / /
* | | Merge pull request #15 from RIT-SWEN-262/lizzio-UndoRedoSubsystemMichael Lizzio2025-11-11
|\ \ \ | | | | | | | | Lizzio undo redo subsystem
| * | | Fixed not updateing database on undo/redoMichael Lizzio2025-11-10
| | | |
| * | | Used UndoManager in Menus to Capture SanpshotsMichael Lizzio2025-11-10
| | | |
| * | | Added HolePlayMemento with sanpshots and restoreMichael Lizzio2025-11-10
| | | |
| * | | Added GolferMememto, updated GolferMichael Lizzio2025-11-10
| | | |
| * | | Basic undo Mememto PatternMichael Lizzio2025-11-09
| |/ /
* | / wrote unit tests for course searchWillemDalton2025-11-10
| |/ |/|
* | more unit testsWillemDalton2025-11-10
|/
* working on unit tests, added to pom to support jacocoWillemDalton2025-11-05
|
* Merge pull request #13 from RIT-SWEN-262/singleton-daosWillem Dalton2025-11-05
|\ | | | | Singleton daos
| * Remove singleton from course search subsystemsingleton-daossowgro2025-10-30
| |
| * Convert DAOs to proper singleton formatsowgro2025-10-26
| |
* | Merge branch 'main' of https://github.com/RIT-SWEN-262/designproject-design-6R1WillemDalton2025-10-12
|\ \ | |/ |/|
| * Merge pull request #12 from RIT-SWEN-262/menu-reorganizeWillem Dalton2025-10-12
| |\ | | | | | | Menu reorganize