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

Merge standardised changes to address book and achievements Ui #237

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

Merge standardised changes to address book and achievements Ui #237

wants to merge 903 commits into from
This pull request is big! We’re only showing the most recent 250 commits.

Commits on Nov 10, 2019

  1. Delete check2.png

    pohlinwei authored Nov 10, 2019
    Configuration menu
    Copy the full SHA
    d27e11d View commit details
    Browse the repository at this point in the history

  2. Delete check1.png

    pohlinwei authored Nov 10, 2019
    Configuration menu
    Copy the full SHA
    c5c953d View commit details
    Browse the repository at this point in the history

  3. Add files via upload

    pohlinwei authored Nov 10, 2019
    Configuration menu
    Copy the full SHA
    7edcbd6 View commit details
    Browse the repository at this point in the history

  4. Add files via upload

    pohlinwei authored Nov 10, 2019
    Configuration menu
    Copy the full SHA
    c82e82e View commit details
    Browse the repository at this point in the history

  5. Update UserGuide.adoc

    pohlinwei authored Nov 10, 2019
    Configuration menu
    Copy the full SHA
    4092ce5 View commit details
    Browse the repository at this point in the history

  6. Add files via upload

    pohlinwei authored Nov 10, 2019
    Configuration menu
    Copy the full SHA
    6e125a0 View commit details
    Browse the repository at this point in the history

  7. Merge pull request AY1920S1-CS2103T-T17-2#189 from pohlinwei/calendar… 

    …-v1.4

Update UG
    pohlinwei authored Nov 10, 2019
    Configuration menu
    Copy the full SHA
    994e443 View commit details
    Browse the repository at this point in the history

  8. Updates UG

    @honhaochen
    honhaochen committed Nov 10, 2019
    Configuration menu
    Copy the full SHA
    625dbbb View commit details
    Browse the repository at this point in the history

  9. Merge https://github.com/AY1920S1-CS2103T-T17-2/main

    @honhaochen
    honhaochen committed Nov 10, 2019
    Configuration menu
    Copy the full SHA
    d913926 View commit details
    Browse the repository at this point in the history

  10. Update UserGuide.adoc

    pohlinwei authored Nov 10, 2019
    Configuration menu
    Copy the full SHA
    3363ea8 View commit details
    Browse the repository at this point in the history

  11. Merge pull request AY1920S1-CS2103T-T17-2#190 from honhaochen/master 

    Updates UG
    @honhaochen
    honhaochen authored Nov 10, 2019
    Configuration menu
    Copy the full SHA
    da3bd00 View commit details
    Browse the repository at this point in the history

  12. Update UserGuide.adoc

    pohlinwei authored Nov 10, 2019
    Configuration menu
    Copy the full SHA
    da5479e View commit details
    Browse the repository at this point in the history

  13. checkstyle

    @honhaochen
    honhaochen committed Nov 10, 2019
    Configuration menu
    Copy the full SHA
    392b744 View commit details
    Browse the repository at this point in the history

  14. Updates UG main

    @honhaochen
    honhaochen committed Nov 10, 2019
    Configuration menu
    Copy the full SHA
    1706143 View commit details
    Browse the repository at this point in the history

  15. Update UserGuide.adoc

    pohlinwei authored Nov 10, 2019
    Configuration menu
    Copy the full SHA
    be39481 View commit details
    Browse the repository at this point in the history

  16. Merge pull request AY1920S1-CS2103T-T17-2#191 from honhaochen/master 

    Updates UG Main images
    @honhaochen
    honhaochen authored Nov 10, 2019
    Configuration menu
    Copy the full SHA
    e85cbb4 View commit details
    Browse the repository at this point in the history

  17. Update UserGuide.adoc

    pohlinwei authored Nov 10, 2019
    Configuration menu
    Copy the full SHA
    4095263 View commit details
    Browse the repository at this point in the history

  18. Update UserGuide.adoc

    pohlinwei authored Nov 10, 2019
    Configuration menu
    Copy the full SHA
    4009662 View commit details
    Browse the repository at this point in the history

  19. Update UG

    Tishya Khanna committed Nov 10, 2019
    Configuration menu
    Copy the full SHA
    3ade12e View commit details
    Browse the repository at this point in the history

  20. Update UserGuide.adoc

    pohlinwei authored Nov 10, 2019
    Configuration menu
    Copy the full SHA
    476687c View commit details
    Browse the repository at this point in the history

  21. Update UserGuide.adoc

    pohlinwei authored Nov 10, 2019
    Configuration menu
    Copy the full SHA
    dccf25e View commit details
    Browse the repository at this point in the history

  22. Update UserGuide.adoc

    pohlinwei authored Nov 10, 2019
    Configuration menu
    Copy the full SHA
    f772972 View commit details
    Browse the repository at this point in the history

  23. Merge pull request AY1920S1-CS2103T-T17-2#192 from tishyakhanna97/master 

    Update UG - Diary
    @tishyakhanna97
    tishyakhanna97 authored Nov 10, 2019
    Configuration menu
    Copy the full SHA
    06b83ae View commit details
    Browse the repository at this point in the history

  24. Merge branch 'master' into calendar-v1.4

    pohlinwei authored Nov 10, 2019
    Configuration menu
    Copy the full SHA
    bf8e2f6 View commit details
    Browse the repository at this point in the history

  25. updates UG command summary

    @honhaochen
    honhaochen committed Nov 10, 2019
    Configuration menu
    Copy the full SHA
    80d41b2 View commit details
    Browse the repository at this point in the history

  26. Merge pull request AY1920S1-CS2103T-T17-2#193 from pohlinwei/calendar… 

    …-v1.4

Update UG for main
    pohlinwei authored Nov 10, 2019
    Configuration menu
    Copy the full SHA
    41a53dd View commit details
    Browse the repository at this point in the history

  27. UG images scaling

    @honhaochen
    honhaochen committed Nov 10, 2019
    Configuration menu
    Copy the full SHA
    848fca8 View commit details
    Browse the repository at this point in the history

  28. Update table for UG

    Tishya Khanna committed Nov 10, 2019
    Configuration menu
    Copy the full SHA
    a73e92d View commit details
    Browse the repository at this point in the history

  29. Merge branch 'master' of https://github.com/AY1920S1-CS2103T-T17-2/main 

    * 'master' of https://github.com/AY1920S1-CS2103T-T17-2/main: (27 commits)
  Update UserGuide.adoc
  Update UserGuide.adoc
  Update UserGuide.adoc
  Update UserGuide.adoc
  Update UserGuide.adoc
  Update UserGuide.adoc
  Updates UG main
  checkstyle
  Update UserGuide.adoc
  Update UserGuide.adoc
  Updates UG
  Add files via upload
  Update UserGuide.adoc
  Add files via upload
  Add files via upload
  Delete check1.png
  Delete check2.png
  Update UserGuide.adoc
  Update UserGuide.adoc
  Update UserGuide.adoc
  ...

# Conflicts:
#	docs/UserGuide.adoc
    Tishya Khanna committed Nov 10, 2019
    Configuration menu
    Copy the full SHA
    c230d20 View commit details
    Browse the repository at this point in the history

  30. Merge pull request AY1920S1-CS2103T-T17-2#195 from tishyakhanna97/master 

    Solve merge conflicts and update UG
    @tishyakhanna97
    tishyakhanna97 authored Nov 10, 2019
    Configuration menu
    Copy the full SHA
    27678c7 View commit details
    Browse the repository at this point in the history

  31. UG refractor

    @honhaochen
    honhaochen committed Nov 10, 2019
    Configuration menu
    Copy the full SHA
    58f4c57 View commit details
    Browse the repository at this point in the history

  32. Update UserGuide.adoc

    pohlinwei authored Nov 10, 2019
    Configuration menu
    Copy the full SHA
    462b1bd View commit details
    Browse the repository at this point in the history

  33. Revert "Solve merge conflicts and update UG"

    @tishyakhanna97
    tishyakhanna97 authored Nov 10, 2019
    Configuration menu
    Copy the full SHA
    1ccb530 View commit details
    Browse the repository at this point in the history

  34. Update UserGuide.adoc

    pohlinwei authored Nov 10, 2019
    Configuration menu
    Copy the full SHA
    7222d0e View commit details
    Browse the repository at this point in the history

  35. Merge pull request AY1920S1-CS2103T-T17-2#196 from AY1920S1-CS2103T-T… 

    …17-2/revert-195-master

