Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Schedule + GUI #127

Merged
merged 84 commits into from
Apr 2, 2020
Merged

Schedule + GUI #127

merged 84 commits into from
Apr 2, 2020

Conversation

Dban1
Copy link

@Dban1 Dban1 commented Apr 2, 2020

Todo: Improve coverage

Dban1 and others added 30 commits March 23, 2020 15:22
Updated ParserUtil and Schedule class
Fixed ScheduleCommand and parser
Added and edited some json files
# Conflicts:
#	src/main/java/seedu/address/logic/parser/AddressBookParser.java
- fixed unchecked/unsafe operations
Yonggiee and others added 25 commits April 1, 2020 14:26
…nto schedule-branch

* 'schedule-branch' of https://github.com/tohkerwei/main:
  Todo: Finish up Deep Clone implementation for Schedule testing
  Fixed different day + overlapping HHmm bug

# Conflicts:
#	src/main/java/seedu/address/model/schedule/StartTime.java
# Conflicts:
#	src/main/resources/view/ClientView.fxml
…F11-2/main into YJPlaysWithGUI

# Conflicts:
#	src/main/java/seedu/address/ui/MainWindow.java
# Conflicts:
#	src/main/java/seedu/address/model/ModelManager.java
Calibrated scaling of SchedulePanel under realistically large loads
# Conflicts:
#	src/main/java/seedu/address/logic/commands/ScheduleCommand.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/StartTime.java
#	src/main/java/seedu/address/storage/JsonAdaptedClient.java
#	src/test/java/seedu/address/storage/JsonAdaptedClientTest.java
#	src/test/java/seedu/address/testutil/ClientBuilder.java
Copy link

@AaronCQL AaronCQL left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@AaronCQL AaronCQL merged commit 26b850d into master Apr 2, 2020
@AaronCQL AaronCQL deleted the YJPlaysWithGUI branch April 2, 2020 07:00
@AaronCQL AaronCQL mentioned this pull request Apr 11, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants