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.

Sign up for GitHub

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

Jump to bottom

Quickfix #171, #173 #165

Open
wants to merge 609 commits into
base: master
Choose a base branch
from
Open

Quickfix #171, #173 #165

wants to merge 609 commits into from

Conversation

Dban1
Copy link

@Dban1 Dban1 commented Apr 4, 2020

Schedule command has changed its command signature to schedule INDEX sch/DAY-STARTTIME-ENDTIME

Fixes #171

  • Schedule command now states explicitly that a client schedule has been cleared.

Fixes #173

  • Schedule command now explicitly states that the client's OVERALL schedule has been updated

AaronCQL and others added 30 commits March 30, 2020 17:34
@AaronCQL
Ensure exercise list is sorted after reading from storage
c7e2940
@AaronCQL
Revert "Ensure exercise list is sorted after reading from storage"
76a0091 
This reverts commit c7e2940.
@AaronCQL
Merge branch 'YJPlaysWithGUI' of github.com:AY1920S2-CS2103T-F11-2/ma…
25f35fa 
…in into YJPlaysWithGUI
@AaronCQL
Ensure exercise list is sorted after reading from storage
e903e5b
@AaronCQL
Add insertion sort to add new exercise
8054c01
@AaronCQL
Add javadocs to addToSorted method
f512161
@Yonggiee
remove unnecessary border in ViewClientDisplay
8d26ed1
@Yonggiee
fix checkstyle
f66a954
@Dban1
Merge branch 'schedule-branch' into YJPlaysWithGUI
bb9aa5e 
# Conflicts:
#	src/main/java/seedu/address/logic/commands/EditCommand.java
#	src/main/java/seedu/address/logic/parser/AddCommandParser.java
#	src/main/java/seedu/address/logic/parser/AddressBookParser.java
#	src/main/java/seedu/address/logic/parser/CliSyntax.java
#	src/main/java/seedu/address/logic/parser/ParserUtil.java
#	src/main/java/seedu/address/model/client/Client.java
#	src/main/java/seedu/address/model/util/SampleDataUtil.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
@Dban1
Merge branch 'YJPlaysWithGUI' of https://github.com/AY1920S2-CS2103T-…
d53d3ae 
…F11-2/main into YJPlaysWithGUI
@AaronCQL
Merge branch 'master' into AddExerciseClass
ba910f7
@Yonggiee
change valid regrex for exerciseName
f6999fd
@AaronCQL
Merge branch 'master' into YJPlaysWithGUI
96ac050
@AaronCQL
Increase font size
3ac3f41
@AaronCQL
Merge branch 'YJPlaysWithGUI' of github.com:AY1920S2-CS2103T-F11-2/ma…
1a174a4 
…in into YJPlaysWithGUI
@AaronCQL
Merge branch 'AddExerciseClass' of github.com:AY1920S2-CS2103T-F11-2/…
b8ef906 
…main into AddExerciseClass
@Yonggiee
Merge commit 'dd5771bb9f1585df603725aef186b2cf4984d5e1' into AddExerc…
59ff349 
…iseClass
@Yonggiee
add ExerciseNameTest
e21359b
@Yonggiee
Merge branch 'AddExerciseClass' of https://github.com/AY1920S2-CS2103…
a0216ee 
…T-F11-2/main into AddExerciseClass
@Dban1
Made the merge between Exercise and Schedule runnable.
f8a2522
@Dban1
Merge branch 'YJPlaysWithGUI' of https://github.com/AY1920S2-CS2103T-…
e333111 
…F11-2/main into YJPlaysWithGUI
@Yonggiee
fix CliSyntax for addExerciseCommand
f7c373b
@AaronCQL
Add conditional update for client in view
d73bda8
@AaronCQL
Remove paddings
9aeeba0
@Yonggiee
add ExerciseRepsTest
20c5bdf
@Yonggiee
add ExerciseWeightTest
eacee8c
@AaronCQL
Tweak layouts
b900be9
@Yonggiee
add ExerciseSetsTest
77bfdd4
@AaronCQL
Tweak card background colours
3755b83
@AaronCQL
Fix requireAllNonNull to include all parameters
cb89ebb
AaronCQL and others added 30 commits April 3, 2020 21:20
@AaronCQL
Fix class diagram
7fc32c5
@AaronCQL
Enable kbd:[] macro
70f1b71
@Yonggiee
fix dg 2
0fe0851
@Yonggiee
add colours for activation bar
4feb57d
@ziyingli
Update DG
553f0db
@Yonggiee
fix colour of arrow
45ddee9
@ziyingli
Fix checkstyle
4563177
@AaronCQL
Add autocomplete
ac2110e
@AaronCQL
Fix wording
d25c56e
@AaronCQL
Include name in headers
79a62b1
@AaronCQL
Rework wording
4d8cea0
@AaronCQL
Merge pull request #201 from AY1920S2-CS2103T-F11-2/dg-command-history
7ec9fc8 
[DG] Add command history and command autocomplete
@ziyingli
Merge branch 'master' of https://github.com/AY1920S2-CS2103T-F11-2/main…
db49f44 
… into dg-personalbest
@ziyingli
Add class diagram
1e0f2d2
@ziyingli
Edit class diagram
1c66ce3
@ziyingli
Add sequence diagram
bf3a099
@AaronCQL
Merge pull request #151 from AY1920S2-CS2103T-F11-2/quickfix-issue#148
617bc18 
Fixed erroneuous description for Schedule denomination.
@Yonggiee
Merge branch 'master' into storageImpDG
70e216d
@Yonggiee
fix england
25ffe13
@Yonggiee
Merge pull request #202 from AY1920S2-CS2103T-F11-2/storageImpDG
abc5b8e 
[DG]Exercise Implementation
@Dban1
Added Schedule DG
c634c1a
@Dban1
Merge branch 'master' of https://github.com/AY1920S2-CS2103T-F11-2/main
d2abdb6 
# Conflicts:
#	docs/DeveloperGuide.adoc
@Dban1
Fixed trailing WhiteSpace
6a744cf
@Yonggiee
Merge pull request #203 from AY1920S2-CS2103T-F11-2/dg-personalbest
cc74594 
[DG] Personal Best Implementation
@Dban1
Removed extra line
2418d24
@Yonggiee
Merge pull request #206 from AY1920S2-CS2103T-F11-2/Schedule-DG
8503e25 
Schedule DG
@Dban1
Merge branch 'master' into schedule-branch-2.0
2bf02c1 
# Conflicts:
#	src/main/java/seedu/address/logic/commands/ScheduleCommand.java
@Dban1
Merge branch 'master' into schedule-branch-2.0
1d5e649
@Dban1
Updated Schedule command to be of format `schedule INDEX sch/DAY-STAR…
757e8df 
…TTIME-ENDTIME`
@Dban1
Corrected erroneous error message
aea7b23
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@Dban1 @AaronCQL @Yonggiee @ziyingli @charrizard47