Revert "Solve merge conflicts and update UG"
    @tishyakhanna97
    tishyakhanna97 authored Nov 10, 2019
    Configuration menu
    Copy the full SHA
    e151e56 View commit details
    Browse the repository at this point in the history

  36. UG QnA revise

    @honhaochen
    honhaochen committed Nov 10, 2019
    Configuration menu
    Copy the full SHA
    4753a3a View commit details
    Browse the repository at this point in the history

  37. Merge pull request AY1920S1-CS2103T-T17-2#197 from pohlinwei/calendar… 

    …-v1.4

Update UG
    pohlinwei authored Nov 10, 2019
    Configuration menu
    Copy the full SHA
    f41c8b8 View commit details
    Browse the repository at this point in the history

  38. Refine itinerary feature UG content

    @ngzhaoming
    ngzhaoming committed Nov 10, 2019
    Configuration menu
    Copy the full SHA
    52fe0c6 View commit details
    Browse the repository at this point in the history

  39. Merge branch 'change-window-fix' into master

    @bjhoohaha
    bjhoohaha authored Nov 10, 2019
    Configuration menu
    Copy the full SHA
    c8e05c7 View commit details
    Browse the repository at this point in the history

  40. Merge https://github.com/AY1920S1-CS2103T-T17-2/main 

    # Conflicts:
#	docs/UserGuide.adoc
    @ngzhaoming
    ngzhaoming committed Nov 10, 2019
    Configuration menu
    Copy the full SHA
    92b3fb4 View commit details
    Browse the repository at this point in the history

  41. Merge https://github.com/AY1920S1-CS2103T-T17-2/main

    @ngzhaoming
    ngzhaoming committed Nov 10, 2019
    Configuration menu
    Copy the full SHA
    0679560 View commit details
    Browse the repository at this point in the history

  42. updates ug..

    @honhaochen
    honhaochen committed Nov 10, 2019
    Configuration menu
    Copy the full SHA
    1103d4b View commit details
    Browse the repository at this point in the history

  43. Merge pull request AY1920S1-CS2103T-T17-2#198 from ngzhaoming/master 

    Refine UG for the itinerary feature
    @ngzhaoming
    ngzhaoming authored Nov 10, 2019
    Configuration menu
    Copy the full SHA
    719fc76 View commit details
    Browse the repository at this point in the history

  44. Merge https://github.com/AY1920S1-CS2103T-T17-2/main

    @honhaochen
    honhaochen committed Nov 10, 2019
    Configuration menu
    Copy the full SHA
    3a2e29d View commit details
    Browse the repository at this point in the history

  45. Merge fixes

    @bjhoohaha
    bjhoohaha committed Nov 10, 2019
    Configuration menu
    Copy the full SHA
    d6a2820 View commit details
    Browse the repository at this point in the history

  46. Fix Code Window Bug

    Tishya Khanna committed Nov 10, 2019
    Configuration menu
    Copy the full SHA
    775ab00 View commit details
    Browse the repository at this point in the history

  47. Merge pull request AY1920S1-CS2103T-T17-2#200 from bjhoohaha/change-w… 

    …indow-fix

Merge fixes
    @bjhoohaha
    bjhoohaha authored Nov 10, 2019
    Configuration menu
    Copy the full SHA
    a5e1177 View commit details
    Browse the repository at this point in the history

  48. Merge pull request #43 from AY1920S1-CS2103T-T17-2/master 

    Merge fixes
    @bjhoohaha
    bjhoohaha authored Nov 10, 2019
    Configuration menu
    Copy the full SHA
    2b2290b View commit details
    Browse the repository at this point in the history

  49. adds auto-close for financial tracker help and summary window

    @honhaochen
    honhaochen committed Nov 10, 2019
    Configuration menu
    Copy the full SHA
    5fe9a14 View commit details
    Browse the repository at this point in the history

  50. Merge pull request AY1920S1-CS2103T-T17-2#199 from honhaochen/master 

    Updates UG again and again
    @honhaochen
    honhaochen authored Nov 10, 2019
    Configuration menu
    Copy the full SHA
    da233ec View commit details
    Browse the repository at this point in the history

  51. update UserGuide

    @bjhoohaha
    bjhoohaha committed Nov 10, 2019
    Configuration menu
    Copy the full SHA
    ba84d4a View commit details
    Browse the repository at this point in the history

  52. Fix itinerary clear 

    Not writing trash code.
    @bjhoohaha
    bjhoohaha committed Nov 10, 2019
    Configuration menu
    Copy the full SHA
    ff7bf59 View commit details
    Browse the repository at this point in the history

  53. Merge pull request AY1920S1-CS2103T-T17-2#203 from bjhoohaha/master 

    Update user guide
    @bjhoohaha
    bjhoohaha authored Nov 10, 2019
    Configuration menu
    Copy the full SHA
    89f1d7a View commit details
    Browse the repository at this point in the history

  54. Fix date bug

    pohlinwei committed Nov 10, 2019
    Configuration menu
    Copy the full SHA
    b01dce3 View commit details
    Browse the repository at this point in the history

  55. Add Javadoc for DayParser class

    pohlinwei committed Nov 10, 2019
    Configuration menu
    Copy the full SHA
    16e3e46 View commit details
    Browse the repository at this point in the history

  56. Merge branch 'calendar-v1.4' of https://github.com/pohlinwei/main int… 

    …o calendar-v1.4
    pohlinwei committed Nov 10, 2019
    Configuration menu
    Copy the full SHA
    66f88ad View commit details
    Browse the repository at this point in the history

  57. Fix grammar issues

    pohlinwei committed Nov 10, 2019
    Configuration menu
    Copy the full SHA
    32bcb91 View commit details
    Browse the repository at this point in the history

  58. Update UserGuide.adoc

    pohlinwei authored Nov 10, 2019
    Configuration menu
    Copy the full SHA
    a48c035 View commit details
    Browse the repository at this point in the history

  59. Merge branch 'master' of https://github.com/AY1920S1-CS2103T-T17-2/main 

    * 'master' of https://github.com/AY1920S1-CS2103T-T17-2/main:
  Fix itinerary clear
  update UserGuide
  adds auto-close for financial tracker help and summary window
  Merge fixes
  updates ug..
  Refine itinerary feature UG content
  UG QnA revise
  Update UserGuide.adoc
  Revert "Solve merge conflicts and update UG"
  Update UserGuide.adoc
  UG refractor
  UG images scaling
  updates UG command summary
  Modify UG for itinerary
  Implement close resources before going to page
  Fixed bug where closing window produce an error if resources in other pages are not hidden
  Fix  bugs in clear command
    Tishya Khanna committed Nov 10, 2019
    Configuration menu
    Copy the full SHA
    42d0ba7 View commit details
    Browse the repository at this point in the history

  60. Merge https://github.com/AY1920S1-CS2103T-T17-2/main 

    # Conflicts:
