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 conflict resolved and Refactored Addressbook in gui test ti TaskManager #77

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

Merge conflict resolved and Refactored Addressbook in gui test ti TaskManager #77

wants to merge 127 commits into from

Conversation

Fyelight
Copy link

@Fyelight Fyelight commented Mar 8, 2017

No description provided.

jinshunlee and others added 30 commits March 1, 2017 14:19
@jinshunlee
Update readme.md
475c27e
@jinshunlee
Update link after renaming repo to main
a51dad7
@jinshunlee
Update UserGuide.md
2c8260a
@drtrifle
Update DeveloperGuide.md
49fd7f7
@drtrifle
Changed project name to main in .project file
9dc2b4c
@Fyelight
uploaded pictures of members
977fccc
@Fyelight
Updated About Us
6f6a3f3
@Fyelight
Updated the pictures of AboutUs
95e6510
@yexiexie
Add UI image
c64c389
@yexiexie
Delete photos of SE-EDU developers
6f1e18b
@yexiexie
Update pictures of members
3cd09c0
@yexiexie
Merge pull request #2 from CS2103JAN2017-W14-B3/HH
388dc28 
Update pictures of members
@jinshunlee
Refactor person package to task package
a342662
@yexiexie
Update README.md
32e8419
@yexiexie
Update AboutUs.md
77e1bee
@yexiexie
Update ContactUs.md
5d044ac 
change email
@yexiexie
Update ContactUs.md
d00e01c
@yexiexie
Update README.md
d8bde16 
Update description
@yexiexie
Update UserGuide.md
95f136a 
Update mockup pic
@yexiexie
Update UserGuide.md
30f9d55
@yexiexie
Update UserGuide.md
51a96c4 
Update path of UI pic
@drtrifle
Updated my photo to doc/images
ac3829d
@yexiexie
Update AboutUs.md
35aecb6 
Update Kean Wai's photo format from jpg to png
@Fyelight
Updated addcommand
ede5f3f
@Fyelight
Updated ClearCommand messages
d6b7d7b
@Fyelight
Updated command comments
1082cf0
@drtrifle
Changed Address to Description
24499ba
@yexiexie
Update AboutUs.md
96f1cbf 
Update Roles and Responsibilities
@Fyelight
Updated DeleteCommand messages
2f02096
@Fyelight
Updated FindCommand messages
b3ab9f8
yexiexie and others added 24 commits March 8, 2017 11:04
@yexiexie @jinshunlee
Delete photos of SE-EDU developers
31a63b8
@yexiexie @jinshunlee
Update pictures of members
e2f8a50
@jinshunlee
Merge pull request #47 from CS2103JAN2017-W14-B3/update-aboutus
26a0bc5 
Update About Us and add pictures of members
@jinshunlee
Merge branch 'master' into Refactor_for_v0.1
e5de06e
@jinshunlee
Merge pull request #48 from CS2103JAN2017-W14-B3/Refactor_for_v0.1
bafe95a 
Refactor for v0.1
@Fyelight
Merge branch 'master' of https://github.com/CS2103JAN2017-W14-B3/main
7a387b3
@Fyelight
fixed ui bug By refactoring test case
a3682ff
@Fyelight
Merge branch 'UI_refactor' into Ken
1e06dfb
@Fyelight
Merge branch 'Ken'
ea1d712 
# Conflicts:
#	src/main/java/seedu/address/model/task/Task.java
#	src/main/java/seedu/address/storage/XmlAdaptedTask.java
#	src/main/java/seedu/address/ui/MainWindow.java
#	src/main/java/seedu/address/ui/TaskCard.java
#	src/test/java/guitests/AddCommandTest.java
#	src/test/java/guitests/AddressBookGuiTest.java
#	src/test/java/guitests/EditCommandTest.java
#	src/test/java/guitests/SelectCommandTest.java
#	src/test/java/guitests/guihandles/MainGuiHandle.java
#	src/test/java/guitests/guihandles/PersonCardHandle.java
#	src/test/java/guitests/guihandles/TaskCardHandle.java
#	src/test/java/guitests/guihandles/TaskListPanelHandle.java
#	src/test/java/guitests/guihandles/taskCardHandle.java
#	src/test/java/seedu/address/testutil/TestTask.java
#	src/test/java/seedu/address/testutil/TestUtil.java
@drtrifle
Update AboutUs.md
a4e1a49 
Removed trailing whitespaces
@drtrifle
Update DeveloperGuide.md
3abd287 
Removed trailing whitespace
@drtrifle
Update UserGuide.md
147be40 
Removed trailing whitespaces
@jinshunlee
Add badges to README.md
4df08af 
Added codacy, travis, coverall and appveyor badges
@jinshunlee
Merge pull request #49 from CS2103JAN2017-W14-B3/jinshunlee-add-badges
53e6b84 
Add badges to README.md
@jinshunlee
Update README.md
9f8cddb
@jinshunlee
Add badges into README.md
29b9163
@Fyelight
Merge branch 'V0.1_Refactor'
5016ba5 
# Conflicts:
#	README.md
@jinshunlee
Merge branch 'workingcopy'
e4c5480
@Fyelight
Merge branch 'master' of https://github.com/CS2103JAN2017-W14-B3/main
101b0fa
@Fyelight
Refactor taskCardHandle to TaskCardHandle and AddressBookGuiTest to T…
aa75ac1 
…askManagerGuiTest
@jinshunlee
Merge branch 'V0.1_Refactor'
9f40d42
@Fyelight
Removed HEAD from merge conflicts
6fe2ea7
@jinshunlee
Add codacy badge
0b11622
@Fyelight
Merge branch 'master' of https://github.com/CS2103JAN2017-W14-B3/main …
74ef2c5 
…into merge_conflict_resolve
@nus-se-pr-bot
Copy link

Hi @Fyelight, your pull request title is invalid. It should be in the format of [Activity ID][Team ID] Your name, where [Activity Id] has no dashes or spaces (e.g. [T2A3] stands for Tutorial 2 Activity 3) and [Team ID] has one dash only and no spaces (e.g. [W14-A2] means Wednesday 2pm (14 hrs), Phase A, Team 2). Please follow the instructions given strictly and edit your title for reprocessing.

Submit only one activity per pull request (unless otherwise stated in instructions) and do remember to create your branches from the commit where the master branch is pointing at so that each PR you submit only consist of commits meant for the activity.

Note: this comment is posted by a bot. If you believe this is done in error, please create an issue at cs2103-pr-bot and add a link to this PR.

@jinshunlee jinshunlee deleted the merge_conflict_resolve branch March 12, 2017 10:08
joelleejh pushed a commit to joelleejh/addressbook-level4 that referenced this pull request Mar 22, 2017
@alvinlyj
Merge pull request nus-cs2103-AY1617S2#77 from KohJunWei/master
62486eb 
Correcting Import and indentations
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
FormatCheckRequested
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@Fyelight @nus-se-pr-bot @jinshunlee @drtrifle @yexiexie