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

Merge in preparation of V0.4 #70

Merged
merged 131 commits into from
Oct 27, 2016
Merged

Merge in preparation of V0.4 #70

merged 131 commits into from
Oct 27, 2016

Conversation

Skaty
Copy link
Collaborator

@Skaty Skaty commented Oct 27, 2016

No description provided.

SukiTsang and others added 30 commits October 20, 2016 21:07
@SukiTsang
Add unpin command and tests
dc5a4d6
@SukiTsang
Add uncomplete command and tests
ef63325
@Skaty
Hide details when TaskCard is not selected
a6d656c
@Skaty
Update tests to include check for details visibility
2d3247c
@Skaty
Remove BrowserPanel and SplitPanel from app
c5af20d
@Skaty
Remove unused imports
d45d64b
@SukiTsang
Delete SDforDeleteTask.png
589a3a6
@SukiTsang
Delete LogicClassDiagram.png
4647547
@SukiTsang
Delete SDforDeleteTaskEventHandling.png
75f2af7
@SukiTsang
Delete deleteTaskSdForLogic.jpg
75ac8f9
@SukiTsang
Update diagrams on developer guide with add command
62aa6f0
@SukiTsang
Correct the diagram link to new diagrams
f0e2b36
@SukiTsang
Update with uncomplete command
c05cafb
@SukiTsang
Correct spelling mistake
cf87b20
@SukiTsang
Update with unpin command
4035358
@Skaty
Enhance equals and toString for TaskCardHandle test utility
5fbf769
@Skaty
Remove unused FXML element ID
5e9b79b
@Skaty
Separate dynamic and static labels, so that comparisons can be made i…
d917b13 
…n tests
@Skaty
Improve UpdateCommand test case and ensure that isDetailsShown checks…
04686fd 
… the cardDetails container
@SukiTsang
Separate diagrams to different ppt
bd9b1aa
@SukiTsang
Delete gradle.prefs
c93c1d2
@Skaty
Ensure that test cases are more deterministic
847e98b
@Skaty
Create class to encapsulate Command inputs
f9086df
@SukiTsang
Correct unnecessary comparison in boolean expressions
4d74c55
@SukiTsang
Correct unnecessary comparison in boolean expression
30b9fcd
@advaypal
Create basic skeleton for new command
112755d
@SukiTsang
Add more test
eaea825
@advaypal
Add event for changing file path
c34853b
@SukiTsang
Delete unused local variable
bea77bb
@SukiTsang
Use another assertFalse method for test
5428b85
Skaty and others added 17 commits October 27, 2016 12:32
@Skaty
Ensure that DateTime is stored using milliseconds from epoch
181f518
@advaypal
Possible fix for failing test
f99dd13
@Skaty
DateTime no longer saves seconds, since it is insignificant
e6effbd
@Skaty
Remove task name uniqueness test
373fefa
@SukiTsang
Add author tag on developer guide
bb9297b
@SukiTsang
Add author tags in UserGuide
a094fb8
@Skaty
Pull develop branch into this branch
f5ab3ac
@Skaty
Clean code
9917359
@Skaty
Merge branch 'develop' into recurring-task
5de806d
@advaypal
Fix conflict
0ea6464
@Skaty
Merge pull request #62 from CS2103AUG2016-T14-C4/write-uncomplete-com…
5b66c76 
…mand

Allow user to uncomplete the completed task
@Skaty
Merge develop again
08b5f2e
@Skaty
Merge branch 'develop' into recurring-task
852e28d
@advaypal
Fix conflict again
f17f0c5
@Skaty
Merge pull request #66 from CS2103AUG2016-T14-C4/recurring-task
eada6e0 
Allow user to have weekly recurring task
@Skaty
Merge branch 'develop' into live-search
a1708b6
@Skaty
Merge pull request #67 from CS2103AUG2016-T14-C4/live-search
4b89e38 
Live search functionality
@Skaty Skaty added this to the V0.4 milestone Oct 27, 2016
@Skaty
Copy link
Collaborator Author

Skaty commented Oct 27, 2016

Tests pass on local machine. Skipping travis tests.

@Skaty Skaty closed this Oct 27, 2016
@Skaty Skaty reopened this Oct 27, 2016
@Skaty Skaty merged commit 5891558 into master Oct 27, 2016
@coveralls
Copy link

Coverage Status

Coverage decreased (-1.0%) to 86.532% when pulling 7cc4f72 on develop into b0f8bab on master.

@coveralls
Copy link

Coverage Status

Coverage decreased (-0.8%) to 86.722% when pulling 7cc4f72 on develop into b0f8bab on master.

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
priority.high type.epic
Projects
None yet
Milestone
V0.4
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@Skaty @coveralls @SukiTsang @advaypal