#	docs/UserGuide.adoc
    @ngzhaoming
    ngzhaoming committed Nov 10, 2019
    Configuration menu
    Copy the full SHA
    5029ab2 View commit details
    Browse the repository at this point in the history

  61. Merge https://github.com/AY1920S1-CS2103T-T17-2/main

    @ngzhaoming
    ngzhaoming committed Nov 10, 2019
    Configuration menu
    Copy the full SHA
    414bf35 View commit details
    Browse the repository at this point in the history

  62. Update User Guide for Address Book

    @bjhoohaha
    bjhoohaha committed Nov 10, 2019
    Configuration menu
    Copy the full SHA
    d4ab3b9 View commit details
    Browse the repository at this point in the history

  63. Merge pull request AY1920S1-CS2103T-T17-2#201 from tishyakhanna97/master 

    Fix Code Window Bug
    @ngzhaoming
    ngzhaoming authored Nov 10, 2019
    Configuration menu
    Copy the full SHA
    39ce139 View commit details
    Browse the repository at this point in the history

  64. Merge branch 'master' into calendar-v1.4

    @ngzhaoming
    ngzhaoming authored Nov 10, 2019
    Configuration menu
    Copy the full SHA
    516306f View commit details
    Browse the repository at this point in the history

  65. Merge pull request AY1920S1-CS2103T-T17-2#204 from pohlinwei/calendar… 

    …-v1.4

Update Javadoc, fix bug
    @ngzhaoming
    ngzhaoming authored Nov 10, 2019
    Configuration menu
    Copy the full SHA
    57f88e3 View commit details
    Browse the repository at this point in the history

  66. Merge https://github.com/AY1920S1-CS2103T-T17-2/main 

    # Conflicts:
#	docs/UserGuide.adoc
    @ngzhaoming
    ngzhaoming committed Nov 10, 2019
    Configuration menu
    Copy the full SHA
    24ae3d7 View commit details
    Browse the repository at this point in the history

  67. Fix Index error for delete command

    Tishya Khanna committed Nov 10, 2019
    Configuration menu
    Copy the full SHA
    daa700f View commit details
    Browse the repository at this point in the history

  68. Merge https://github.com/AY1920S1-CS2103T-T17-2/main 

    # Conflicts:
#	docs/UserGuide.adoc
    @ngzhaoming
    ngzhaoming committed Nov 10, 2019
    Configuration menu
    Copy the full SHA
    f659679 View commit details
    Browse the repository at this point in the history

  69. Implement v1.4 features and fix bugs

    @ngzhaoming
    ngzhaoming committed Nov 10, 2019
    Configuration menu
    Copy the full SHA
    829a221 View commit details
    Browse the repository at this point in the history

  70. Merge pull request AY1920S1-CS2103T-T17-2#205 from ngzhaoming/master 

    Implement v1.4, fix bugs and refine UG
    @ngzhaoming
    ngzhaoming authored Nov 10, 2019
    Configuration menu
    Copy the full SHA
    f22dd0f View commit details
    Browse the repository at this point in the history

  71. bug fixes and updates DG

    @honhaochen
    honhaochen committed Nov 10, 2019
    Configuration menu
    Copy the full SHA
    075ce2c View commit details
    Browse the repository at this point in the history

  72. Merge https://github.com/AY1920S1-CS2103T-T17-2/main

    @honhaochen
    honhaochen committed Nov 10, 2019
    Configuration menu
    Copy the full SHA
    45b1fbb View commit details
    Browse the repository at this point in the history

  73. Revert "Implement v1.4, fix bugs and refine UG"

    @ngzhaoming
    ngzhaoming authored Nov 10, 2019
    Configuration menu
    Copy the full SHA
    d7092fb View commit details
    Browse the repository at this point in the history

  74. Merge pull request AY1920S1-CS2103T-T17-2#207 from AY1920S1-CS2103T-T… 

    …17-2/revert-205-master

Revert "Implement v1.4, fix bugs and refine UG"
    @ngzhaoming
    ngzhaoming authored Nov 10, 2019
    Configuration menu
    Copy the full SHA
    ab4527a View commit details
    Browse the repository at this point in the history

  75. Revert "Update Javadoc, fix bug"

    @ngzhaoming
    ngzhaoming authored Nov 10, 2019
    Configuration menu
    Copy the full SHA
    bcba429 View commit details
    Browse the repository at this point in the history

  76. Fix Private, delete, unprivate and unlock bugs

    Tishya Khanna committed Nov 10, 2019
    Configuration menu
    Copy the full SHA
    9888369 View commit details
    Browse the repository at this point in the history

  77. Fix find date parsing

    Tishya Khanna committed Nov 10, 2019
    Configuration menu
    Copy the full SHA
    b8890fc View commit details
    Browse the repository at this point in the history

  78. Merge pull request AY1920S1-CS2103T-T17-2#208 from AY1920S1-CS2103T-T… 

    …17-2/revert-204-calendar-v1.4

Revert "Update Javadoc, fix bug"
    @ngzhaoming
    ngzhaoming authored Nov 10, 2019
    Configuration menu
    Copy the full SHA
    1413800 View commit details
    Browse the repository at this point in the history

  79. Merge pull request AY1920S1-CS2103T-T17-2#206 from honhaochen/master 

    bug fixes and updates DG
    @ngzhaoming
    ngzhaoming authored Nov 10, 2019
    Configuration menu
    Copy the full SHA
    f24f009 View commit details
    Browse the repository at this point in the history

  80. Revert "bug fixes and updates DG"

    @ngzhaoming
    ngzhaoming authored Nov 10, 2019
    Configuration menu
    Copy the full SHA
    9dc4958 View commit details
    Browse the repository at this point in the history

  81. Add length validation for place and memory

    Tishya Khanna committed Nov 10, 2019
    Configuration menu
    Copy the full SHA
    43af1f9 View commit details
    Browse the repository at this point in the history

  82. Merge pull request AY1920S1-CS2103T-T17-2#209 from AY1920S1-CS2103T-T… 

    …17-2/revert-206-master

