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

Update user guide and remove bugs from import command #146

Merged
merged 67 commits into from Nov 3, 2019

Conversation

mirozo
Copy link
Collaborator

@mirozo mirozo commented Nov 2, 2019

Added new section User preference in User guide.
Ui will now refresh when importing, adding and deleting data.

gohruizhi and others added 30 commits October 1, 2019 22:35
* 'master' of https://github.com/AY1920S1-CS2103-F09-1/main:
  Add add, delete, quickstart to user guide (AY1920S1-CS2103-F09-1#33)
  Update UserGuide.adoc (AY1920S1-CS2103-F09-1#32)
  Update site name and github link
  Update About Us page & Contact Us Page
  Update README.adoc
  Update coveralls link in README.adoc
  Update README.adoc
  Update README.adoc
…into Import

# Conflicts:
#	src/main/java/seedu/address/logic/commands/ImportCommand.java
#	src/main/java/seedu/address/logic/parser/ImportCommandParser.java
#	src/main/java/seedu/address/model/util/CsvReader.java
gohruizhi and others added 26 commits October 29, 2019 00:16
… dcshzj-branch-jsonslot

# Conflicts:
#	src/main/java/seedu/address/storage/JsonAdaptedSlot.java
…into ImportInterviewees

# Conflicts:
#	src/main/java/seedu/address/model/InterviewerList.java
#	src/main/java/seedu/address/model/ModelManager.java
#	src/main/java/seedu/address/model/util/SampleDataUtil.java
…into ChrisKheng-implementListener

# Conflicts:
#	src/main/java/seedu/address/model/ModelManager.java
# Conflicts:
#	src/main/java/seedu/address/logic/commands/ImportCommand.java
#	src/main/java/seedu/address/model/util/CsvReader.java
#	src/main/java/seedu/scheduler/model/InterviewerList.java
#	src/main/java/seedu/scheduler/model/Model.java
#	src/main/java/seedu/scheduler/model/ModelManager.java
#	src/main/java/seedu/scheduler/model/person/DefaultValues.java
#	src/main/java/seedu/scheduler/model/util/SampleDataUtil.java
#	src/main/java/seedu/scheduler/ui/MainWindow.java
#	src/test/java/seedu/address/logic/commands/ImportCommandTest.java
#	src/test/java/seedu/scheduler/logic/commands/AddIntervieweeCommandTest.java
#	src/test/java/seedu/scheduler/logic/commands/AddInterviewerCommandTest.java
…into UserGuideForv1.3

# Conflicts:
#	src/main/java/seedu/scheduler/logic/commands/ImportCommand.java
…o UserGuideForv1.3

# Conflicts:
#	src/main/java/seedu/scheduler/logic/commands/ImportCommand.java
Copy link
Member

@ChrisKheng ChrisKheng left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good to me!

@ChrisKheng ChrisKheng merged commit 1ad90e8 into AY1920S1-CS2103-F09-1:master Nov 3, 2019
@ChrisKheng ChrisKheng added this to the v1.4 milestone Nov 3, 2019
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.

None yet

4 participants