Code

Merge V0.5rc ruiwen#125

Code

Merged

qhng merged 11 commits intoV0.5rcCS2103AUG2016-T14-C2/main:V0.5rcfrom V0.5rc-RuiwenCS2103AUG2016-T14-C2/main:V0.5rc-RuiwenCopy head branch name to clipboardNov 5, 2016

+2,186-289

Commits

Commits on Nov 3, 2016

• Revert "Revert "Set up modelmanager to generate floating, overdue, daily and upcoming list""

  Show description for f6115e2
  qhng

  committed
  f6115e2

• Revert "Revert "Edit naming typo""

  Show description for abf4967
  qhng

  committed
  abf4967

• Revert "Revert "Set up dailyList controller""

  Show description for dd80095
  qhng

  committed
  dd80095

• Take theirs

  qhng

  committed
  7e03738

• Revert "Revert "Description of mainWindow.java and edit mainWindow.fxml""

  Show description for 72feb4e
  qhng

  committed
  72feb4e

• Revert "Revert "set up daily panel for mainWindow""

  Show description for 0f91d45
  qhng

  committed
  0f91d45

• no message

  qhng

  committed
  9fdd86d

• Integration round 1

  qhng

  committed
  1b18552

• Integration round 1

  qhng

  committed
  928d4ab

Commits on Nov 5, 2016

• Fix SUT. Removed menu feature.

  qhng

  committed
  6696ff6

• Fixed SUT. Removed clearing command box text on invalid command

  qhng

  committed
  408ed33