Revert "bug fixes and updates DG"
    @ngzhaoming
    ngzhaoming authored Nov 10, 2019
    Configuration menu
    Copy the full SHA
    2f6c922 View commit details
    Browse the repository at this point in the history

  83. Refine UG, fix bugs and code style

    @ngzhaoming
    ngzhaoming committed Nov 10, 2019
    Configuration menu
    Copy the full SHA
    d9bbd50 View commit details
    Browse the repository at this point in the history

  84. Fix styling

    @ngzhaoming
    ngzhaoming committed Nov 10, 2019
    Configuration menu
    Copy the full SHA
    d0f3bb9 View commit details
    Browse the repository at this point in the history

  85. Merge pull request AY1920S1-CS2103T-T17-2#210 from ngzhaoming/master 

    Refine UG with changes
    @ngzhaoming
    ngzhaoming authored Nov 10, 2019
    Configuration menu
    Copy the full SHA
    74bda5b View commit details
    Browse the repository at this point in the history

  86. Solve storage bugs

    Tishya Khanna committed Nov 10, 2019
    Configuration menu
    Copy the full SHA
    dd21712 View commit details
    Browse the repository at this point in the history

  87. Settle bugs and fix help command window

    @ngzhaoming
    ngzhaoming committed Nov 10, 2019
    Configuration menu
    Copy the full SHA
    7d4b87c View commit details
    Browse the repository at this point in the history

  88. Settle bugs and fix help command window

    @ngzhaoming
    ngzhaoming committed Nov 10, 2019
    Configuration menu
    Copy the full SHA
    b460325 View commit details
    Browse the repository at this point in the history

  89. Merge pull request AY1920S1-CS2103T-T17-2#212 from ngzhaoming/master 

    Defensive coding with assertions
    @ngzhaoming
    ngzhaoming authored Nov 10, 2019
    Configuration menu
    Copy the full SHA
    48e5bb2 View commit details
    Browse the repository at this point in the history

  90. Update Achievements User Guide

    @bjhoohaha
    bjhoohaha committed Nov 10, 2019
    Configuration menu
    Copy the full SHA
    8c5adfc View commit details
    Browse the repository at this point in the history

  91. Merge pull request AY1920S1-CS2103T-T17-2#213 from bjhoohaha/master 

    Update Achievements User Guide
    @bjhoohaha
    bjhoohaha authored Nov 10, 2019
    Configuration menu
    Copy the full SHA
    a7cf947 View commit details
    Browse the repository at this point in the history

  92. Clean up Address Book User Guide

    @bjhoohaha
    bjhoohaha committed Nov 10, 2019
    Configuration menu
    Copy the full SHA
    73edc87 View commit details
    Browse the repository at this point in the history

  93. Merge pull request AY1920S1-CS2103T-T17-2#214 from bjhoohaha/master 

    Clean up Address Book User Guide
    @bjhoohaha
    bjhoohaha authored Nov 10, 2019
    Configuration menu
    Copy the full SHA
    ecf79b2 View commit details
    Browse the repository at this point in the history

  94. Update 'View on GitHub' link on website

    @bjhoohaha
    bjhoohaha committed Nov 10, 2019
    Configuration menu
    Copy the full SHA
    6bb96c0 View commit details
    Browse the repository at this point in the history

  95. Merge pull request AY1920S1-CS2103T-T17-2#215 from bjhoohaha/master 

    Update 'View on GitHub' link on website
    @bjhoohaha
    bjhoohaha authored Nov 10, 2019
    Configuration menu
    Copy the full SHA
    f635b30 View commit details
    Browse the repository at this point in the history

  96. Update JavaDocs, clear bugs and write J Unit Tests

    Tishya Khanna committed Nov 10, 2019
    Configuration menu
    Copy the full SHA
    a24b126 View commit details
    Browse the repository at this point in the history

  97. Update UserGuide.adoc

    pohlinwei authored Nov 10, 2019
    Configuration menu
    Copy the full SHA
    d4d7e74 View commit details
    Browse the repository at this point in the history

  98. Fix bugs

    pohlinwei committed Nov 10, 2019
    Configuration menu
    Copy the full SHA
    03a0226 View commit details
    Browse the repository at this point in the history

  99. Update UserGuide.adoc

    pohlinwei authored Nov 10, 2019
    Configuration menu
    Copy the full SHA
    d99317e View commit details
    Browse the repository at this point in the history

  100. financial tracker updates

    @honhaochen
    honhaochen committed Nov 10, 2019
    Configuration menu
    Copy the full SHA
    e1e3161 View commit details
    Browse the repository at this point in the history

  101. Merge https://github.com/AY1920S1-CS2103T-T17-2/main into branch-v1.4

    @honhaochen
    honhaochen committed Nov 10, 2019
    Configuration menu
    Copy the full SHA
    aa71655 View commit details
    Browse the repository at this point in the history

  102. Revert "Revert "bug fixes and updates DG"" 

    This reverts commit 9dc4958.
    honhaochen committed Nov 10, 2019
    Configuration menu
    Copy the full SHA
    6c8b10e View commit details
    Browse the repository at this point in the history

  103. Merge pull request AY1920S1-CS2103T-T17-2#216 from honhaochen/branch-… 

    …v1.4

revert commit
    @honhaochen
    honhaochen authored Nov 10, 2019
    Configuration menu
    Copy the full SHA
    d414729 View commit details
    Browse the repository at this point in the history

Commits on Nov 11, 2019

  1. update UG FaQ

    @honhaochen
    honhaochen committed Nov 11, 2019
    Configuration menu
    Copy the full SHA
    4977de6 View commit details
    Browse the repository at this point in the history

  2. documents update

    @honhaochen
    honhaochen committed Nov 11, 2019
    Configuration menu
    Copy the full SHA
    217bb51 View commit details
    Browse the repository at this point in the history

  3. Change error messages and UG

    @ngzhaoming
    ngzhaoming committed Nov 11, 2019
    Configuration menu
    Copy the full SHA
    3aba428 View commit details
    Browse the repository at this point in the history

  4. Refactor calendar

    pohlinwei committed Nov 11, 2019
    Configuration menu
    Copy the full SHA
    34b7624 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'calendar-v1.4' of https://github.com/pohlinwei/main int… 

    …o calendar-v1.4
    pohlinwei committed Nov 11, 2019
    Configuration menu
    Copy the full SHA
    0d1827e View commit details
    Browse the repository at this point in the history

  6. Merge pull request AY1920S1-CS2103T-T17-2#217 from honhaochen/branch-… 

    …v1.4

Updates documents
    @honhaochen
    honhaochen authored Nov 11, 2019
    Configuration menu
    Copy the full SHA
    9e16ac6 View commit details
    Browse the repository at this point in the history

  7. Add Tests

    Tishya Khanna committed Nov 11, 2019
    Configuration menu
    Copy the full SHA
    d46fa72 View commit details
    Browse the repository at this point in the history

  8. Merge branch 'master' of https://github.com/AY1920S1-CS2103T-T17-2/main 

    * 'master' of https://github.com/AY1920S1-CS2103T-T17-2/main: (22 commits)
  documents update
  update UG FaQ
  Revert "Revert "bug fixes and updates DG""
  financial tracker updates
  Update 'View on GitHub' link on website
  Clean up Address Book User Guide
  Update Achievements User Guide
  Settle bugs and fix help command window
  Settle bugs and fix help command window
  Refine UG, fix bugs and code style
  Revert "bug fixes and updates DG"
  Revert "Update Javadoc, fix bug"
  Revert "Implement v1.4, fix bugs and refine UG"
  bug fixes and updates DG
  Implement v1.4 features and fix bugs
  Merge https://github.com/AY1920S1-CS2103T-T17-2/main
  Update User Guide for Address Book
  Merge https://github.com/AY1920S1-CS2103T-T17-2/main
  Update UserGuide.adoc
  Fix grammar issues
  ...
    Tishya Khanna committed Nov 11, 2019
    Configuration menu
    Copy the full SHA
    7644bc1 View commit details
    Browse the repository at this point in the history

  9. Create Command Tests

    Tishya Khanna committed Nov 11, 2019
    Configuration menu
    Copy the full SHA
    8fe0fe3 View commit details
    Browse the repository at this point in the history

  10. bug fixes and feature finalise

    @honhaochen
    honhaochen committed Nov 11, 2019
    Configuration menu
    Copy the full SHA
    5e6e41f View commit details
    Browse the repository at this point in the history

  11. Update puml diagrams for Diary

    Tishya Khanna committed Nov 11, 2019
    Configuration menu
    Copy the full SHA
    b253f92 View commit details
    Browse the repository at this point in the history

  12. refine test cases

    @honhaochen
    honhaochen committed Nov 11, 2019
    Configuration menu
    Copy the full SHA
    6cb0de6 View commit details
    Browse the repository at this point in the history

  13. Merge https://github.com/AY1920S1-CS2103T-T17-2/main 

    # Conflicts:
#	docs/UserGuide.adoc
    @ngzhaoming
    ngzhaoming committed Nov 11, 2019
    Configuration menu
    Copy the full SHA
    5bf7455 View commit details
    Browse the repository at this point in the history

  14. Merge pull request AY1920S1-CS2103T-T17-2#220 from honhaochen/branch-… 

    …v1.4

finalize codes
    @ngzhaoming
    ngzhaoming authored Nov 11, 2019
    Configuration menu
    Copy the full SHA
    16b3b78 View commit details
    Browse the repository at this point in the history

  15. Merge pull request AY1920S1-CS2103T-T17-2#221 from ngzhaoming/master 

    Update UML diagrams for DG
    @ngzhaoming
    ngzhaoming authored Nov 11, 2019
    Configuration menu
    Copy the full SHA
    80db15f View commit details
    Browse the repository at this point in the history

  16. Resolve conflicts in UG

    pohlinwei committed Nov 11, 2019
    Configuration menu
    Copy the full SHA
    9879f47 View commit details
    Browse the repository at this point in the history

  17. Merge pull request AY1920S1-CS2103T-T17-2#218 from pohlinwei/calendar… 

    …-v1.4

