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

edit developerguide #119

Conversation

dongxuandong
Copy link

No description provided.

Leah Lim and others added 30 commits October 3, 2016 11:18
dongxuandong and others added 28 commits October 7, 2016 19:56
create 3 child class to parent class, task class
…main into Wanghuan

# Conflicts:
#	src/main/java/seedu/ggist/logic/commands/AddCommand.java
#	src/main/java/seedu/ggist/logic/commands/DeleteCommand.java
#	src/main/java/seedu/ggist/model/ModelManager.java
#	src/main/java/seedu/ggist/model/task/TaskName.java
#	src/main/java/seedu/ggist/storage/XmlAdaptedPerson.java
#	src/test/java/seedu/ggist/logic/LogicManagerTest.java
Edit AddCommand to create floating task, task with deadlines and events
…main into babyMaster

* 'babyMaster' of https://github.com/CS2103AUG2016-W13-C2/main:
  edit 3 files
  Add "date" and "time" class
  add floatingTask, eventTask, deadlineTask create a abstract task class edit readOnlyTask
  edit spelling mistakes
  Edit UserGuide

# Conflicts:
#	src/main/java/seedu/ggist/model/task/Task.java
#	src/test/java/seedu/ggist/logic/LogicManagerTest.java
…main into LiuZhenDongBranch

* 'babyMaster' of https://github.com/CS2103AUG2016-W13-C2/main:
  Remove Frequency and Priority
  Edit Parser class to parse input for different task types Edit AddCommand to create floating task, task with deadlines and events
  Add "date" and "time" class

# Conflicts:
#	src/main/java/seedu/ggist/storage/XmlAdaptedTask.java
…main into babyMaster

* 'babyMaster' of https://github.com/CS2103AUG2016-W13-C2/main:
  no message
  remove frequency and priority from all the files
* bernard-making-changes:
  Edit fxml files
* bernard-making-changes:
  Add Floating Task feature
zzzzwen referenced this pull request in CS2103AUG2016-W13-C3/main Oct 10, 2016
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.

3 participants