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

V1.4 #421

Merged
merged 44 commits into from
Nov 11, 2019
Merged

V1.4 #421

Changes from all commits
Commits
Show all changes
44 commits
Select commit Hold shift + click to select a range
45d520b
Added skeleton classes for Parse
Deculsion Oct 10, 2019
907d911
Merge branch 'master' of https://github.com/AY1920S1-CS2113T-F09-3/main
Deculsion Oct 10, 2019
2b6e7a0
Merge branch 'master' of https://github.com/AY1920S1-CS2113T-F09-3/ma…
Deculsion Oct 12, 2019
8d3cda2
Added toString() and modified some javadocs for it.
Deculsion Oct 14, 2019
a96fe29
Merge branch 'master' of https://github.com/AY1920S1-CS2113T-F09-3/main
Deculsion Oct 15, 2019
e343c96
Merge branch 'master' of https://github.com/AY1920S1-CS2113T-F09-3/main
Deculsion Oct 16, 2019
79e4603
Merge branch 'master' of https://github.com/AY1920S1-CS2113T-F09-3/main
Deculsion Oct 17, 2019
d69b302
Merge branch 'master' of https://github.com/AY1920S1-CS2113T-F09-3/main
Deculsion Oct 17, 2019
5a7d1a4
Merge branch 'master' of https://github.com/AY1920S1-CS2113T-F09-3/main
Deculsion Oct 17, 2019
fd55fe5
Merge branch 'master' of https://github.com/AY1920S1-CS2113T-F09-3/main
Deculsion Oct 18, 2019
f5af5d3
Merge branch 'master' of https://github.com/AY1920S1-CS2113T-F09-3/main
Deculsion Oct 24, 2019
a4a3f6c
Merge branch 'master' of https://github.com/AY1920S1-CS2113T-F09-3/main
Deculsion Oct 25, 2019
7413e74
Merge branch 'master' of https://github.com/AY1920S1-CS2113T-F09-3/main
Deculsion Oct 29, 2019
c20a03f
Merge branch 'master' of https://github.com/AY1920S1-CS2113T-F09-3/main
Deculsion Oct 29, 2019
c3009c5
Merge branch 'master' of https://github.com/AY1920S1-CS2113T-F09-3/main
Deculsion Oct 30, 2019
88da583
Merge branch 'master' of https://github.com/AY1920S1-CS2113T-F09-3/main
Deculsion Oct 31, 2019
7f81e83
docs/User Guide.md created from https://stackedit.io/
Deculsion Oct 31, 2019
dd6c48d
Add UG markdown
Deculsion Oct 31, 2019
0c519e2
Merge branch 'master' of https://github.com/AY1920S1-CS2113T-F09-3/main
Deculsion Oct 31, 2019
bf78ffc
Merge branch 'master' of https://github.com/AY1920S1-CS2113T-F09-3/main
Deculsion Nov 1, 2019
acbf4f4
Merge remote-tracking branch 'self_origin/master'
Deculsion Nov 1, 2019
9b0f310
Merge branch 'master' of https://github.com/AY1920S1-CS2113T-F09-3/main
Deculsion Nov 5, 2019
276791c
Merge branch 'master' of https://github.com/AY1920S1-CS2113T-F09-3/main
Deculsion Nov 6, 2019
cea4768
Merge branch 'master' of https://github.com/AY1920S1-CS2113T-F09-3/main
Deculsion Nov 6, 2019
5581bdc
Merge branch 'master' of https://github.com/AY1920S1-CS2113T-F09-3/main
Deculsion Nov 7, 2019
937581f
Merge branch 'master' of https://github.com/AY1920S1-CS2113T-F09-3/main
Deculsion Nov 7, 2019
74e1c79
Merge branch 'master' of https://github.com/AY1920S1-CS2113T-F09-3/main
Deculsion Nov 7, 2019
9beb437
Merge branch 'master' of https://github.com/AY1920S1-CS2113T-F09-3/main
Deculsion Nov 8, 2019
ad1e59b
Merge branch 'master' of https://github.com/AY1920S1-CS2113T-F09-3/main
Deculsion Nov 8, 2019
e93d364
Merge branch 'master' of https://github.com/AY1920S1-CS2113T-F09-3/main
Deculsion Nov 9, 2019
250cbc1
Merge branch 'master' of https://github.com/AY1920S1-CS2113T-F09-3/main
Deculsion Nov 9, 2019
8f1d1fe
Merge branch 'master' of https://github.com/AY1920S1-CS2113T-F09-3/main
Deculsion Nov 10, 2019
3f54ad6
Merge branch 'master' of https://github.com/AY1920S1-CS2113T-F09-3/main
Deculsion Nov 10, 2019
abf5b2c
Merge branch 'master' of https://github.com/AY1920S1-CS2113T-F09-3/main
Deculsion Nov 10, 2019
3ddf721
Merge branch 'master' of https://github.com/AY1920S1-CS2113T-F09-3/main
Deculsion Nov 10, 2019
79f49fd
Merge branch 'master' of https://github.com/AY1920S1-CS2113T-F09-3/main
Deculsion Nov 11, 2019
08be031
Merge branch 'master' of https://github.com/AY1920S1-CS2113T-F09-3/main
Deculsion Nov 11, 2019
a0ab029
Merge branch 'master' of https://github.com/AY1920S1-CS2113T-F09-3/main
Deculsion Nov 11, 2019
0a457c2
Merge branch 'master' of https://github.com/AY1920S1-CS2113T-F09-3/main
Deculsion Nov 11, 2019
a1be604
Merge branch 'master' of https://github.com/AY1920S1-CS2113T-F09-3/main
Deculsion Nov 11, 2019
34791fd
Merge branch 'master' of https://github.com/AY1920S1-CS2113T-F09-3/main
Deculsion Nov 11, 2019
40cd162
Merge branch 'master' of https://github.com/AY1920S1-CS2113T-F09-3/main
Deculsion Nov 11, 2019
2e9a556
Merge branch 'master' of https://github.com/AY1920S1-CS2113T-F09-3/main
Deculsion Nov 11, 2019
d383ff5
Merge branch 'master' of https://github.com/AY1920S1-CS2113T-F09-3/main
Deculsion Nov 11, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view

These merge commits were added into this branch cleanly.

There are no new changes to show.