Calendar v1.4
    pohlinwei authored Nov 11, 2019
    Configuration menu
    Copy the full SHA
    082356c View commit details
    Browse the repository at this point in the history

  18. Add help command in calendar

    pohlinwei committed Nov 11, 2019
    Configuration menu
    Copy the full SHA
    5d0577a View commit details
    Browse the repository at this point in the history

  19. Update UserGuide.adoc

    pohlinwei authored Nov 11, 2019
    Configuration menu
    Copy the full SHA
    7c75a78 View commit details
    Browse the repository at this point in the history

  20. Update UserGuide.adoc

    pohlinwei authored Nov 11, 2019
    Configuration menu
    Copy the full SHA
    073887e View commit details
    Browse the repository at this point in the history

  21. Merge pull request AY1920S1-CS2103T-T17-2#222 from pohlinwei/calendar… 

    …-v1.4

Add help command in calendar
    pohlinwei authored Nov 11, 2019
    Configuration menu
    Copy the full SHA
    04d714c View commit details
    Browse the repository at this point in the history

  22. Merge pull request #44 from AY1920S1-CS2103T-T17-2/master 

    Merge changes to guides
    @bjhoohaha
    bjhoohaha authored Nov 11, 2019
    Configuration menu
    Copy the full SHA
    34ba43e View commit details
    Browse the repository at this point in the history

  23. PPP

    @bjhoohaha
    bjhoohaha committed Nov 11, 2019
    Configuration menu
    Copy the full SHA
    c2bbb95 View commit details
    Browse the repository at this point in the history

  24. Update DG images and doc

    Tishya Khanna committed Nov 11, 2019
    Configuration menu
    Copy the full SHA
    52dfbb4 View commit details
    Browse the repository at this point in the history

  25. Update DeveloperGuide.adoc

    pohlinwei authored Nov 11, 2019
    Configuration menu
    Copy the full SHA
    6c5e98d View commit details
    Browse the repository at this point in the history

  26. Add diagrams for DG

    pohlinwei authored Nov 11, 2019
    Configuration menu
    Copy the full SHA
    d80f2a9 View commit details
    Browse the repository at this point in the history

  27. Update DeveloperGuide.adoc

    pohlinwei authored Nov 11, 2019
    Configuration menu
    Copy the full SHA
    cbe7b8f View commit details
    Browse the repository at this point in the history

  28. Delete CalendarActivityDiagram.png

    pohlinwei authored Nov 11, 2019
    Configuration menu
    Copy the full SHA
    2ad0e1c View commit details
    Browse the repository at this point in the history

  29. Delete CalendarClassDiagram.png

    pohlinwei authored Nov 11, 2019
    Configuration menu
    Copy the full SHA
    e8a3290 View commit details
    Browse the repository at this point in the history

  30. Delete CalendarSequenceDiagram.png

    pohlinwei authored Nov 11, 2019
    Configuration menu
    Copy the full SHA
    1b252e7 View commit details
    Browse the repository at this point in the history

  31. Add files via upload

    pohlinwei authored Nov 11, 2019
    Configuration menu
    Copy the full SHA
    f3f0acd View commit details
    Browse the repository at this point in the history

  32. Update UserGuide.adoc

    pohlinwei authored Nov 11, 2019
    Configuration menu
    Copy the full SHA
    7123248 View commit details
    Browse the repository at this point in the history

  33. Update pohlinwei.adoc

    pohlinwei authored Nov 11, 2019
    Configuration menu
    Copy the full SHA
    81b999a View commit details
    Browse the repository at this point in the history

  34. Update pohlinwei.adoc

    pohlinwei authored Nov 11, 2019
    Configuration menu
    Copy the full SHA
    b4d83f2 View commit details
    Browse the repository at this point in the history

  35. Update UML diagrams in Developer Guides

    @bjhoohaha
    bjhoohaha committed Nov 11, 2019
    Configuration menu
    Copy the full SHA
    b812176 View commit details
    Browse the repository at this point in the history

  36. Update pohlinwei.adoc

    pohlinwei authored Nov 11, 2019
    Configuration menu
    Copy the full SHA
    e23e673 View commit details
    Browse the repository at this point in the history

  37. Update BetterModelClassDiagram.puml

    @bjhoohaha
    bjhoohaha committed Nov 11, 2019
    Configuration menu
    Copy the full SHA
    49ef4a5 View commit details
    Browse the repository at this point in the history

  38. Merge pull request AY1920S1-CS2103T-T17-2#223 from bjhoohaha/master 

    Update UML diagrams
    @bjhoohaha
    bjhoohaha authored Nov 11, 2019
    Configuration menu
    Copy the full SHA
    05ad1fe View commit details
    Browse the repository at this point in the history

  39. Update pohlinwei.adoc

    pohlinwei authored Nov 11, 2019
    Configuration menu
    Copy the full SHA
    67285db View commit details
    Browse the repository at this point in the history

  40. Update pohlinwei.adoc

    pohlinwei authored Nov 11, 2019
    Configuration menu
    Copy the full SHA
    a7e7a6d View commit details
    Browse the repository at this point in the history

  41. Update pohlinwei.adoc

    pohlinwei authored Nov 11, 2019
    Configuration menu
    Copy the full SHA
    635c076 View commit details
    Browse the repository at this point in the history

  42. Update pohlinwei.adoc

    pohlinwei authored Nov 11, 2019
    Configuration menu
    Copy the full SHA
    8337356 View commit details
    Browse the repository at this point in the history

  43. Update pohlinwei.adoc

    pohlinwei authored Nov 11, 2019
    Configuration menu
    Copy the full SHA
    fc04e37 View commit details
    Browse the repository at this point in the history

  44. Update DG

    Tishya Khanna committed Nov 11, 2019
    Configuration menu
    Copy the full SHA
    2c3ea19 View commit details
    Browse the repository at this point in the history

  45. Merge branch 'master' of https://github.com/AY1920S1-CS2103T-T17-2/main 

    * 'master' of https://github.com/AY1920S1-CS2103T-T17-2/main:
  Update BetterModelClassDiagram.puml
  Update UML diagrams in Developer Guides
  Update UserGuide.adoc
  PPP
  Update UserGuide.adoc
  Update UserGuide.adoc
  Add help command in calendar
  refine test cases
  bug fixes and feature finalise
  Refactor calendar
  Change error messages and UG
  Update UserGuide.adoc
  Fix bugs
  Update UserGuide.adoc
    Tishya Khanna committed Nov 11, 2019
    Configuration menu
    Copy the full SHA
    8b93cb6 View commit details
    Browse the repository at this point in the history

  46. Merge pull request AY1920S1-CS2103T-T17-2#224 from tishyakhanna97/master 

    Update tests and DG
    @tishyakhanna97
    tishyakhanna97 authored Nov 11, 2019
    Configuration menu
    Copy the full SHA
    6a07152 View commit details
    Browse the repository at this point in the history

  47. Update pohlinwei.adoc

    pohlinwei authored Nov 11, 2019
    Configuration menu
    Copy the full SHA
    9a327c2 View commit details
    Browse the repository at this point in the history

  48. Update UML Diagram images

    @bjhoohaha
    bjhoohaha committed Nov 11, 2019
    Configuration menu
    Copy the full SHA
    c1637f3 View commit details
    Browse the repository at this point in the history

  49. Update UG

    Tishya Khanna committed Nov 11, 2019
    Configuration menu
    Copy the full SHA
    bbbb370 View commit details
    Browse the repository at this point in the history

  50. Merge branch 'master' of https://github.com/AY1920S1-CS2103T-T17-2/main 

    * 'master' of https://github.com/AY1920S1-CS2103T-T17-2/main:
    Tishya Khanna committed Nov 11, 2019
    Configuration menu
    Copy the full SHA
    bc11623 View commit details
    Browse the repository at this point in the history

  51. Update DeveloperGuide.adoc

    pohlinwei authored Nov 11, 2019
    Configuration menu
    Copy the full SHA
    3d25bee View commit details
    Browse the repository at this point in the history

  52. Update DeveloperGuide.adoc

    pohlinwei authored Nov 11, 2019
    Configuration menu
    Copy the full SHA
    b99082b View commit details
    Browse the repository at this point in the history

  53. Update DeveloperGuide.adoc

    pohlinwei authored Nov 11, 2019
    Configuration menu
    Copy the full SHA
    319a675 View commit details
    Browse the repository at this point in the history

  54. Update DeveloperGuide.adoc

    pohlinwei authored Nov 11, 2019
    Configuration menu
    Copy the full SHA
    b7aa48c View commit details
    Browse the repository at this point in the history

  55. Update UML Diagrams in Developer Guides

    @bjhoohaha
    bjhoohaha committed Nov 11, 2019
    Configuration menu
    Copy the full SHA
    01b21a5 View commit details
    Browse the repository at this point in the history

  56. Update DeveloperGuide.adoc

    pohlinwei authored Nov 11, 2019
    Configuration menu
    Copy the full SHA
    496be25 View commit details
    Browse the repository at this point in the history

  57. Update DeveloperGuide.adoc

    pohlinwei authored Nov 11, 2019
    Configuration menu
    Copy the full SHA
    10fe303 View commit details
    Browse the repository at this point in the history

  58. Update DeveloperGuide.adoc

    pohlinwei authored Nov 11, 2019
    Configuration menu
    Copy the full SHA
    3138830 View commit details
    Browse the repository at this point in the history

  59. Merge pull request #45 from AY1920S1-CS2103T-T17-2/master 

    Merge UML diagrams update
    @bjhoohaha
    bjhoohaha authored Nov 11, 2019
    Configuration menu
    Copy the full SHA
    bebe7a5 View commit details
    Browse the repository at this point in the history

  60. Update DeveloperGuide.adoc

    pohlinwei authored Nov 11, 2019
    Configuration menu
    Copy the full SHA
    1660b61 View commit details
    Browse the repository at this point in the history

  61. Redo bug fix

    pohlinwei committed Nov 11, 2019
    Configuration menu
    Copy the full SHA
    28a70a7 View commit details
    Browse the repository at this point in the history

  62. Redo bug fix

    pohlinwei committed Nov 11, 2019
    Configuration menu
    Copy the full SHA
    78a6da3 View commit details
    Browse the repository at this point in the history

  63. Update UserGuide.adoc

    pohlinwei authored Nov 11, 2019
    Configuration menu
    Copy the full SHA
    3d8ae69 View commit details
    Browse the repository at this point in the history

  64. Update UserGuide.adoc

    pohlinwei authored Nov 11, 2019
    Configuration menu
    Copy the full SHA
    c6fcf2c View commit details
    Browse the repository at this point in the history

  65. Update UG

    Tishya Khanna committed Nov 11, 2019
    Configuration menu
    Copy the full SHA
    00ebf7d View commit details
    Browse the repository at this point in the history

  66. Redo bug fixes

    pohlinwei committed Nov 11, 2019
    Configuration menu
    Copy the full SHA
    8dec5f7 View commit details
    Browse the repository at this point in the history

  67. Merge branch 'calendar-v1.4' of https://github.com/pohlinwei/main int… 

    …o calendar-v1.4
    pohlinwei committed Nov 11, 2019
    Configuration menu
    Copy the full SHA
    fc073a2 View commit details
    Browse the repository at this point in the history

  68. Merge https://github.com/AY1920S1-CS2103T-T17-2/main 

    # Conflicts:
