Quickfix issue#148 #158
Open
Quickfix issue#148 #158
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Fix view client tests
# Conflicts: # src/main/java/seedu/address/logic/parser/AddressBookParser.java
- fixed unchecked/unsafe operations
…ithGUI # Conflicts: # src/main/java/seedu/address/model/client/Client.java
Schedule branch
Pull from main master
* 'master' of https://github.com/tohkerwei/main: (72 commits) Hotfix gradle clean test errors fix size of personal best table in GUI Add AddExerciseCommandParser test Add AddExerciseCommandTest Add tests for ViewCommandParser Fix checkstyle Add command autocomplete for delete-e and schedule Fix checkstyle hook personal bests to GUI Make code more OOP Add command history test Add pb for delete-e Add tests for command history storage Shift storage path to CommandHistory Fix build error Initial refactor to a CommandHistory logic class Add javadocs and fix checkstyle Continued efforts on this wanky EOF Travis fix attempt EOF for ClientView.fxml Allow for removal of Schedule via empty command eg. "schedule 1" Calibrated scaling of SchedulePanel under realistically large loads ... # Conflicts: # src/main/java/seedu/address/logic/commands/AddExerciseCommand.java # src/main/java/seedu/address/logic/commands/DeleteExerciseCommand.java # src/main/java/seedu/address/logic/commands/EditCommand.java # src/main/java/seedu/address/logic/commands/ScheduleCommand.java # src/main/java/seedu/address/logic/parser/AddCommandParser.java # src/main/java/seedu/address/logic/parser/ScheduleCommandParser.java # src/main/java/seedu/address/model/Model.java # src/main/java/seedu/address/model/ModelManager.java # src/main/java/seedu/address/model/client/Client.java # src/main/java/seedu/address/model/schedule/EndTime.java # src/main/java/seedu/address/model/schedule/Schedule.java # src/main/java/seedu/address/model/schedule/ScheduleDay.java # src/main/java/seedu/address/model/schedule/ScheduleList.java # src/main/java/seedu/address/model/schedule/StartTime.java # src/main/java/seedu/address/model/util/SampleDataUtil.java # src/main/java/seedu/address/storage/JsonAdaptedClient.java # src/main/java/seedu/address/ui/ScheduleCard.java # src/main/resources/view/ClientView.fxml # src/main/resources/view/MainWindow.fxml # src/test/java/seedu/address/logic/commands/AddCommandTest.java # src/test/java/seedu/address/storage/JsonAdaptedClientTest.java # src/test/java/seedu/address/testutil/ClientBuilder.java
… into schedule-branch-2.0 * 'schedule-branch-2.0' of https://github.com/tohkerwei/main: Further work on ScheduleCommandTest Added a basic ScheduleBuilder Started work on ScheduleCommandTest Updated example usage for schedule from d/ to day/
Various hotfixes for v1.3
Schedule branch 2.0
…er-tests Add tests for DeleteExerciseCommandParser
…103T-F11-2/main into schedule-branch-2.0 # Conflicts: # src/test/java/seedu/address/testutil/ScheduleBuilder.java
Add Storage of Clients and Exercises Design Considerations
Fix clear command
[UG] Update user guide for v1.3
Fix clientInView
Update app version to v1.3
Schedule branch 2.0
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #148