[CS2103T-T17-2] Traveez#70

Open

bjhoohaha wants to merge 914 commits intonus-cs2103-AY1920S1:masterfrom AY1920S1-CS2103T-T17-2:master

+43,600-4,236

This pull request is big! We're only showing the most recent 250 commits

Commits on Nov 10, 2019

Commits on Nov 11, 2019

update UG FaQ
honhaochen
committed
documents update
honhaochen
committed
Change error messages and UG
ngzhaoming
committed
Refactor calendar
pohlinwei
committed
Merge branch 'calendar-v1.4' of https://github.com/pohlinwei/main into calendar-v1.4
pohlinwei
committed
Merge pull request #217 from honhaochen/branch-v1.4
honhaochen
authored
Add Tests
Tishya Khanna
committed
Merge branch 'master' of https://github.com/AY1920S1-CS2103T-T17-2/main
Tishya Khanna
committed
Create Command Tests
Tishya Khanna
committed
bug fixes and feature finalise
honhaochen
committed
Update puml diagrams for Diary
Tishya Khanna
committed
refine test cases
honhaochen
committed
Merge https://github.com/AY1920S1-CS2103T-T17-2/main
ngzhaoming
committed
Merge pull request #220 from honhaochen/branch-v1.4
ngzhaoming
authored
Merge pull request #221 from ngzhaoming/master
ngzhaoming
authored
Resolve conflicts in UG
pohlinwei
committed
Merge pull request #218 from pohlinwei/calendar-v1.4
pohlinwei
authored
Add help command in calendar
pohlinwei
committed
Update UserGuide.adoc
pohlinwei
authored
Update UserGuide.adoc
pohlinwei
authored
Merge pull request #222 from pohlinwei/calendar-v1.4
pohlinwei
authored
Merge pull request #44 from AY1920S1-CS2103T-T17-2/master
bjhoohaha
authored
PPP
bjhoohaha
committed
Update DG images and doc
Tishya Khanna
committed
Update DeveloperGuide.adoc
pohlinwei
authored
Add diagrams for DG
pohlinwei
authored
Update DeveloperGuide.adoc
pohlinwei
authored
Delete CalendarActivityDiagram.png
pohlinwei
authored
Delete CalendarClassDiagram.png
pohlinwei
authored
Delete CalendarSequenceDiagram.png
pohlinwei
authored
Add files via upload
pohlinwei
authored
Update UserGuide.adoc
pohlinwei
authored
Update pohlinwei.adoc
pohlinwei
authored
Update pohlinwei.adoc
pohlinwei
authored
Update UML diagrams in Developer Guides
bjhoohaha
committed
Update pohlinwei.adoc
pohlinwei
authored
Update BetterModelClassDiagram.puml
bjhoohaha
committed
Merge pull request #223 from bjhoohaha/master
bjhoohaha
authored
Update pohlinwei.adoc
pohlinwei
authored
Update pohlinwei.adoc
pohlinwei
authored
Update pohlinwei.adoc
pohlinwei
authored
Update pohlinwei.adoc
pohlinwei
authored
Update pohlinwei.adoc
pohlinwei
authored
Update DG
Tishya Khanna
committed
Merge branch 'master' of https://github.com/AY1920S1-CS2103T-T17-2/main
Tishya Khanna
committed
Merge pull request #224 from tishyakhanna97/master
tishyakhanna97
authored
Update pohlinwei.adoc
pohlinwei
authored
Update UML Diagram images
bjhoohaha
committed
Update UG
Tishya Khanna
committed
Merge branch 'master' of https://github.com/AY1920S1-CS2103T-T17-2/main
Tishya Khanna
committed
Update DeveloperGuide.adoc
pohlinwei
authored
Update DeveloperGuide.adoc
pohlinwei
authored
Update DeveloperGuide.adoc
pohlinwei
authored
Update DeveloperGuide.adoc
pohlinwei
authored
Update UML Diagrams in Developer Guides
bjhoohaha
committed
Update DeveloperGuide.adoc
pohlinwei
authored
Update DeveloperGuide.adoc
pohlinwei
authored
Update DeveloperGuide.adoc
pohlinwei
authored
Merge pull request #45 from AY1920S1-CS2103T-T17-2/master
bjhoohaha
authored
Update DeveloperGuide.adoc
pohlinwei
authored
Redo bug fix
pohlinwei
committed
Redo bug fix
pohlinwei
committed
Update UserGuide.adoc
pohlinwei
authored
Update UserGuide.adoc
pohlinwei
authored
Update UG
Tishya Khanna
committed
Redo bug fixes
pohlinwei
committed
Merge branch 'calendar-v1.4' of https://github.com/pohlinwei/main into calendar-v1.4
pohlinwei
committed
Merge https://github.com/AY1920S1-CS2103T-T17-2/main
ngzhaoming
committed
Merge https://github.com/AY1920S1-CS2103T-T17-2/main
ngzhaoming
committed
Merge pull request #227 from ngzhaoming/master
ngzhaoming
authored
Merge branch 'master' of https://github.com/AY1920S1-CS2103T-T17-2/main
Tishya Khanna
committed
Update pohlinwei.adoc
pohlinwei
authored
Update UML class diagrams and images
bjhoohaha
committed
Update pohlinwei.adoc
pohlinwei
authored
Merge pull request #225 from bjhoohaha/master
bjhoohaha
authored
UG refractor
honhaochen
committed
Update DeveloperGuide.adoc
pohlinwei
authored
Update UserGuide.adoc
pohlinwei
authored
Merge pull request #226 from pohlinwei/calendar-v1.4
pohlinwei
authored
v1.4 finalise
honhaochen
committed
Merge branch 'master' into branch-v1.4
honhaochen
authored
Merge pull request #229 from honhaochen/branch-v1.4
honhaochen
authored
Fix most main checkstyle issues
Tishya Khanna
committed
Update UI
Tishya Khanna
committed
Fix bugs
Tishya Khanna
committed
Merge https://github.com/AY1920S1-CS2103T-T17-2/main
ngzhaoming
committed
Merge https://github.com/AY1920S1-CS2103T-T17-2/main
ngzhaoming
committed
Merge branch 'master' of https://github.com/AY1920S1-CS2103T-T17-2/main
Tishya Khanna
committed
DG refractor
honhaochen
committed
UG refractor
honhaochen
committed
fix merge conflicts
Tishya Khanna
committed
v1.4 implementation
ngzhaoming
committed
Update UG
Tishya Khanna
committed
Merge pull request #231 from ngzhaoming/master
ngzhaoming
authored
Merge pull request #232 from tishyakhanna97/master
tishyakhanna97
authored
try to fix UG and DG
honhaochen
committed
Update DG
Tishya Khanna
committed
finalise
honhaochen
committed
Update UML diagrams
bjhoohaha
committed
Merge pull request #233 from bjhoohaha/master
bjhoohaha
authored
Merge branch 'master' into branch-v1.4
honhaochen
authored
Update DeveloperGuide.adoc
honhaochen
authored
Update UserGuide.adoc
honhaochen
authored
Merge pull request #230 from honhaochen/branch-v1.4
honhaochen
authored
Fix errors
tishyakhanna97
authored
Update DeveloperGuide.adoc
tishyakhanna97
authored
Update UserGuide.adoc
tishyakhanna97
authored
PPP update
Tishya Khanna
committed
Merge branch 'master' of https://github.com/AY1920S1-CS2103T-T17-2/main
Tishya Khanna
committed
final tweak
honhaochen
committed
v1.4 implementation
ngzhaoming
committed
Merge https://github.com/AY1920S1-CS2103T-T17-2/main
ngzhaoming
committed
Fix checkstyle
pohlinwei
committed
final
honhaochen
committed
Merge branch 'master' into calendar-v1.4
pohlinwei
authored
Merge pull request #236 from pohlinwei/calendar-v1.4
pohlinwei
authored
Merge https://github.com/AY1920S1-CS2103T-T17-2/main into branch-v1.4
honhaochen
committed
UG finalise
Tishya Khanna
committed
refractor for linwei
honhaochen
committed
checkstyle test
honhaochen
committed
Merge pull request #235 from honhaochen/branch-v1.4
honhaochen
authored
Fix checkstyle
pohlinwei
committed
Merge branch 'calendar-v1.4' of https://github.com/pohlinwei/main into calendar-v1.4
pohlinwei
committed
Update Developer Guide
ngzhaoming
committed
Merge branch 'master' into calendar-v1.4
pohlinwei
authored
Merge pull request #48 from AY1920S1-CS2103T-T17-2/master
bjhoohaha
authored
Merge branch 'master' of https://github.com/AY1920S1-CS2103T-T17-2/main
Tishya Khanna
committed
Merge pull request #239 from pohlinwei/calendar-v1.4
pohlinwei
authored
Fix checkstyle
pohlinwei
committed
Merge https://github.com/AY1920S1-CS2103T-T17-2/main
ngzhaoming
committed
Merge https://github.com/AY1920S1-CS2103T-T17-2/main
ngzhaoming
committed
Resolve conflicts
pohlinwei
committed
Merge https://github.com/AY1920S1-CS2103T-T17-2/main into calendar-v1.4
pohlinwei
committed
Merge pull request #241 from ngzhaoming/master
ngzhaoming
authored
Merge pull request #240 from tishyakhanna97/master
tishyakhanna97
authored
Update PPP
Tishya Khanna
committed
Fix checkstyle
pohlinwei
committed
Merge pull request #242 from pohlinwei/calendar-v1.4
pohlinwei
authored
Update PPP
Tishya Khanna
committed
Fix checkstyle
pohlinwei
committed
Merge pull request #243 from pohlinwei/calendar-v1.4
pohlinwei
authored
no message
Tishya Khanna
committed
Merge pull request #244 from tishyakhanna97/master
tishyakhanna97
authored
Fix website
bjhoohaha
committed
Fix developer guides and user guides
bjhoohaha
committed
Merge branch 'master' into master
bjhoohaha
authored
Merge pull request #245 from bjhoohaha/master
bjhoohaha
authored
PPP
Tishya Khanna
committed
Merge branch 'master' of https://github.com/AY1920S1-CS2103T-T17-2/main
Tishya Khanna
committed
Merge pull request #246 from tishyakhanna97/master
tishyakhanna97
authored
Update pohlinwei.adoc
pohlinwei
authored
Update pohlinwei.adoc
pohlinwei
authored
Merge branch 'master' into calendar-v1.4
pohlinwei
authored
Merge pull request #247 from pohlinwei/calendar-v1.4
pohlinwei
authored
Update UserGuide.adoc
pohlinwei
authored
Merge pull request #248 from pohlinwei/calendar-v1.4
pohlinwei
authored