#	docs/UserGuide.adoc
    @ngzhaoming
    ngzhaoming committed Nov 11, 2019
    Configuration menu
    Copy the full SHA
    575b532 View commit details
    Browse the repository at this point in the history

  69. Merge https://github.com/AY1920S1-CS2103T-T17-2/main

    @ngzhaoming
    ngzhaoming committed Nov 11, 2019
    Configuration menu
    Copy the full SHA
    1bb96c2 View commit details
    Browse the repository at this point in the history

  70. Merge pull request AY1920S1-CS2103T-T17-2#227 from ngzhaoming/master 

    Update DG and update PPP
    @ngzhaoming
    ngzhaoming authored Nov 11, 2019
    Configuration menu
    Copy the full SHA
    ac6bf10 View commit details
    Browse the repository at this point in the history

  71. Merge branch 'master' of https://github.com/AY1920S1-CS2103T-T17-2/main 

    * 'master' of https://github.com/AY1920S1-CS2103T-T17-2/main:
  Merge https://github.com/AY1920S1-CS2103T-T17-2/main
    Tishya Khanna committed Nov 11, 2019
    Configuration menu
    Copy the full SHA
    9b6324d View commit details
    Browse the repository at this point in the history

  72. Update pohlinwei.adoc

    pohlinwei authored Nov 11, 2019
    Configuration menu
    Copy the full SHA
    50ab186 View commit details
    Browse the repository at this point in the history

  73. Update UML class diagrams and images

    @bjhoohaha
    bjhoohaha committed Nov 11, 2019
    Configuration menu
    Copy the full SHA
    22d4e5b View commit details
    Browse the repository at this point in the history

  74. Update pohlinwei.adoc

    pohlinwei authored Nov 11, 2019
    Configuration menu
    Copy the full SHA
    3994ab6 View commit details
    Browse the repository at this point in the history

  75. Merge pull request AY1920S1-CS2103T-T17-2#225 from bjhoohaha/master 

    Update UML Diagrams in Developer Guide
    @bjhoohaha
    bjhoohaha authored Nov 11, 2019
    Configuration menu
    Copy the full SHA
    d912095 View commit details
    Browse the repository at this point in the history

  76. UG refractor

    @honhaochen
    honhaochen committed Nov 11, 2019
    Configuration menu
    Copy the full SHA
    5dd7b8b View commit details
    Browse the repository at this point in the history

  77. Update DeveloperGuide.adoc

    pohlinwei authored Nov 11, 2019
    Configuration menu
    Copy the full SHA
    7c4432d View commit details
    Browse the repository at this point in the history

  78. Update UserGuide.adoc

    pohlinwei authored Nov 11, 2019
    Configuration menu
    Copy the full SHA
    3765c3b View commit details
    Browse the repository at this point in the history

  79. Merge pull request AY1920S1-CS2103T-T17-2#226 from pohlinwei/calendar… 

    …-v1.4

Calendar v1.4
    pohlinwei authored Nov 11, 2019
    Configuration menu
    Copy the full SHA
    646d2af View commit details
    Browse the repository at this point in the history

  80. v1.4 finalise

    @honhaochen
    honhaochen committed Nov 11, 2019
    Configuration menu
    Copy the full SHA
    27604ea View commit details
    Browse the repository at this point in the history

  81. Merge branch 'master' into branch-v1.4

    @honhaochen
    honhaochen authored Nov 11, 2019
    Configuration menu
    Copy the full SHA
    5ef65e4 View commit details
    Browse the repository at this point in the history

  82. Merge pull request AY1920S1-CS2103T-T17-2#229 from honhaochen/branch-… 

    …v1.4

v1.4 finalise
    @honhaochen
    honhaochen authored Nov 11, 2019
    Configuration menu
    Copy the full SHA
    9b7f1ad View commit details
    Browse the repository at this point in the history

  83. Fix most main checkstyle issues

    Tishya Khanna committed Nov 11, 2019
    Configuration menu
    Copy the full SHA
    dae3ba9 View commit details
    Browse the repository at this point in the history

  84. Update UI

    Tishya Khanna committed Nov 11, 2019
    Configuration menu
    Copy the full SHA
    244712b View commit details
    Browse the repository at this point in the history

  85. Fix bugs

    Tishya Khanna committed Nov 11, 2019
    Configuration menu
    Copy the full SHA
    0462893 View commit details
    Browse the repository at this point in the history

  86. Merge https://github.com/AY1920S1-CS2103T-T17-2/main 

    # Conflicts:
