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

Collate the code #191

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

Collate the code #191

wants to merge 615 commits into from

Conversation

ZuoZhuolin
Copy link

No description provided.

turtle96 and others added 30 commits October 23, 2016 16:04
@turtle96
Merge pull request #91 from CS2103AUG2016-W15-C3/implement_save_location
9b9f8e9 
Implement save location
@turtle96
update intro in userguide
49fc1d3
@turtle96
edit header
b3ea823
@turtle96
update intro in developer guide
53567dd
@turtle96
update format and sentence structure for product survey
7247c67
@turtle96
create CommandHistory as data structure to hold relevant details for …
a8aa21a 
…undoing a command
@turtle96
edit undoCommand
d043a77
@turtle96
Merge branch 'master' of https://github.com/CS2103AUG2016-W15-C3/main …
b75c2b5 
…into implement_Undo
@turtle96
comment out UndoCommand static updates in ModelManager
6cee57e
@turtle96
update Parser to support Undo with index
21f2f53
@turtle96
add setTask() to commandHistory
62c1a60
@turtle96
edit UndoCommand
c039afb
@turtle96
set AddCommand to set task of corresponding UndoCommand
1d05d22
@turtle96
set DeleteCommand to set task of corresponding CommandHistory
8cb6f62
@turtle96
add comment
b3e9164
@turtle96
convert BrowserPanel to DisplayPanel
8fe09d7 
removed browser references
added text area for displaying data
@turtle96
add event to notify when DisplayPanel on UI should be updated
f27d3da
@turtle96
add getter method to return list of history command text
9489f41 
add method to delete most recent command if command is not successfully executed
@turtle96
delete corresponding command history added to list if AddCommand fails
4ff75cb
@turtle96
add ListUndoCommand which display list on DisplayPanel
d11cd45
@turtle96
parse support for ListUndoCommand
08b70da
@turtle96
add logging and exceptions handling in UndoCommand
e04988d
@turtle96
add handleDisplayListChanged() to UIManager
4f1da40
@turtle96
edit MainWindow to remove references to browser and web page loading
a3fb3ae
@turtle96
edit logging
ed07878
@turtle96
update comment
a07bd88
@turtle96
edit splitpane to have 8:2 ratio
e1f9962
@turtle96
set style to results-display
f2330c2
@turtle96
add assert
311b9b0
@turtle96
initialize commandHistory in LogicManagerTest so that test wont have …
5bf2902 
…null pointer error
turtle96 and others added 27 commits October 26, 2016 13:25
@turtle96
Merge branch 'implement_calendar_view' of https://github.com/CS2103AU…
5351b96 
…G2016-W15-C3/main into implement_calendar_view

# Conflicts:
#	docs/UserGuide.md

(kept both changes)
@turtle96
add return statement to handle null model
c04737d
@ZuoZhuolin
Merge pull request #115 from CS2103AUG2016-W15-C3/priority-colour
bcc454d 
Priority colour
@marcusngwj
Merge branch 'master' of https://github.com/CS2103AUG2016-W15-C3/main …
6530345 
…into Resolve-merge-list-priority

# Conflicts:
#	src/main/java/seedu/taskell/logic/parser/Parser.java
#	src/main/java/seedu/taskell/model/ModelManager.java
#	src/test/java/seedu/taskell/testutil/TypicalTestTasks.java
@Mamtha3005
Merge branch 'master' of https://github.com/CS2103AUG2016-W15-C3/main …
3aeedce 
…into Add-list-date

# Conflicts:
#	docs/UserGuide.md
#	src/main/java/seedu/taskell/logic/parser/Parser.java
#	src/main/java/seedu/taskell/model/ModelManager.java
#	src/test/java/seedu/taskell/testutil/TestUtil.java
#	src/test/java/seedu/taskell/testutil/TypicalTestTasks.java
@marcusngwj
Merge branch 'master' of https://github.com/CS2103AUG2016-W15-C3/main …
2752874 
…into Resolve-merge-list-priority

# Conflicts:
#	src/main/java/seedu/taskell/model/ModelManager.java
#	src/test/java/seedu/taskell/testutil/TypicalTestTasks.java
@marcusngwj
Merge pull request #138 from CS2103AUG2016-W15-C3/Resolve-merge-list-…
b58b322 
…priority

Resolve merge list priority
@marcusngwj
Merge branch 'master' of https://github.com/CS2103AUG2016-W15-C3/main …
b9122e2 
…into fix-bug-that-accept-time-before-current-time-and-day

# Conflicts:
#	src/test/java/seedu/taskell/logic/LogicManagerTest.java
@marcusngwj
Merge pull request #117 from CS2103AUG2016-W15-C3/fix-bug-that-accept…
468338b 
…-time-before-current-time-and-day

Fix bug that accept time before current time and day
@ZuoZhuolin
update aboutUs
ac65801
@ZuoZhuolin
upload teammate photo
367f25f
@ZuoZhuolin
File name refactor
8f35c1f
@marcusngwj
Merge pull request #139 from CS2103AUG2016-W15-C3/update-AboutUs
43bdeaf 
Update aboutUs
@turtle96
remove synchronized for deleteTask() so undo list can be updated in time
56dabca
@Mamtha3005
Merge branch 'master' into Add-list-date
b5f4b2d 
# Conflicts:
#	src/main/java/seedu/taskell/logic/parser/Parser.java
#	src/main/java/seedu/taskell/model/ModelManager.java
#	src/test/java/seedu/taskell/testutil/TestUtil.java
#	src/test/java/seedu/taskell/testutil/TypicalTestTasks.java
@Mamtha3005
Merge pull request #121 from CS2103AUG2016-W15-C3/Add-list-date
bc25054 
Add list date
@Mamtha3005
Merge pull request #137 from CS2103AUG2016-W15-C3/implement_Undo
dc70e5f 
more fix for undo bugs
@marcusngwj
Update readme.md
19f6992
@Mamtha3005
Merge pull request #126 from CS2103AUG2016-W15-C3/implement_calendar_…
828c594 
…view

Implement calendar view
@marcusngwj
Merge pull request #140 from CS2103AUG2016-W15-C3/fix-missing-diagrams
a9afb8f 
Update readme.md
@marcusngwj
no message
f47b877
@marcusngwj
Merge pull request #141 from CS2103AUG2016-W15-C3/mark_collate_add
d89d6ab 
collate
@ZuoZhuolin
collect the code
cccda4a
@Mamtha3005
Coolate UG
cddd9c1
@ZuoZhuolin
Merge branch 'master' of https://github.com/CS2103AUG2016-W15-C3/main …
0046745 
…into collect-the-code

# Conflicts:
#	src/main/java/seedu/taskell/logic/parser/Parser.java
@Mamtha3005
Merge branch 'master' of https://github.com/CS2103AUG2016-W15-C3/main …
db2e2b1 
…into collate_UG

# Conflicts:
#	docs/UserGuide.md
@Mamtha3005
Merge pull request #142 from CS2103AUG2016-W15-C3/collate_UG
e574cd7 
Coolate UG
@nus-se-pr-bot
Copy link

Hi @ZuoZhuolin, 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.

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
@ZuoZhuolin @nus-se-pr-bot @turtle96 @marcusngwj @Mamtha3005