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

Fix styling issues due to merge conflicts #80

Merged
merged 36 commits into from Oct 24, 2019

Conversation

mirozo
Copy link
Collaborator

@mirozo mirozo commented Oct 24, 2019

No description provided.

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
@mirozo mirozo merged commit ca61b2d into AY1920S1-CS2103-F09-1:master Oct 24, 2019
@mirozo mirozo deleted the branch-devDocs branch October 24, 2019 03:58
mrchensheng21 added a commit to mrchensheng21/main that referenced this pull request Oct 26, 2019
* Update UserGuide.adoc for display feature and Update UiClassDiagram.puml (AY1920S1-CS2103-F09-1#78)

* Pull request (#7)

* Add help and edit features into User Guide (AY1920S1-CS2103-F09-1#44)

* Edit User Guide in display

* Edit User Guide in display (AY1920S1-CS2103-F09-1#42) (#3)

* Cleanup the User Guide format

* Edit the User Guide to sort the flow of guide (AY1920S1-CS2103-F09-1#43) (#4)

* Edit User Guide in display

* Edit User Guide in display (AY1920S1-CS2103-F09-1#42) (#3)

* Cleanup the User Guide format

* Add help and edit features into the User Guide

* Add TableView.fxml to create a table (AY1920S1-CS2103-F09-1#54)

* Edit User Guide in display

* Edit User Guide in display (AY1920S1-CS2103-F09-1#42) (#3)

* Cleanup the User Guide format

* Edit the User Guide to sort the flow of guide (AY1920S1-CS2103-F09-1#43) (#4)

* Edit User Guide in display

* Edit User Guide in display (AY1920S1-CS2103-F09-1#42) (#3)

* Cleanup the User Guide format

* Add help and edit features into the User Guide

* Add help and edit features into User Guide (AY1920S1-CS2103-F09-1#44) (#5)

* Edit User Guide in display

* Edit User Guide in display (AY1920S1-CS2103-F09-1#42) (#3)

* Cleanup the User Guide format

* Edit the User Guide to sort the flow of guide (AY1920S1-CS2103-F09-1#43) (#4)

* Edit User Guide in display

* Edit User Guide in display (AY1920S1-CS2103-F09-1#42) (#3)

* Cleanup the User Guide format

* Add help and edit features into the User Guide

* Add TableView.fxml skeleton

* Edit TableView.fxml

* Add textfield and user input field into TableView.fxml

* Add skeleton classes for generate interview timetable feature (AY1920S1-CS2103-F09-1#50)

* Add skeleton classes for generate interview timetable feature

* Fix errors with continous integration

* Add Unit Tests for Row, Column, and Schedule class

* Fix checkstyle issue

* Add skeleton Email feature (AY1920S1-CS2103-F09-1#51)

* Add new unimplemented email command

* Fix line endings

* Edit UserGuide.adoc to change UI display feature (AY1920S1-CS2103-F09-1#55)

* Edit User Guide in display

* Edit User Guide in display (AY1920S1-CS2103-F09-1#42) (#3)

* Cleanup the User Guide format

* Edit the User Guide to sort the flow of guide (AY1920S1-CS2103-F09-1#43) (#4)

* Edit User Guide in display

* Edit User Guide in display (AY1920S1-CS2103-F09-1#42) (#3)

* Cleanup the User Guide format

* Add help and edit features into the User Guide

* Add help and edit features into User Guide (AY1920S1-CS2103-F09-1#44) (#5)

* Edit User Guide in display

* Edit User Guide in display (AY1920S1-CS2103-F09-1#42) (#3)

* Cleanup the User Guide format

* Edit the User Guide to sort the flow of guide (AY1920S1-CS2103-F09-1#43) (#4)

* Edit User Guide in display

* Edit User Guide in display (AY1920S1-CS2103-F09-1#42) (#3)

* Cleanup the User Guide format

* Add help and edit features into the User Guide

* Add TableView.fxml skeleton

* Edit TableView.fxml

* Add textfield and user input field into TableView.fxml

* Edit UserGuide to change the display feature

* Add skeleton Interviewee and Interviewer class (AY1920S1-CS2103-F09-1#46)

* Add skeleton Interviewee and Interviewer class

* Fix travis CI issues

* [Partial] Implement import interviewer's availability from excel sheet feature (AY1920S1-CS2103-F09-1#57)

* Import from excel function

* Adds implementation for ExcelReader

* debug importExcel classes

* Check style for Import branch

* Add minimal functionality for Interviewee and Interviewer class (AY1920S1-CS2103-F09-1#60)

* Add skeleton Interviewee and Interviewer class

* Fix travis CI issues

* Add minimal fields and logic for Interviewee and Interviewer

* Fix travis CI issues

* Update Interviewee, add Emails, Rework Faculty

* [Partial] Generate interview schedule timetable from interviewers' availability (AY1920S1-CS2103-F09-1#61)

* [Partial] Implement Schedule Class

* Modify Model Manager to adapt to list of schedules

* Fix travis build issue

* Fix checkstyle issue

* Edit fxml file to change UI

* Pull request from team repo (#8)

* Add help and edit features into User Guide (AY1920S1-CS2103-F09-1#44)

* Edit User Guide in display

* Edit User Guide in display (AY1920S1-CS2103-F09-1#42) (#3)

* Cleanup the User Guide format

* Edit the User Guide to sort the flow of guide (AY1920S1-CS2103-F09-1#43) (#4)

* Edit User Guide in display

* Edit User Guide in display (AY1920S1-CS2103-F09-1#42) (#3)

* Cleanup the User Guide format

* Add help and edit features into the User Guide

* Add TableView.fxml to create a table (AY1920S1-CS2103-F09-1#54)

* Edit User Guide in display

* Edit User Guide in display (AY1920S1-CS2103-F09-1#42) (#3)

* Cleanup the User Guide format

* Edit the User Guide to sort the flow of guide (AY1920S1-CS2103-F09-1#43) (#4)

* Edit User Guide in display

* Edit User Guide in display (AY1920S1-CS2103-F09-1#42) (#3)

* Cleanup the User Guide format

* Add help and edit features into the User Guide

* Add help and edit features into User Guide (AY1920S1-CS2103-F09-1#44) (#5)

* Edit User Guide in display

* Edit User Guide in display (AY1920S1-CS2103-F09-1#42) (#3)

* Cleanup the User Guide format

* Edit the User Guide to sort the flow of guide (AY1920S1-CS2103-F09-1#43) (#4)

* Edit User Guide in display

* Edit User Guide in display (AY1920S1-CS2103-F09-1#42) (#3)

* Cleanup the User Guide format

* Add help and edit features into the User Guide

* Add TableView.fxml skeleton

* Edit TableView.fxml

* Add textfield and user input field into TableView.fxml

* Add skeleton classes for generate interview timetable feature (AY1920S1-CS2103-F09-1#50)

* Add skeleton classes for generate interview timetable feature

* Fix errors with continous integration

* Add Unit Tests for Row, Column, and Schedule class

* Fix checkstyle issue

* Add skeleton Email feature (AY1920S1-CS2103-F09-1#51)

* Add new unimplemented email command

* Fix line endings

* Edit UserGuide.adoc to change UI display feature (AY1920S1-CS2103-F09-1#55)

* Edit User Guide in display

* Edit User Guide in display (AY1920S1-CS2103-F09-1#42) (#3)

* Cleanup the User Guide format

* Edit the User Guide to sort the flow of guide (AY1920S1-CS2103-F09-1#43) (#4)

* Edit User Guide in display

* Edit User Guide in display (AY1920S1-CS2103-F09-1#42) (#3)

* Cleanup the User Guide format

* Add help and edit features into the User Guide

* Add help and edit features into User Guide (AY1920S1-CS2103-F09-1#44) (#5)

* Edit User Guide in display

* Edit User Guide in display (AY1920S1-CS2103-F09-1#42) (#3)

* Cleanup the User Guide format

* Edit the User Guide to sort the flow of guide (AY1920S1-CS2103-F09-1#43) (#4)

* Edit User Guide in display

* Edit User Guide in display (AY1920S1-CS2103-F09-1#42) (#3)

* Cleanup the User Guide format

* Add help and edit features into the User Guide

* Add TableView.fxml skeleton

* Edit TableView.fxml

* Add textfield and user input field into TableView.fxml

* Edit UserGuide to change the display feature

* Add skeleton Interviewee and Interviewer class (AY1920S1-CS2103-F09-1#46)

* Add skeleton Interviewee and Interviewer class

* Fix travis CI issues

* [Partial] Implement import interviewer's availability from excel sheet feature (AY1920S1-CS2103-F09-1#57)

* Import from excel function

* Adds implementation for ExcelReader

* debug importExcel classes

* Check style for Import branch

* Add minimal functionality for Interviewee and Interviewer class (AY1920S1-CS2103-F09-1#60)

* Add skeleton Interviewee and Interviewer class

* Fix travis CI issues

* Add minimal fields and logic for Interviewee and Interviewer

* Fix travis CI issues

* Update Interviewee, add Emails, Rework Faculty

* [Partial] Generate interview schedule timetable from interviewers' availability (AY1920S1-CS2103-F09-1#61)

* [Partial] Implement Schedule Class

* Modify Model Manager to adapt to list of schedules

* Fix travis build issue

* Fix checkstyle issue

* Fix checkstyle issue (AY1920S1-CS2103-F09-1#62)

* Add ScheduleView.java to display timetable

* Resolve conflicts

* Resolve conflict

* Resolve Conflict

* Resolve Conflict

* Resolve Conflict

* Resolve Conflict

* Resolve Conflict

* Resolve Conflicts

* Pull Request (#9)

* Add help and edit features into User Guide (AY1920S1-CS2103-F09-1#44)

* Edit User Guide in display

* Edit User Guide in display (AY1920S1-CS2103-F09-1#42) (#3)

* Cleanup the User Guide format

* Edit the User Guide to sort the flow of guide (AY1920S1-CS2103-F09-1#43) (#4)

* Edit User Guide in display

* Edit User Guide in display (AY1920S1-CS2103-F09-1#42) (#3)

* Cleanup the User Guide format

* Add help and edit features into the User Guide

* Add TableView.fxml to create a table (AY1920S1-CS2103-F09-1#54)

* Edit User Guide in display

* Edit User Guide in display (AY1920S1-CS2103-F09-1#42) (#3)

* Cleanup the User Guide format

* Edit the User Guide to sort the flow of guide (AY1920S1-CS2103-F09-1#43) (#4)

* Edit User Guide in display

* Edit User Guide in display (AY1920S1-CS2103-F09-1#42) (#3)

* Cleanup the User Guide format

* Add help and edit features into the User Guide

* Add help and edit features into User Guide (AY1920S1-CS2103-F09-1#44) (#5)

* Edit User Guide in display

* Edit User Guide in display (AY1920S1-CS2103-F09-1#42) (#3)

* Cleanup the User Guide format

* Edit the User Guide to sort the flow of guide (AY1920S1-CS2103-F09-1#43) (#4)

* Edit User Guide in display

* Edit User Guide in display (AY1920S1-CS2103-F09-1#42) (#3)

* Cleanup the User Guide format

* Add help and edit features into the User Guide

* Add TableView.fxml skeleton

* Edit TableView.fxml

* Add textfield and user input field into TableView.fxml

* Add skeleton classes for generate interview timetable feature (AY1920S1-CS2103-F09-1#50)

* Add skeleton classes for generate interview timetable feature

* Fix errors with continous integration

* Add Unit Tests for Row, Column, and Schedule class

* Fix checkstyle issue

* Add skeleton Email feature (AY1920S1-CS2103-F09-1#51)

* Add new unimplemented email command

* Fix line endings

* Edit UserGuide.adoc to change UI display feature (AY1920S1-CS2103-F09-1#55)

* Edit User Guide in display

* Edit User Guide in display (AY1920S1-CS2103-F09-1#42) (#3)

* Cleanup the User Guide format

* Edit the User Guide to sort the flow of guide (AY1920S1-CS2103-F09-1#43) (#4)

* Edit User Guide in display

* Edit User Guide in display (AY1920S1-CS2103-F09-1#42) (#3)

* Cleanup the User Guide format

* Add help and edit features into the User Guide

* Add help and edit features into User Guide (AY1920S1-CS2103-F09-1#44) (#5)

* Edit User Guide in display

* Edit User Guide in display (AY1920S1-CS2103-F09-1#42) (#3)

* Cleanup the User Guide format

* Edit the User Guide to sort the flow of guide (AY1920S1-CS2103-F09-1#43) (#4)

* Edit User Guide in display

* Edit User Guide in display (AY1920S1-CS2103-F09-1#42) (#3)

* Cleanup the User Guide format

* Add help and edit features into the User Guide

* Add TableView.fxml skeleton

* Edit TableView.fxml

* Add textfield and user input field into TableView.fxml

* Edit UserGuide to change the display feature

* Add skeleton Interviewee and Interviewer class (AY1920S1-CS2103-F09-1#46)

* Add skeleton Interviewee and Interviewer class

* Fix travis CI issues

* [Partial] Implement import interviewer's availability from excel sheet feature (AY1920S1-CS2103-F09-1#57)

* Import from excel function

* Adds implementation for ExcelReader

* debug importExcel classes

* Check style for Import branch

* Add minimal functionality for Interviewee and Interviewer class (AY1920S1-CS2103-F09-1#60)

* Add skeleton Interviewee and Interviewer class

* Fix travis CI issues

* Add minimal fields and logic for Interviewee and Interviewer

* Fix travis CI issues

* Update Interviewee, add Emails, Rework Faculty

* [Partial] Generate interview schedule timetable from interviewers' availability (AY1920S1-CS2103-F09-1#61)

* [Partial] Implement Schedule Class

* Modify Model Manager to adapt to list of schedules

* Fix travis build issue

* Fix checkstyle issue

* Fix checkstyle issue (AY1920S1-CS2103-F09-1#62)

* [Complete] Implement Schedule class (AY1920S1-CS2103-F09-1#63)

* Update Slot class and squash bug

* Add ScheduleView.java for viewing of timetable

* Edit ScheduleView.java to make it work

* Edit code to fulfil checkstyle

* Edit code to fulfil checkstyle

* Edit code to fulfil Checkstyle requirements

* Delete getSamplePersons from SampleDataUtil.java

* Edit code to fulfil Checkstyle Requirements

* Fix Checkstyle

* Pull request from team repo (#10)

* Implement view schedule feature (AY1920S1-CS2103-F09-1#68)

* Pull request (#7)

* Add help and edit features into User Guide (AY1920S1-CS2103-F09-1#44)

* Edit User Guide in display

* Edit User Guide in display (AY1920S1-CS2103-F09-1#42) (#3)

* Cleanup the User Guide format

* Edit the User Guide to sort the flow of guide (AY1920S1-CS2103-F09-1#43) (#4)

* Edit User Guide in display

* Edit User Guide in display (AY1920S1-CS2103-F09-1#42) (#3)

* Cleanup the User Guide format

* Add help and edit features into the User Guide

* Add TableView.fxml to create a table (AY1920S1-CS2103-F09-1#54)

* Edit User Guide in display

* Edit User Guide in display (AY1920S1-CS2103-F09-1#42) (#3)

* Cleanup the User Guide format

* Edit the User Guide to sort the flow of guide (AY1920S1-CS2103-F09-1#43) (#4)

* Edit User Guide in display

* Edit User Guide in display (AY1920S1-CS2103-F09-1#42) (#3)

* Cleanup the User Guide format

* Add help and edit features into the User Guide

* Add help and edit features into User Guide (AY1920S1-CS2103-F09-1#44) (#5)

* Edit User Guide in display

* Edit User Guide in display (AY1920S1-CS2103-F09-1#42) (#3)

* Cleanup the User Guide format

* Edit the User Guide to sort the flow of guide (AY1920S1-CS2103-F09-1#43) (#4)

* Edit User Guide in display

* Edit User Guide in display (AY1920S1-CS2103-F09-1#42) (#3)

* Cleanup the User Guide format

* Add help and edit features into the User Guide

* Add TableView.fxml skeleton

* Edit TableView.fxml

* Add textfield and user input field into TableView.fxml

* Add skeleton classes for generate interview timetable feature (AY1920S1-CS2103-F09-1#50)

* Add skeleton classes for generate interview timetable feature

* Fix errors with continous integration

* Add Unit Tests for Row, Column, and Schedule class

* Fix checkstyle issue

* Add skeleton Email feature (AY1920S1-CS2103-F09-1#51)

* Add new unimplemented email command

* Fix line endings

* Edit UserGuide.adoc to change UI display feature (AY1920S1-CS2103-F09-1#55)

* Edit User Guide in display

* Edit User Guide in display (AY1920S1-CS2103-F09-1#42) (#3)

* Cleanup the User Guide format

* Edit the User Guide to sort the flow of guide (AY1920S1-CS2103-F09-1#43) (#4)

* Edit User Guide in display

* Edit User Guide in display (AY1920S1-CS2103-F09-1#42) (#3)

* Cleanup the User Guide format

* Add help and edit features into the User Guide

* Add help and edit features into User Guide (AY1920S1-CS2103-F09-1#44) (#5)

* Edit User Guide in display

* Edit User Guide in display (AY1920S1-CS2103-F09-1#42) (#3)

* Cleanup the User Guide format

* Edit the User Guide to sort the flow of guide (AY1920S1-CS2103-F09-1#43) (#4)

* Edit User Guide in display

* Edit User Guide in display (AY1920S1-CS2103-F09-1#42) (#3)

* Cleanup the User Guide format

* Add help and edit features into the User Guide

* Add TableView.fxml skeleton

* Edit TableView.fxml

* Add textfield and user input field into TableView.fxml

* Edit UserGuide to change the display feature

* Add skeleton Interviewee and Interviewer class (AY1920S1-CS2103-F09-1#46)

* Add skeleton Interviewee and Interviewer class

* Fix travis CI issues

* [Partial] Implement import interviewer's availability from excel sheet feature (AY1920S1-CS2103-F09-1#57)

* Import from excel function

* Adds implementation for ExcelReader

* debug importExcel classes

* Check style for Import branch

* Add minimal functionality for Interviewee and Interviewer class (AY1920S1-CS2103-F09-1#60)

* Add skeleton Interviewee and Interviewer class

* Fix travis CI issues

* Add minimal fields and logic for Interviewee and Interviewer

* Fix travis CI issues

* Update Interviewee, add Emails, Rework Faculty

* [Partial] Generate interview schedule timetable from interviewers' availability (AY1920S1-CS2103-F09-1#61)

* [Partial] Implement Schedule Class

* Modify Model Manager to adapt to list of schedules

* Fix travis build issue

* Fix checkstyle issue

* Edit fxml file to change UI

* Pull request from team repo (#8)

* Add help and edit features into User Guide (AY1920S1-CS2103-F09-1#44)

* Edit User Guide in display

* Edit User Guide in display (AY1920S1-CS2103-F09-1#42) (#3)

* Cleanup the User Guide format

* Edit the User Guide to sort the flow of guide (AY1920S1-CS2103-F09-1#43) (#4)

* Edit User Guide in display

* Edit User Guide in display (AY1920S1-CS2103-F09-1#42) (#3)

* Cleanup the User Guide format

* Add help and edit features into the User Guide

* Add TableView.fxml to create a table (AY1920S1-CS2103-F09-1#54)

* Edit User Guide in display

* Edit User Guide in display (AY1920S1-CS2103-F09-1#42) (#3)

* Cleanup the User Guide format

* Edit the User Guide to sort the flow of guide (AY1920S1-CS2103-F09-1#43) (#4)

* Edit User Guide in display

* Edit User Guide in display (AY1920S1-CS2103-F09-1#42) (#3)

* Cleanup the User Guide format

* Add help and edit features into the User Guide

* Add help and edit features into User Guide (AY1920S1-CS2103-F09-1#44) (#5)

* Edit User Guide in display

* Edit User Guide in display (AY1920S1-CS2103-F09-1#42) (#3)

* Cleanup the User Guide format

* Edit the User Guide to sort the flow of guide (AY1920S1-CS2103-F09-1#43) (#4)

* Edit User Guide in display

* Edit User Guide in display (AY1920S1-CS2103-F09-1#42) (#3)

* Cleanup the User Guide format

* Add help and edit features into the User Guide

* Add TableView.fxml skeleton

* Edit TableView.fxml

* Add textfield and user input field into TableView.fxml

* Add skeleton classes for generate interview timetable feature (AY1920S1-CS2103-F09-1#50)

* Add skeleton classes for generate interview timetable feature

* Fix errors with continous integration

* Add Unit Tests for Row, Column, and Schedule class

* Fix checkstyle issue

* Add skeleton Email feature (AY1920S1-CS2103-F09-1#51)

* Add new unimplemented email command

* Fix line endings

* Edit UserGuide.adoc to change UI display feature (AY1920S1-CS2103-F09-1#55)

* Edit User Guide in display

* Edit User Guide in display (AY1920S1-CS2103-F09-1#42) (#3)

* Cleanup the User Guide format

* Edit the User Guide to sort the flow of guide (AY1920S1-CS2103-F09-1#43) (#4)

* Edit User Guide in display

* Edit User Guide in display (AY1920S1-CS2103-F09-1#42) (#3)

* Cleanup the User Guide format

* Add help and edit features into the User Guide

* Add help and edit features into User Guide (AY1920S1-CS2103-F09-1#44) (#5)

* Edit User Guide in display

* Edit User Guide in display (AY1920S1-CS2103-F09-1#42) (#3)

* Cleanup the User Guide format

* Edit the User Guide to sort the flow of guide (AY1920S1-CS2103-F09-1#43) (#4)

* Edit User Guide in display

* Edit User Guide in display (AY1920S1-CS2103-F09-1#42) (#3)

* Cleanup the User Guide format

* Add help and edit features into the User Guide

* Add TableView.fxml skeleton

* Edit TableView.fxml

* Add textfield and user input field into TableView.fxml

* Edit UserGuide to change the display feature

* Add skeleton Interviewee and Interviewer class (AY1920S1-CS2103-F09-1#46)

* Add skeleton Interviewee and Interviewer class

* Fix travis CI issues

* [Partial] Implement import interviewer's availability from excel sheet feature (AY1920S1-CS2103-F09-1#57)

* Import from excel function

* Adds implementation for ExcelReader

* debug importExcel classes

* Check style for Import branch

* Add minimal functionality for Interviewee and Interviewer class (AY1920S1-CS2103-F09-1#60)

* Add skeleton Interviewee and Interviewer class

* Fix travis CI issues

* Add minimal fields and logic for Interviewee and Interviewer

* Fix travis CI issues

* Update Interviewee, add Emails, Rework Faculty

* [Partial] Generate interview schedule timetable from interviewers' availability (AY1920S1-CS2103-F09-1#61)

* [Partial] Implement Schedule Class

* Modify Model Manager to adapt to list of schedules

* Fix travis build issue

* Fix checkstyle issue

* Fix checkstyle issue (AY1920S1-CS2103-F09-1#62)

* Add ScheduleView.java to display timetable

* Resolve conflicts

* Resolve conflict

* Resolve Conflict

* Resolve Conflict

* Resolve Conflict

* Resolve Conflict

* Resolve Conflict

* Resolve Conflicts

* Pull Request (#9)

* Add help and edit features into User Guide (AY1920S1-CS2103-F09-1#44)

* Edit User Guide in display

* Edit User Guide in display (AY1920S1-CS2103-F09-1#42) (#3)

* Cleanup the User Guide format

* Edit the User Guide to sort the flow of guide (AY1920S1-CS2103-F09-1#43) (#4)

* Edit User Guide in display

* Edit User Guide in display (AY1920S1-CS2103-F09-1#42) (#3)

* Cleanup the User Guide format

* Add help and edit features into the User Guide

* Add TableView.fxml to create a table (AY1920S1-CS2103-F09-1#54)

* Edit User Guide in display

* Edit User Guide in display (AY1920S1-CS2103-F09-1#42) (#3)

* Cleanup the User Guide format

* Edit the User Guide to sort the flow of guide (AY1920S1-CS2103-F09-1#43) (#4)

* Edit User Guide in display

* Edit User Guide in display (AY1920S1-CS2103-F09-1#42) (#3)

* Cleanup the User Guide format

* Add help and edit features into the User Guide

* Add help and edit features into User Guide (AY1920S1-CS2103-F09-1#44) (#5)

* Edit User Guide in display

* Edit User Guide in display (AY1920S1-CS2103-F09-1#42) (#3)

* Cleanup the User Guide format

* Edit the User Guide to sort the flow of guide (AY1920S1-CS2103-F09-1#43) (#4)

* Edit User Guide in display

* Edit User Guide in display (AY1920S1-CS2103-F09-1#42) (#3)

* Cleanup the User Guide format

* Add help and edit features into the User Guide

* Add TableView.fxml skeleton

* Edit TableView.fxml

* Add textfield and user input field into TableView.fxml

* Add skeleton classes for generate interview timetable feature (AY1920S1-CS2103-F09-1#50)

* Add skeleton classes for generate interview timetable feature

* Fix errors with continous integration

* Add Unit Tests for Row, Column, and Schedule class

* Fix checkstyle issue

* Add skeleton Email feature (AY1920S1-CS2103-F09-1#51)

* Add new unimplemented email command

* Fix line endings

* Edit UserGuide.adoc to change UI display feature (AY1920S1-CS2103-F09-1#55)

* Edit User Guide in display

* Edit User Guide in display (AY1920S1-CS2103-F09-1#42) (#3)

* Cleanup the User Guide format

* Edit the User Guide to sort the flow of guide (AY1920S1-CS2103-F09-1#43) (#4)

* Edit User Guide in display

* Edit User Guide in display (AY1920S1-CS2103-F09-1#42) (#3)

* Cleanup the User Guide format

* Add help and edit features into the User Guide

* Add help and edit features into User Guide (AY1920S1-CS2103-F09-1#44) (#5)

* Edit User Guide in display

* Edit User Guide in display (AY1920S1-CS2103-F09-1#42) (#3)

* Cleanup the User Guide format

* Edit the User Guide to sort the flow of guide (AY1920S1-CS2103-F09-1#43) (#4)

* Edit User Guide in display

* Edit User Guide in display (AY1920S1-CS2103-F09-1#42) (#3)

* Cleanup the User Guide format

* Add help and edit features into the User Guide

* Add TableView.fxml skeleton

* Edit TableView.fxml

* Add textfield and user input field into TableView.fxml

* Edit UserGuide to change the display feature

* Add skeleton Interviewee and Interviewer class (AY1920S1-CS2103-F09-1#46)

* Add skeleton Interviewee and Interviewer class

* Fix travis CI issues

* [Partial] Implement import interviewer's availability from excel sheet feature (AY1920S1-CS2103-F09-1#57)

* Import from excel function

* Adds implementation for ExcelReader

* debug importExcel classes

* Check style for Import branch

* Add minimal functionality for Interviewee and Interviewer class (AY1920S1-CS2103-F09-1#60)

* Add skeleton Interviewee and Interviewer class

* Fix travis CI issues

* Add minimal fields and logic for Interviewee and Interviewer

* Fix travis CI issues

* Update Interviewee, add Emails, Rework Faculty

* [Partial] Generate interview schedule timetable from interviewers' availability (AY1920S1-CS2103-F09-1#61)

* [Partial] Implement Schedule Class

* Modify Model Manager to adapt to list of schedules

* Fix travis build issue

* Fix checkstyle issue

* Fix checkstyle issue (AY1920S1-CS2103-F09-1#62)

* [Complete] Implement Schedule class (AY1920S1-CS2103-F09-1#63)

* Update Slot class and squash bug

* Add ScheduleView.java for viewing of timetable

* Edit ScheduleView.java to make it work

* Edit code to fulfil checkstyle

* Edit code to fulfil checkstyle

* Edit code to fulfil Checkstyle requirements

* Delete getSamplePersons from SampleDataUtil.java

* Edit code to fulfil Checkstyle Requirements

* Fix Checkstyle

* Implement timeslot sub-command (AY1920S1-CS2103-F09-1#65)

* Implement timeslot sub-command with basic error handling

* Fix checkstyle

* Specify Interviewee instead of Person

* Implement dummy code for opening user's mail client

* Remove unused import

* Implement functions for getting interviewee's email from name (AY1920S1-CS2103-F09-1#72)

* Pull request from team repo (#11)

* Implement view schedule feature (AY1920S1-CS2103-F09-1#68)

* Pull request (#7)

* Add help and edit features into User Guide (AY1920S1-CS2103-F09-1#44)

* Edit User Guide in display

* Edit User Guide in display (AY1920S1-CS2103-F09-1#42) (#3)

* Cleanup the User Guide format

* Edit the User Guide to sort the flow of guide (AY1920S1-CS2103-F09-1#43) (#4)

* Edit User Guide in display

* Edit User Guide in display (AY1920S1-CS2103-F09-1#42) (#3)

* Cleanup the User Guide format

* Add help and edit features into the User Guide

* Add TableView.fxml to create a table (AY1920S1-CS2103-F09-1#54)

* Edit User Guide in display

* Edit User Guide in display (AY1920S1-CS2103-F09-1#42) (#3)

* Cleanup the User Guide format

* Edit the User Guide to sort the flow of guide (AY1920S1-CS2103-F09-1#43) (#4)

* Edit User Guide in display

* Edit User Guide in display (AY1920S1-CS2103-F09-1#42) (#3)

* Cleanup the User Guide format

* Add help and edit features into the User Guide

* Add help and edit features into User Guide (AY1920S1-CS2103-F09-1#44) (#5)

* Edit User Guide in display

* Edit User Guide in display (AY1920S1-CS2103-F09-1#42) (#3)

* Cleanup the User Guide format

* Edit the User Guide to sort the flow of guide (AY1920S1-CS2103-F09-1#43) (#4)

* Edit User Guide in display

* Edit User Guide in display (AY1920S1-CS2103-F09-1#42) (#3)

* Cleanup the User Guide format

* Add help and edit features into the User Guide

* Add TableView.fxml skeleton

* Edit TableView.fxml

* Add textfield and user input field into TableView.fxml

* Add skeleton classes for generate interview timetable feature (AY1920S1-CS2103-F09-1#50)

* Add skeleton classes for generate interview timetable feature

* Fix errors with continous integration

* Add Unit Tests for Row, Column, and Schedule class

* Fix checkstyle issue

* Add skeleton Email feature (AY1920S1-CS2103-F09-1#51)

* Add new unimplemented email command

* Fix line endings

* Edit UserGuide.adoc to change UI display feature (AY1920S1-CS2103-F09-1#55)

* Edit User Guide in display

* Edit User Guide in display (AY1920S1-CS2103-F09-1#42) (#3)

* Cleanup the User Guide format

* Edit the User Guide to sort the flow of guide (AY1920S1-CS2103-F09-1#43) (#4)

* Edit User Guide in display

* Edit User Guide in display (AY1920S1-CS2103-F09-1#42) (#3)

* Cleanup the User Guide format

* Add help and edit features into the User Guide

* Add help and edit features into User Guide (AY1920S1-CS2103-F09-1#44) (#5)

* Edit User Guide in display

* Edit User Guide in display (AY1920S1-CS2103-F09-1#42) (#3)

* Cleanup the User Guide format

* Edit the User Guide to sort the flow of guide (AY1920S1-CS2103-F09-1#43) (#4)

* Edit User Guide in display

* Edit User Guide in display (AY1920S1-CS2103-F09-1#42) (#3)

* Cleanup the User Guide format

* Add help and edit features into the User Guide

* Add TableView.fxml skeleton

* Edit TableView.fxml

* Add textfield and user input field into TableView.fxml

* Edit UserGuide to change the display feature

* Add skeleton Interviewee and Interviewer class (AY1920S1-CS2103-F09-1#46)

* Add skeleton Interviewee and Interviewer class

* Fix travis CI issues

* [Partial] Implement import interviewer's availability from excel sheet feature (AY1920S1-CS2103-F09-1#57)

* Import from excel function

* Adds implementation for ExcelReader

* debug importExcel classes

* Check style for Import branch

* Add minimal functionality for Interviewee and Interviewer class (AY1920S1-CS2103-F09-1#60)

* Add skeleton Interviewee and Interviewer class

* Fix travis CI issues

* Add minimal fields and logic for Interviewee and Interviewer

* Fix travis CI issues

* Update Interviewee, add Emails, Rework Faculty

* [Partial] Generate interview schedule timetable from interviewers' availability (AY1920S1-CS2103-F09-1#61)

* [Partial] Implement Schedule Class

* Modify Model Manager to adapt to list of schedules

* Fix travis build issue

* Fix checkstyle issue

* Edit fxml file to change UI

* Pull request from team repo (#8)

* Add help and edit features into User Guide (AY1920S1-CS2103-F09-1#44)

* Edit User Guide in display

* Edit User Guide in display (AY1920S1-CS2103-F09-1#42) (#3)

* Cleanup the User Guide format

* Edit the User Guide to sort the flow of guide (AY1920S1-CS2103-F09-1#43) (#4)

* Edit User Guide in display

* Edit User Guide in display (AY1920S1-CS2103-F09-1#42) (#3)

* Cleanup the User Guide format

* Add help and edit features into the User Guide

* Add TableView.fxml to create a table (AY1920S1-CS2103-F09-1#54)

* Edit User Guide in display

* Edit User Guide in display (AY1920S1-CS2103-F09-1#42) (#3)

* Cleanup the User Guide format

* Edit the User Guide to sort the flow of guide (AY1920S1-CS2103-F09-1#43) (#4)

* Edit User Guide in display

* Edit User Guide in display (AY1920S1-CS2103-F09-1#42) (#3)

* Cleanup the User Guide format

* Add help and edit features into the User Guide

* Add help and edit features into User Guide (AY1920S1-CS2103-F09-1#44) (#5)

* Edit User Guide in display

* Edit User Guide in display (AY1920S1-CS2103-F09-1#42) (#3)

* Cleanup the User Guide format

* Edit the User Guide to sort the flow of guide (AY1920S1-CS2103-F09-1#43) (#4)

* Edit User Guide in display

* Edit User Guide in display (AY1920S1-CS2103-F09-1#42) (#3)

* Cleanup the User Guide format

* Add help and edit features into the User Guide

* Add TableView.fxml skeleton

* Edit TableView.fxml

* Add textfield and user input field into TableView.fxml

* Add skeleton classes for generate interview timetable feature (AY1920S1-CS2103-F09-1#50)

* Add skeleton classes for generate interview timetable feature

* Fix errors with continous integration

* Add Unit Tests for Row, Column, and Schedule class

* Fix checkstyle issue

* Add skeleton Email feature (AY1920S1-CS2103-F09-1#51)

* Add new unimplemented email command

* Fix line endings

* Edit UserGuide.adoc to change UI display feature (AY1920S1-CS2103-F09-1#55)

* Edit User Guide in display

* Edit User Guide in display (AY1920S1-CS2103-F09-1#42) (#3)

* Cleanup the User Guide format

* Edit the User Guide to sort the flow of guide (AY1920S1-CS2103-F09-1#43) (#4)

* Edit User Guide in display

* Edit User Guide in display (AY1920S1-CS2103-F09-1#42) (#3)

* Cleanup the User Guide format

* Add help and edit features into the User Guide

* Add help and edit features into User Guide (AY1920S1-CS2103-F09-1#44) (#5)

* Edit User Guide in display

* Edit User Guide in display (AY1920S1-CS2103-F09-1#42) (#3)

* Cleanup the User Guide format

* Edit the User Guide to sort the flow of guide (AY1920S1-CS2103-F09-1#43) (#4)

* Edit User Guide in display

* Edit User Guide in display (AY1920S1-CS2103-F09-1#42) (#3)

* Cleanup the User Guide format

* Add help and edit features into the User Guide

* Add TableView.fxml skeleton

* Edit TableView.fxml

* Add textfield and user input field into TableView.fxml

* Edit UserGuide to change the display feature

* Add skeleton Interviewee and Interviewer class (AY1920S1-CS2103-F09-1#46)

* Add skeleton Interviewee and Interviewer class

* Fix travis CI issues

* [Partial] Implement import interviewer's availability from excel sheet feature (AY1920S1-CS2103-F09-1#57)

* Import from excel function

* Adds implementation for ExcelReader

* debug importExcel classes

* Check style for Import branch

* Add minimal functionality for Interviewee and Interviewer class (AY1920S1-CS2103-F09-1#60)

* Add skeleton Interviewee and Interviewer class

* Fix travis CI issues

* Add minimal fields and logic for Interviewee and Interviewer

* Fix travis CI issues

* Update Interviewee, add Emails, Rework Faculty

* [Partial] Generate interview schedule timetable from interviewers' availability (AY1920S1-CS2103-F09-1#61)

* [Partial] Implement Schedule Class

* Modify Model Manager to adapt to list of schedules

* Fix travis build issue

* Fix checkstyle issue

* Fix checkstyle issue (AY1920S1-CS2103-F09-1#62)

* Add ScheduleView.java to display timetable

* Resolve conflicts

* Resolve conflict

* Resolve Conflict

* Resolve Conflict

* Resolve Conflict

* Resolve Conflict

* Resolve Conflict

* Resolve Conflicts

* Pull Request (#9)

* Add help and edit features into User Guide (AY1920S1-CS2103-F09-1#44)

* Edit User Guide in display

* Edit User Guide in display (AY1920S1-CS2103-F09-1#42) (#3)

* Cleanup the User Guide format

* Edit the User Guide to sort the flow of guide (AY1920S1-CS2103-F09-1#43) (#4)

* Edit User Guide in display

* Edit User Guide in display (AY1920S1-CS2103-F09-1#42) (#3)

* Cleanup the User Guide format

* Add help and edit features into the User Guide

* Add TableView.fxml to create a table (AY1920S1-CS2103-F09-1#54)

* Edit User Guide in display

* Edit User Guide in display (AY1920S1-CS2103-F09-1#42) (#3)

* Cleanup the User Guide format

* Edit the User Guide to sort the flow of guide (AY1920S1-CS2103-F09-1#43) (#4)

* Edit User Guide in display

* Edit User Guide in display (AY1920S1-CS2103-F09-1#42) (#3)

* Cleanup the User Guide format

* Add help and edit features into the User Guide

* Add help and edit features into User Guide (AY1920S1-CS2103-F09-1#44) (#5)

* Edit User Guide in display

* Edit User Guide in display (AY1920S1-CS2103-F09-1#42) (#3)

* Cleanup the User Guide format

* Edit the User Guide to sort the flow of guide (AY1920S1-CS2103-F09-1#43) (#4)

* Edit User Guide in display

* Edit User Guide in display (AY1920S1-CS2103-F09-1#42) (#3)

* Cleanup the User Guide format

* Add help and edit features into the User Guide

* Add TableView.fxml skeleton

* Edit TableView.fxml

* Add textfield and user input field into TableView.fxml

* Add skeleton classes for generate interview timetable feature (AY1920S1-CS2103-F09-1#50)

* Add skeleton classes for generate interview timetable feature

* Fix errors with continous integration

* Add Unit Tests for Row, Column, and Schedule class

* Fix checkstyle issue

* Add skeleton Email feature (AY1920S1-CS2103-F09-1#51)

* Add new unimplemented email command

* Fix line endings

* Edit UserGuide.adoc to change UI display feature (AY1920S1-CS2103-F09-1#55)

* Edit User Guide in display

* Edit User Guide in display (AY1920S1-CS2103-F09-1#42) (#3)

* Cleanup the User Guide format

* Edit the User Guide to sort the flow of guide (AY1920S1-CS2103-F09-1#43) (#4)

* Edit User Guide in display

* Edit User Guide in display (AY1920S1-CS2103-F09-1#42) (#3)

* Cleanup the User Guide format

* Add help and edit features into the User Guide

* Add help and edit features into User Guide (AY1920S1-CS2103-F09-1#44) (#5)

* Edit User Guide in display

* Edit User Guide in display (AY1920S1-CS2103-F09-1#42) (#3)

* Cleanup the User Guide format

* Edit the User Guide to sort the flow of guide (AY1920S1-CS2103-F09-1#43) (#4)

* Edit User Guide in display

* Edit User Guide in display (AY1920S1-CS2103-F09-1#42) (#3)

* Cleanup the User Guide format

* Add help and edit features into the User Guide

* Add TableView.fxml skeleton

* Edit TableView.fxml

* Add textfield and user input field into TableView.fxml

* Edit UserGuide to change the display feature

* Add skeleton Interviewee and Interviewer class (AY1920S1-CS2103-F09-1#46)

* Add skeleton Interviewee and Interviewer class

* Fix travis CI issues

* [Partial] Implement import interviewer's availability from excel sheet feature (AY1920S1-CS2103-F09-1#57)

* Import from excel function

* Adds implementation for ExcelReader

* debug importExcel classes

* Check style for Import branch

* Add minimal functionality for Interviewee and Interviewer class (AY1920S1-CS2103-F09-1#60)

* Add skeleton Interviewee and Interviewer class

* Fix travis CI issues

* Add minimal fields and logic for Interviewee and Interviewer

* Fix travis CI issues

* Update Interviewee, add Emails, Rework Faculty

* [Partial] Generate interview schedule timetable from interviewers' availability (AY1920S1-CS2103-F09-1#61)

* [Partial] Implement Schedule Class

* Modify Model Manager to adapt to list of schedules

* Fix travis build issue

* Fix checkstyle issue

* Fix checkstyle issue (AY1920S1-CS2103-F09-1#62)

* [Complete] Implement Schedule class (AY1920S1-CS2103-F09-1#63)

* Update Slot class and squash bug

* Add ScheduleView.java for viewing of timetable

* Edit ScheduleView.java to make it work

* Edit code to fulfil checkstyle

* Edit code to fulfil checkstyle

* Edit code to fulfil Checkstyle requirements

* Delete getSamplePersons from SampleDataUtil.java

* Edit code to fulfil Checkstyle Requirements

* Fix Checkstyle

* Implement timeslot sub-command (AY1920S1-CS2103-F09-1#65)

* Implement timeslot sub-command with basic error handling

* Fix checkstyle

* Specify Interviewee instead of Person

* Implement dummy code for opening user's mail client

* Remove unused import

* Implement functions for getting interviewee's email from name (AY1920S1-CS2103-F09-1#72)

* Pull request from team repo (#12)

* Implement view schedule feature (AY1920S1-CS2103-F09-1#68)

* Pull request (#7)

* Add help and edit features into User Guide (AY1920S1-CS2103-F09-1#44)

* Edit User Guide in display

* Edit User Guide in display (AY1920S1-CS2103-F09-1#42) (#3)

* Cleanup the User Guide format

* Edit the User Guide to sort the flow of guide (AY1920S1-CS2103-F09-1#43) (#4)

* Edit User Guide in display

* Edit User Guide in display (AY1920S1-CS2103-F09-1#42) (#3)

* Cleanup the User Guide format

* Add help and edit features into the User Guide

* Add TableView.fxml to create a table (AY1920S1-CS2103-F09-1#54)

* Edit User Guide in display

* Edit User Guide in display (AY1920S1-CS2103-F09-1#42) (#3)

* Cleanup the User Guide format

* Edit the User Guide to sort the flow of guide (AY1920S1-CS2103-F09-1#43) (#4)

* Edit User Guide in display

* Edit User Guide in display (AY1920S1-CS2103-F09-1#42) (#3)

* Cleanup the User Guide format

* Add help and edit features into the User Guide

* Add help and edit features into User Guide (AY1920S1-CS2103-F09-1#44) (#5)

* Edit User Guide in display

* Edit User Guide in display (AY1920S1-CS2103-F09-1#42) (#3)

* Cleanup the User Guide format

* Edit the User Guide to sort the flow of guide (AY1920S1-CS2103-F09-1#43) (#4)

* Edit User Guide in display

* Edit User Guide in display (AY1920S1-CS2103-F09-1#42) (#3)

* Cleanup the User Guide format

* Add help and edit features into the User Guide

* Add TableView.fxml skeleton

* Edit TableView.fxml

* Add textfield and user input field into TableView.fxml

* Add skeleton classes for generate interview timetable feature (AY1920S1-CS2103-F09-1#50)

* Add skeleton classes for generate interview timetable feature

* Fix errors with continous integration

* Add Unit Tests for Row, Column, and Schedule class

* Fix checkstyle issue

* Add skeleton Email feature (AY1920S1-CS2103-F09-1#51)

* Add new unimplemented email command

* Fix line endings

* Edit UserGuide.adoc to change UI display feature (AY1920S1-CS2103-F09-1#55)

* Edit User Guide in display

* Edit User Guide in display (AY1920S1-CS2103-F09-1#42) (#3)

* Cleanup the User Guide format

* Edit the User Guide to sort the flow of guide (AY1920S1-CS2103-F09-1#43) (#4)

* Edit User Guide in display

* Edit User Guide in display (AY1920S1-CS2103-F09-1#42) (#3)

* Cleanup the User Guide format

* Add help and edit features into the User Guide

* Add help and edit features into User Guide (AY1920S1-CS2103-F09-1#44) (#5)

* Edit User Guide in display

* Edit User Guide in display (AY1920S1-CS2103-F09-1#42) (#3)

* Cleanup the User Guide format

* Edit the User Guide to sort the flow of guide (AY1920S1-CS2103-F09-1#43) (#4)

* Edit User Guide in display

* Edit User Guide in display (AY1920S1-CS2103-F09-1#42) (#3)

* Cleanup the User Guide format

* Add help and edit features into the User Guide

* Add TableView.fxml skeleton

* Edit TableView.fxml

* Add textfield and user input field into TableView.fxml

* Edit UserGuide to change the display feature

* Add skeleton Interviewee and Interviewer class (AY1920S1-CS2103-F09-1#46)

* Add skeleton Interviewee and Interviewer class

* Fix travis CI issues

* [Partial] Implement import interviewer's availability from excel sheet feature (AY1920S1-CS2103-F09-1#57)

* Import from excel function

* Adds implementation for ExcelReader

* debug importExcel classes

* Check style for Import branch

* Add minimal functionality for Interviewee and Interviewer class (AY1920S1-CS2103-F09-1#60)

* Add skeleton Interviewee and Interviewer class

* Fix travis CI issues

* Add minimal fields and logic for Interviewee and Interviewer

* Fix travis CI issues

* Update Interviewee, add Emails, Rework Faculty

* [Partial] Generate interview schedule timetable from interviewers' availability (AY1920S1-CS2103-F09-1#61)

* [Partial] Implement Schedule Class

* Modify Model Manager to adapt to list of schedules

* Fix travis build issue

* Fix checkstyle issue

* Edit fxml file to change UI

* Pull request from team repo (#8)

* Add help and edit features into User Guide (AY1920S1-CS2103-F09-1#44)

* Edit User Guide in display

* Edit User Guide in display (AY1920S1-CS2103-F09-1#42) (#3)

* Cleanup the User Guide format

* Edit the User Guide to sort the flow of guide (AY1920S1-CS2103-F09-1#43) (#4)

* Edit User Guide in display

* Edit User Guide in display (AY1920S1-CS2103-F09-1#42) (#3)

* Cleanup the User Guide format

* Add help and edit features into the User Guide

* Add TableView.fxml to create a table (AY1920S1-CS2103-F09-1#54)

* Edit User Guide in display

* Edit User Guide in display (AY1920S1-CS2103-F09-1#42) (#3)

* Cleanup the User Guide format

* Edit the User Guide to sort the flow of guide (AY1920S1-CS2103-F09-1#43) (#4)

* Edit User Guide in display

* Edit User Guide in display (AY1920S1-CS2103-F09-1#42) (#3)

* Cleanup the User Guide format

* Add help and edit features into the User Guide

* Add help and edit features into User Guide (AY1920S1-CS2103-F09-1#44) (#5)

* Edit User Guide in display

* Edit User Guide in display (AY1920S1-CS2103-F09-1#42) (#3)

* Cleanup the User Guide format

* Edit the User Guide to sort the flow of guide (AY1920S1-CS2103-F09-1#43) (#4)

* Edit User Guide in display

* Edit User Guide in display (AY1920S1-CS2103-F09-1#42) (#3)

* Cleanup the User Guide format

* Add help and edit features into the User Guide

* Add TableView.fxml skeleton

* Edit TableView.fxml

* Add textfield and user input field into TableView.fxml

* Add skeleton classes for generate interview timetable feature (AY1920S1-CS2103-F09-1#50)

* Add skeleton classes for generate interview timetable feature

* Fix errors with continous integration

* Add Unit Tests for Row, Column, and Schedule class

* Fix checkstyle issue

* Add skeleton Email feature (AY1920S1-CS2103-F09-1#51)

* Add new unimplemented email command

* Fix line endings

* Edit UserGuide.adoc to change UI display feature (AY1920S1-CS2103-F09-1#55)

* Edit User Guide in display

* Edit User Guide in display (AY1920S1-CS2103-F09-1#42) (#3)

* Cleanup the User Guide format

* Edit the User Guide to sort the flow of guide (AY1920S1-CS2103-F09-1#43) (#4)

* Edit User Guide in display

* Edit User Guide in display (AY1920S1-CS2103-F09-1#42) (#3)

* Cleanup the User Guide format

* Add help and edit features into the User Guide

* Add help and edit features into User Guide (AY1920S1-CS2103-F09-1#44) (#5)

* Edit User Guide in display

* Edit User Guide in display (AY1920S1-CS2103-F09-1#42) (#3)

* Cleanup the User Guide format

* Edit the User Guide to sort the flow of guide (AY1920S1-CS2103-F09-1#43) (#4)

* Edit User Guide in display

* Edit User Guide in display (AY1920S1-CS2103-F09-1#42) (#3)

* Cleanup the User Guide format

* Add help and edit features into the User Guide

* Add TableView.fxml skeleton

* Edit TableView.fxml

* Add textfield and user input field into TableView.fxml

* Edit UserGuide to change the display feature

* Add skeleton Interviewee and Interviewer class (AY1920S1-CS2103-F09-1#46)

* Add skeleton Interviewee and Interviewer class

* Fix travis CI issues

* [Partial] Implement import interviewer's availability from excel sheet feature (AY1920S1-CS2103-F09-1#57)

* Import from excel function

* Adds implementation for ExcelReader

* debug importExcel classes

* Check style for Import branch

* Add minimal functionality for Interviewee and Interviewer class (AY1920S1-CS2103-F09-1#60)

* Add skeleton Interviewee and Interviewer class

* Fix travis CI issues

* Add minimal fields and logic for Interviewee and Interviewer

* Fix travis CI issues

* Update Interviewee, add Emails, Rework Faculty

* [Partial] Generate interview schedule timetable from interviewers' availability (AY1920S1-CS2103-F09-1#61)

* [Partial] Implement Schedule Class

* Modify Model Manager to adapt to list of schedules

* Fix travis build issue

* Fix checkstyle issue

* Fix checkstyle issue (AY1920S1-CS2103-F09-1#62)

* Add ScheduleView.java to display timetable

* Resolve conflicts

* Resolve conflict

* Resolve Conflict

* Resolve Conflict

* Resolve Conflict

* Resolve Conflict

* Resolve Conflict

* Resolve Conflicts

* Pull Request (#9)

* Add help and edit features into User Guide (AY1920S1-CS2103-F09-1#44)

* Edit User Guide in display

* Edit User Guide in display (AY1920S1-CS2103-F09-1#42) (#3)

* Cleanup the User Guide format

* Edit the User Guide to sort the flow of guide (AY1920S1-CS2103-F09-1#43) (#4)

* Edit User Guide in display

* Edit User Guide in display (AY1920S1-CS2103-F09-1#42) (#3)

* Cleanup the User Guide format

* Add help and edit features into the User Guide

* Add TableView.fxml to create a table (AY1920S1-CS2103-F09-1#54)

* Edit User Guide in display

* Edit User Guide in display (AY1920S1-CS2103-F09-1#42) (#3)

* Cleanup the User Guide format

* Edit the User Guide to sort the flow of guide (AY1920S1-CS2103-F09-1#43) (#4)

* Edit User Guide in display

* Edit User Guide in display (AY1920S1-CS2103-F09-1#42) (#3)

* Cleanup the User Guide format

* Add help and edit features into the User Guide

* Add help and edit features into User Guide (AY1920S1-CS2103-F09-1#44) (#5)

* Edit User Guide in display

* Edit User Guide in display (AY1920S1-CS2103-F09-1#42) (#3)

* Cleanup the User Guide format

* Edit the User Guide to sort the flow of guide (AY1920S1-CS2103-F09-1#43) (#4)

* Edit User Guide in display

* Edit User Guide in display (AY1920S1-CS2103-F09-1#42) (#3)

* Cleanup the User Guide format

* Add help and edit features into the User Guide

* Add TableView.fxml skeleton

* Edit TableView.fxml

* Add textfield and user input field into TableView.fxml

* Add skeleton classes for generate interview timetable feature (AY1920S1-CS2103-F09-1#50)

* Add skeleton classes for generate interview timetable feature

* Fix errors with continous integration

* Add Unit Tests for Row, Column, and Schedule class

* Fix checkstyle issue

* Add skeleton Email feature (AY1920S1-CS2103-F09-1#51)

* Add new unimplemented email command

* Fix line endings

* Edit UserGuide.adoc to change UI display feature (AY1920S1-CS2103-F09-1#55)

* Edit User Guide in display

* Edit User Guide in display (AY1920S1-CS2103-F09-1#42) (#3)

* Cleanup the User Guide format

* Edit the User Guide to sort the flow of guide (AY1920S1-CS2103-F09-1#43) (#4)

* Edit User Guide in display

* Edit User Guide in display (AY1920S1-CS2103-F09-1#42) (#3)

* Cleanup the User Guide format

* Add help and edit features into the User Guide

* Add help and edit features into User Guide (AY1920S1-CS2103-F09-1#44) (#5)

* Edit User Guide in display

* Edit User Guide in display (AY1920S1-CS2103-F09-1#42) (#3)

* Cleanup the User Guide format

* Edit the User Guide to sort the flow of guide (AY1920S1-CS2103-F09-1#43) (#4)

* Edit User Guide in display

* Edit User Guide in display (AY1920S1-CS2103-F09-1#42) (#3)

* Cleanup the User Guide format

* Add help and edit features into the User Guide

* Add TableView.fxml skeleton

* Edit TableView.fxml

* Add textfield and user input field into TableView.fxml

* Edit UserGuide to change the display feature

* Add skeleton Interviewee and Interviewer class (AY1920S1-CS2103-F09-1#46)

* Add skeleton Interviewee and Interviewer class

* Fix travis CI issues

* [Partial] Implement import interviewer's availability from excel sheet feature (AY1920S1-CS2103-F09-1#57)

* Import from excel function

* Adds implementation for ExcelReader

* debug importExcel classes

* Check style for Import branch

* Add minimal functionality for Interviewee and Interviewer class (AY1920S1-CS2103-F09-1#60)

* Add skeleton Interviewee and Interviewer class

* Fix travis CI issues

* Add minimal fields and logic for Interviewee and Interviewer

* Fix travis CI issues

* Update Interviewee, add Emails, Rework Faculty

* [Partial] Generate interview schedule timetable from interviewers' availability (AY1920S1-CS2103-F09-1#61)

* [Partial] Implement Schedule Class

* Modify Model Manager to adapt to list of schedules

* Fix travis build issue

* Fix checkstyle issue

* Fix checkstyle issue (AY1920S1-CS2103-F09-1#62)

* [Complete] Implement Schedule class (AY1920S1-CS2103-F09-1#63)

* Update Slot class and squash bug

* Add ScheduleView.java for viewing of timetable

* Edit ScheduleView.java to make it work

* Edit code to fulfil checkstyle

* Edit code to fulfil checkstyle

* Edit code to fulfil Checkstyle requirements

* Delete getSamplePersons from SampleDataUtil.java

* Edit code to fulfil Checkstyle Requirements

* Fix Checkstyle

* Implement timeslot sub-command (AY1920S1-CS2103-F09-1#65)

* Implement timeslot sub-command with basic error handling

* Fix checkstyle

* Specify Interviewee instead of Person

* Implement dummy code for opening user's mail client

* Remove unused import

* Implement functions for getting interviewee's email from name (AY1920S1-CS2103-F09-1#72)

* Add ScheduleViewPanel.java to display multiple tables

* Travis Fix

* Fix merge conflicts

* Separate column titles from Schedule's observable list (AY1920S1-CS2103-F09-1#73) (#13)

* Separate column titles from Schedule's observable list

* Separate column titles from Schedule's observable list

* Fix failing tests

* Fix travis issue

* Edit multiple tableViews

* Add RefreshListener.java and RefreshListenerManager.java

* Edit RefreshListener.java and RefreshListenerManager.java to create feature of refreshing Ui when new data is being imported

* Travis fix

* Edit UserGuide.adoc to modify the UI Display part

* Typo Fix

* Update DeveloperGuide.adoc and UiClassDiagram.puml

* Update UiClassDiagram.puml

* Update UserGuide.adoc for Display feature

* Update UserGuide.adoc for Display feature

* Update developer's guide for Import and Export (AY1920S1-CS2103-F09-1#79)

* Import from excel function

* Adds implementation for ExcelReader

* debug importExcel classes

* Check style for Import branch

* Reads csv file correctly

* Finished up import interviewers feature

* Integrated with Schedule class and removed ScheduleStub

* Handles import exceptions

* Corrected Styling

* Adds test for Import commands

* Corrects styling for Import Tests

* Rename ExcelReader to CsvReader

* handles exceptions for import interviewers

* Adds intervieweesList attribute to model

* Travis fix

* Travis fix

* Style fix

* UML Diagrams

* Update Developer's Guide

* Resized diagrams

* Resize diagrams

* Style fix

* Fix styling issues due to merge conflicts (AY1920S1-CS2103-F09-1#80)

* Import from excel function

* Adds implementation for ExcelReader

* debug importExcel classes

* Check style for Import branch

* Reads csv file correctly

* Finished up import interviewers feature

* Integrated with Schedule class and removed ScheduleStub

* Handles import exceptions

* Corrected Styling

* Adds test for Import commands

* Corrects styling for Import Tests

* Rename ExcelReader to CsvReader

* handles exceptions for import interviewers

* Adds intervieweesList attribute to model

* Travis fix

* Travis fix

* Style fix

* UML Diagrams

* Update Developer's Guide

* Resized diagrams

* Resize diagrams

* Style fix

* Fixed styling issues in devdocs

* Update Developer Guide for email feature (AY1920S1-CS2103-F09-1#77)

* Update DeveloperGuide.adoc (AY1920S1-CS2103-F09-1#81)

* Fix capitalisation issue in 3.1 Scheduling Algorithm in DeveloperGuide.adoc

* Update DeveloperGuide.adoc

* Branch developer guide (AY1920S1-CS2103-F09-1#82)

* Add UML class and sequence diagrams

* small changes to dev guide

* Add activity diagram

* Fix travis CI issues

* Perform release for V1.2.1 (AY1920S1-CS2103-F09-1#83)

* Update DeveloperGuide.adoc (AY1920S1-CS2103-F09-1#84)

* Branch remove address (AY1920S1-CS2103-F09-1#86)

* add ew/ and ep/ email prefix for interviewees and fix checkstyle issues

* fix errors with UML diagrams

* fix compilation errors

* fix travis CI issues
@dcshzj dcshzj added this to the v1.3 milestone Oct 28, 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

3 participants