#	docs/UserGuide.adoc
    @ngzhaoming
    ngzhaoming committed Nov 11, 2019
    Configuration menu
    Copy the full SHA
    24cab34 View commit details
    Browse the repository at this point in the history

  87. Merge https://github.com/AY1920S1-CS2103T-T17-2/main

    @ngzhaoming
    ngzhaoming committed Nov 11, 2019
    Configuration menu
    Copy the full SHA
    293b6aa View commit details
    Browse the repository at this point in the history

  88. Merge branch 'master' of https://github.com/AY1920S1-CS2103T-T17-2/main 

    * 'master' of https://github.com/AY1920S1-CS2103T-T17-2/main: (38 commits)
  v1.4 finalise
  Update UserGuide.adoc
  Update DeveloperGuide.adoc
  UG refractor
  Update pohlinwei.adoc
  Update UML class diagrams and images
  Update pohlinwei.adoc
  Redo bug fixes
  Update UserGuide.adoc
  Update UserGuide.adoc
  Redo bug fix
  Redo bug fix
  Update DeveloperGuide.adoc
  Update DeveloperGuide.adoc
  Update DeveloperGuide.adoc
  Update DeveloperGuide.adoc
  Update UML Diagrams in Developer Guides
  Update DeveloperGuide.adoc
  Update DeveloperGuide.adoc
  Update DeveloperGuide.adoc
  ...

# Conflicts:
#	docs/UserGuide.adoc
    Tishya Khanna committed Nov 11, 2019
    Configuration menu
    Copy the full SHA
    29fcfe9 View commit details
    Browse the repository at this point in the history

  89. DG refractor

    @honhaochen
    honhaochen committed Nov 11, 2019
    Configuration menu
    Copy the full SHA
    bec59c8 View commit details
    Browse the repository at this point in the history

  90. UG refractor

    @honhaochen
    honhaochen committed Nov 11, 2019
    Configuration menu
    Copy the full SHA
    4ebc1db View commit details
    Browse the repository at this point in the history

  91. fix merge conflicts

    Tishya Khanna committed Nov 11, 2019
    Configuration menu
    Copy the full SHA
    63dde96 View commit details
    Browse the repository at this point in the history

  92. v1.4 implementation

    @ngzhaoming
    ngzhaoming committed Nov 11, 2019
    Configuration menu
    Copy the full SHA
    db04228 View commit details
    Browse the repository at this point in the history

  93. Update UG

    Tishya Khanna committed Nov 11, 2019
    Configuration menu
    Copy the full SHA
    8dc7791 View commit details
    Browse the repository at this point in the history

  94. Merge pull request AY1920S1-CS2103T-T17-2#231 from ngzhaoming/master 

    v1.4 implementation
    @ngzhaoming
    ngzhaoming authored Nov 11, 2019
    Configuration menu
    Copy the full SHA
    21ea82e View commit details
    Browse the repository at this point in the history

  95. Merge pull request AY1920S1-CS2103T-T17-2#232 from tishyakhanna97/master 

    Clear checkstyle and update UG
    @tishyakhanna97
    tishyakhanna97 authored Nov 11, 2019
    Configuration menu
    Copy the full SHA
    3035791 View commit details
    Browse the repository at this point in the history

  96. try to fix UG and DG

    @honhaochen
    honhaochen committed Nov 11, 2019
    Configuration menu
    Copy the full SHA
    5e5b432 View commit details
    Browse the repository at this point in the history

  97. Update DG

    Tishya Khanna committed Nov 11, 2019
    Configuration menu
    Copy the full SHA
    768818d View commit details
    Browse the repository at this point in the history

  98. finalise

    @honhaochen
    honhaochen committed Nov 11, 2019
    Configuration menu
    Copy the full SHA
    0fcb6b9 View commit details
    Browse the repository at this point in the history

  99. Update UML diagrams

    @bjhoohaha
    bjhoohaha committed Nov 11, 2019
    Configuration menu
    Copy the full SHA
    f7a5ab7 View commit details
    Browse the repository at this point in the history

  100. Merge pull request AY1920S1-CS2103T-T17-2#233 from bjhoohaha/master 

    Update UML diagrams
    @bjhoohaha
    bjhoohaha authored Nov 11, 2019
    Configuration menu
    Copy the full SHA
    1f5e36f View commit details
    Browse the repository at this point in the history

  101. Merge branch 'master' into branch-v1.4

    @honhaochen
    honhaochen authored Nov 11, 2019
    Configuration menu
    Copy the full SHA
    1f73d72 View commit details
    Browse the repository at this point in the history

  102. Update DeveloperGuide.adoc

    @honhaochen
    honhaochen authored Nov 11, 2019
    Configuration menu
    Copy the full SHA
    7a4ba86 View commit details
    Browse the repository at this point in the history

  103. Update UserGuide.adoc

    @honhaochen
    honhaochen authored Nov 11, 2019
    Configuration menu
    Copy the full SHA
    2473965 View commit details
    Browse the repository at this point in the history

  104. Merge pull request AY1920S1-CS2103T-T17-2#230 from honhaochen/branch-… 

    …v1.4

UG DG refractor
    @honhaochen
    honhaochen authored Nov 11, 2019
    Configuration menu
    Copy the full SHA
    ac6bc7c View commit details
    Browse the repository at this point in the history

  105. Fix errors

    @tishyakhanna97
    tishyakhanna97 authored Nov 11, 2019
    Configuration menu
    Copy the full SHA
    7f573cf View commit details
    Browse the repository at this point in the history

  106. Update DeveloperGuide.adoc

    @tishyakhanna97
    tishyakhanna97 authored Nov 11, 2019
    Configuration menu
    Copy the full SHA
    f6d7c93 View commit details
    Browse the repository at this point in the history

  107. Update UserGuide.adoc

    @tishyakhanna97
    tishyakhanna97 authored Nov 11, 2019
    Configuration menu
    Copy the full SHA
    fc69317 View commit details
    Browse the repository at this point in the history

  108. PPP update

    Tishya Khanna committed Nov 11, 2019
    Configuration menu
    Copy the full SHA
    5c40a90 View commit details
    Browse the repository at this point in the history

  109. Merge branch 'master' of https://github.com/AY1920S1-CS2103T-T17-2/main 

    * 'master' of https://github.com/AY1920S1-CS2103T-T17-2/main:
  Update UserGuide.adoc
  Update DeveloperGuide.adoc
  Fix errors
  Update UserGuide.adoc
  Update DeveloperGuide.adoc
  Update UML diagrams
  finalise
  try to fix UG and DG
  v1.4 implementation
  UG refractor
  DG refractor
  Merge https://github.com/AY1920S1-CS2103T-T17-2/main
    Tishya Khanna committed Nov 11, 2019
    Configuration menu
    Copy the full SHA
    550a920 View commit details
    Browse the repository at this point in the history

  110. final tweak

    @honhaochen
    honhaochen committed Nov 11, 2019
    Configuration menu
    Copy the full SHA
    1c524da View commit details
    Browse the repository at this point in the history

  111. v1.4 implementation

    @ngzhaoming
    ngzhaoming committed Nov 11, 2019
    Configuration menu
    Copy the full SHA
    ac32faa View commit details
    Browse the repository at this point in the history

  112. Merge https://github.com/AY1920S1-CS2103T-T17-2/main

    @ngzhaoming
    ngzhaoming committed Nov 11, 2019
    Configuration menu
    Copy the full SHA
    2455ada View commit details
    Browse the repository at this point in the history

  113. Fix checkstyle

    pohlinwei committed Nov 11, 2019
    Configuration menu
    Copy the full SHA
    61b6323 View commit details
    Browse the repository at this point in the history

  114. final

    @honhaochen
    honhaochen committed Nov 11, 2019
    Configuration menu
    Copy the full SHA
    38aff7a View commit details
    Browse the repository at this point in the history

  115. Merge branch 'master' into calendar-v1.4

    pohlinwei authored Nov 11, 2019
    Configuration menu
    Copy the full SHA
    b479b6c View commit details
    Browse the repository at this point in the history

  116. Merge pull request AY1920S1-CS2103T-T17-2#236 from pohlinwei/calendar… 

    …-v1.4

Fix checkstyle
    pohlinwei authored Nov 11, 2019
    Configuration menu
    Copy the full SHA
    f0fb422 View commit details
    Browse the repository at this point in the history

  117. Merge https://github.com/AY1920S1-CS2103T-T17-2/main into branch-v1.4

    @honhaochen
    honhaochen committed Nov 11, 2019
    Configuration menu
    Copy the full SHA
    7569ca9 View commit details
    Browse the repository at this point in the history

  118. UG finalise

    Tishya Khanna committed Nov 11, 2019
    Configuration menu
    Copy the full SHA
    6818105 View commit details
    Browse the repository at this point in the history

  119. refractor for linwei

    @honhaochen
    honhaochen committed Nov 11, 2019
    Configuration menu
    Copy the full SHA
    007860f View commit details
    Browse the repository at this point in the history

  120. checkstyle test

    @honhaochen
    honhaochen committed Nov 11, 2019
    Configuration menu
    Copy the full SHA
    0cc054f View commit details
    Browse the repository at this point in the history

  121. Merge pull request AY1920S1-CS2103T-T17-2#235 from honhaochen/branch-… 

    …v1.4

final tweak
    @honhaochen
    honhaochen authored Nov 11, 2019
    Configuration menu
    Copy the full SHA
    30b9727 View commit details
    Browse the repository at this point in the history

  122. Fix checkstyle

    pohlinwei committed Nov 11, 2019
    Configuration menu
    Copy the full SHA
    dc3afa2 View commit details
    Browse the repository at this point in the history

  123. Merge branch 'calendar-v1.4' of https://github.com/pohlinwei/main int… 

    …o calendar-v1.4
    pohlinwei committed Nov 11, 2019
    Configuration menu
    Copy the full SHA
    691ed6c View commit details
    Browse the repository at this point in the history

  124. Update Developer Guide

    @ngzhaoming
    ngzhaoming committed Nov 11, 2019
    Configuration menu
    Copy the full SHA
    9b67c97 View commit details
    Browse the repository at this point in the history

  125. Merge branch 'master' into calendar-v1.4

    pohlinwei authored Nov 11, 2019
    Configuration menu
    Copy the full SHA
    95983b9 View commit details
    Browse the repository at this point in the history

  126. Merge pull request #48 from AY1920S1-CS2103T-T17-2/master 

    Merge developer changes
    @bjhoohaha
    bjhoohaha authored Nov 11, 2019
    Configuration menu
    Copy the full SHA
    6b9d1ef View commit details
    Browse the repository at this point in the history

  127. Merge branch 'master' of https://github.com/AY1920S1-CS2103T-T17-2/main 

    * 'master' of https://github.com/AY1920S1-CS2103T-T17-2/main:
  checkstyle test
  refractor for linwei
  final
  Fix checkstyle
  final tweak
    Tishya Khanna committed Nov 11, 2019
    Configuration menu
    Copy the full SHA
    e973e74 View commit details
    Browse the repository at this point in the history

  128. Merge pull request AY1920S1-CS2103T-T17-2#239 from pohlinwei/calendar… 

    …-v1.4

Calendar v1.4
    pohlinwei authored Nov 11, 2019
    Configuration menu
    Copy the full SHA
    78dda70 View commit details
    Browse the repository at this point in the history

  129. Fix checkstyle

    pohlinwei committed Nov 11, 2019
    Configuration menu
    Copy the full SHA
    54c037b View commit details
    Browse the repository at this point in the history

  130. Merge https://github.com/AY1920S1-CS2103T-T17-2/main 

    # Conflicts:
#	docs/DeveloperGuide.adoc
    @ngzhaoming
    ngzhaoming committed Nov 11, 2019
    Configuration menu
    Copy the full SHA
    ee87b0a View commit details
    Browse the repository at this point in the history

  131. Merge https://github.com/AY1920S1-CS2103T-T17-2/main

    @ngzhaoming
    ngzhaoming committed Nov 11, 2019
    Configuration menu
    Copy the full SHA
    19bc936 View commit details
    Browse the repository at this point in the history

  132. Resolve conflicts

    pohlinwei committed Nov 11, 2019
    Configuration menu
    Copy the full SHA
    1b18889 View commit details
    Browse the repository at this point in the history

  133. Merge https://github.com/AY1920S1-CS2103T-T17-2/main into calendar-v1.4

    pohlinwei committed Nov 11, 2019
    Configuration menu
    Copy the full SHA
    7831fd1 View commit details
    Browse the repository at this point in the history

  134. Merge pull request AY1920S1-CS2103T-T17-2#241 from ngzhaoming/master 

    Refine DG
    @ngzhaoming
    ngzhaoming authored Nov 11, 2019
    Configuration menu
    Copy the full SHA
    1329857 View commit details
    Browse the repository at this point in the history

  135. Merge pull request AY1920S1-CS2103T-T17-2#240 from tishyakhanna97/master 

    UpdateUG
    @tishyakhanna97
    tishyakhanna97 authored Nov 11, 2019
    Configuration menu
    Copy the full SHA
    5ba112d View commit details
    Browse the repository at this point in the history

  136. Update PPP

    Tishya Khanna committed Nov 11, 2019
    Configuration menu
    Copy the full SHA
    a09058b View commit details
    Browse the repository at this point in the history

  137. Fix checkstyle

    pohlinwei committed Nov 11, 2019
    Configuration menu
    Copy the full SHA
    05d77a0 View commit details
    Browse the repository at this point in the history

  138. Merge pull request AY1920S1-CS2103T-T17-2#242 from pohlinwei/calendar… 

    …-v1.4

Calendar v1.4
    pohlinwei authored Nov 11, 2019
    Configuration menu
    Copy the full SHA
    d7a36f8 View commit details
    Browse the repository at this point in the history

  139. Update PPP

    Tishya Khanna committed Nov 11, 2019
    Configuration menu
    Copy the full SHA
    64065d0 View commit details
    Browse the repository at this point in the history

  140. Fix checkstyle

    pohlinwei committed Nov 11, 2019
    Configuration menu
    Copy the full SHA
    d18417a View commit details
    Browse the repository at this point in the history

  141. Merge pull request AY1920S1-CS2103T-T17-2#243 from pohlinwei/calendar… 

    …-v1.4

Fix checkstyle
    pohlinwei authored Nov 11, 2019
    Configuration menu
    Copy the full SHA
    f88724d View commit details
    Browse the repository at this point in the history

  142. no message

    Tishya Khanna committed Nov 11, 2019
    Configuration menu
    Copy the full SHA
    8da7567 View commit details
    Browse the repository at this point in the history

  143. Merge pull request AY1920S1-CS2103T-T17-2#244 from tishyakhanna97/master 

    2f21
    @tishyakhanna97
    tishyakhanna97 authored Nov 11, 2019
    Configuration menu
    Copy the full SHA
    323dc74 View commit details
    Browse the repository at this point in the history

  144. Fix website

    @bjhoohaha
    bjhoohaha committed Nov 11, 2019
    Configuration menu
    Copy the full SHA
    a2135de View commit details
    Browse the repository at this point in the history

  145. Fix developer guides and user guides

    @bjhoohaha
    bjhoohaha committed Nov 11, 2019
    Configuration menu
    Copy the full SHA
    44599dc View commit details
    Browse the repository at this point in the history

  146. Merge branch 'master' into master

    @bjhoohaha
    bjhoohaha authored Nov 11, 2019
    Configuration menu
    Copy the full SHA
    dafd82f View commit details
    Browse the repository at this point in the history

Commits on Nov 15, 2019

  1. Update bjhoohaha.adoc

    @bjhoohaha
    bjhoohaha committed Nov 15, 2019
    Configuration menu
    Copy the full SHA
    c13c012 View commit details
    Browse the repository at this point in the history