Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
869 commits
Select commit Hold shift + click to select a range
a79d482
EditCommand: Added time and date check when editing.
cheahzk Apr 5, 2019
6fb4693
Removed unuse codes.
cheahzk Apr 5, 2019
7c10829
Travis checkstyle fix
cheahzk Apr 5, 2019
fa2b7bf
Travis fix
cheahzk Apr 5, 2019
eae3e02
Merge branch 'master' into master
cheahzk Apr 5, 2019
48d960e
Update PreTask.java
cheahzk Apr 5, 2019
eaad756
UserGuide: Updated user guide for some mistakes in it.
cheahzk Apr 5, 2019
14a49ed
Updated DeveloperGuide.
cheahzk Apr 5, 2019
baf62e3
Merge branch 'master' of https://github.com/cheahzk/main
cheahzk Apr 5, 2019
39e546a
Travis fix.
cheahzk Apr 5, 2019
f36bf97
Merge branch 'master' into master
cheahzk Apr 5, 2019
ad814c6
Merge pull request #147 from cheahzk/master
cheahzk Apr 5, 2019
8fe242f
TaskBook: Fix bug for unable to delete some task after adding some task.
cheahzk Apr 5, 2019
cae8722
Merge branch 'master' of https://github.com/cheahzk/main
cheahzk Apr 5, 2019
ccf9a09
Merge pull request #148 from cheahzk/master
cheahzk Apr 5, 2019
51da4bc
Update PPP
jingchen-z Apr 5, 2019
8decd77
DeveloperGuide: Added implementation of Daily Time Planner
cheahzk Apr 5, 2019
0002775
Merge pull request #149 from cheahzk/master
cheahzk Apr 5, 2019
0db3f74
Update UG PPP
jingchen-z Apr 5, 2019
ffa39dd
Update UI picture
jingchen-z Apr 5, 2019
dff39e8
update UserGuide and PPP
Lizy0810 Apr 5, 2019
2513905
Merge branch 'master' of https://github.com/CS2113-AY1819S2-T09-2/main
Lizy0810 Apr 5, 2019
6dd61ec
update PPP
Lizy0810 Apr 5, 2019
b7b3958
update PPP
Lizy0810 Apr 5, 2019
d1b73ba
update PPP
Lizy0810 Apr 5, 2019
47d6911
Merge pull request #150 from Zeyang-Li/master
Apr 5, 2019
f3d0da0
Merge pull request #151 from jingchen-z/master
jingchen-z Apr 5, 2019
3d8faca
update PPP
Lizy0810 Apr 5, 2019
cd2d548
update DeveloperGuide and PPP
Lizy0810 Apr 5, 2019
e67c2c0
update UG and PPP
Lizy0810 Apr 5, 2019
184d0c8
update PPP
Apr 5, 2019
4c64878
Merge branch 'master' of https://github.com/CS2113-AY1819S2-T09-2/main
Lizy0810 Apr 5, 2019
35915ac
Merge branch 'master' of https://github.com/Zeyang-Li/main
Lizy0810 Apr 5, 2019
6945bc6
Merge pull request #152 from Zeyang-Li/master
Apr 5, 2019
630ad34
Remind list is separated completely from task list.
BrittonAlone Apr 5, 2019
36b3f30
Travis
BrittonAlone Apr 5, 2019
b7e9c9f
Merge pull request #153 from BrittonAlone/master
BrittonAlone Apr 5, 2019
5265452
List category command added; UG for remind and list updated.
BrittonAlone Apr 5, 2019
e5cf985
Travis
BrittonAlone Apr 5, 2019
84f31e1
Merge pull request #154 from BrittonAlone/master
BrittonAlone Apr 5, 2019
4375c54
update User Guide
Wanchunwei Apr 6, 2019
6807076
Merge pull request #155 from Wanchunwei/master
Wanchunwei Apr 6, 2019
8d1c8d9
Added check date
jingchen-z Apr 6, 2019
1df844e
merge
jingchen-z Apr 6, 2019
11f926e
Style fixing 1.0
jingchen-z Apr 6, 2019
cd2679b
Style fixing 1.1
jingchen-z Apr 6, 2019
16fc701
Style fixing 1.2
jingchen-z Apr 6, 2019
7e6e168
Style fixing 1.3
jingchen-z Apr 6, 2019
09ebe77
Update UG
jingchen-z Apr 6, 2019
fa7bb35
Update UG 1.2
jingchen-z Apr 6, 2019
a6af612
Update UG 1.3
jingchen-z Apr 6, 2019
e12c7db
Update PPP 1.3
jingchen-z Apr 6, 2019
aee14e3
Update PPP 1.4
jingchen-z Apr 6, 2019
454ba54
Update PPP
jingchen-z Apr 6, 2019
1dede42
Style fixing 10
jingchen-z Apr 6, 2019
be88c83
Merge pull request #156 from jingchen-z/master
jingchen-z Apr 6, 2019
eeb2e95
UserGuide: Updated with User Interface Layout explanation.
cheahzk Apr 6, 2019
e3e96a2
UserGudie: Corrected some mistakes.
cheahzk Apr 6, 2019
9ef0334
Merge pull request #157 from cheahzk/master
cheahzk Apr 6, 2019
1de741d
DeveloperGuide: Changed repo url to our group.
cheahzk Apr 6, 2019
9c3a5d7
PPP: Updated personal PPP.
cheahzk Apr 6, 2019
b1d9b50
Travis fix
cheahzk Apr 6, 2019
1e888a3
Travis fix 1.1
cheahzk Apr 6, 2019
b8dbb34
Merge pull request #158 from cheahzk/master
cheahzk Apr 6, 2019
5feca02
Add new feature : Login and Logout
Wanchunwei Apr 6, 2019
e0c4a15
Merge branch 'master' of https://github.com/CS2113-AY1819S2-T09-2/main
Wanchunwei Apr 6, 2019
93c235b
Update login feature
Wanchunwei Apr 6, 2019
63ad95f
Coding style
Wanchunwei Apr 6, 2019
a71b7ef
Coding style 2
Wanchunwei Apr 6, 2019
e031718
Coding style 3
Wanchunwei Apr 6, 2019
a28fd07
Coding style 4
Wanchunwei Apr 6, 2019
6fd1600
Coding style 5
Wanchunwei Apr 6, 2019
54a68df
Merge pull request #159 from Wanchunwei/master
Wanchunwei Apr 6, 2019
12ff543
Update Login feature
Wanchunwei Apr 7, 2019
369c293
Merge branch 'master' of https://github.com/CS2113-AY1819S2-T09-2/main
Wanchunwei Apr 7, 2019
c817563
Trailing white space
Wanchunwei Apr 7, 2019
0c7ee0a
coding style
Wanchunwei Apr 7, 2019
aaa4f6e
Coding style 2
Wanchunwei Apr 7, 2019
58c79a1
Coding style 3
Wanchunwei Apr 7, 2019
42dc883
Merge pull request #160 from Wanchunwei/master
Wanchunwei Apr 7, 2019
19ec136
Developer Guide for remind feature updated
BrittonAlone Apr 7, 2019
0dd3c75
Merge pull request #161 from BrittonAlone/master
BrittonAlone Apr 7, 2019
5716eb7
Remind feature fix small bugs.
BrittonAlone Apr 7, 2019
731a90d
Jin Shibo PPP updated
BrittonAlone Apr 7, 2019
0b5b333
Merge pull request #162 from BrittonAlone/master
BrittonAlone Apr 7, 2019
711158d
HelpWindow: Bug fix for not displaying correct help page. (due to Zey…
cheahzk Apr 7, 2019
2900e43
Merge pull request #163 from cheahzk/master
cheahzk Apr 8, 2019
19fa05b
Day: Fix bug for time calculation.
cheahzk Apr 8, 2019
320faed
Travis fix.
cheahzk Apr 8, 2019
6e395cf
Merge pull request #164 from cheahzk/master
cheahzk Apr 8, 2019
3def1aa
update images
Lizy0810 Apr 8, 2019
7a3f460
Merge branch 'master' of https://github.com/CS2113-AY1819S2-T09-2/main
Lizy0810 Apr 8, 2019
f5f4963
Timeline bug fixing 1.0
jingchen-z Apr 8, 2019
68b934e
Timeline bug fixing 1.1
jingchen-z Apr 8, 2019
bd1cf53
Update autocomplete feature
Wanchunwei Apr 8, 2019
b94487c
Merge pull request #166 from Wanchunwei/master
Wanchunwei Apr 8, 2019
4e2a8ee
Update autocomplete
Wanchunwei Apr 8, 2019
abc93b5
Merge branch 'master' of https://github.com/CS2113-AY1819S2-T09-2/main
Wanchunwei Apr 8, 2019
998dbe4
Bug fix
jingchen-z Apr 8, 2019
97e88a9
coding style
Wanchunwei Apr 8, 2019
0096839
Merge pull request #167 from Wanchunwei/master
Wanchunwei Apr 8, 2019
2c7806f
Bug fixed for reminder
BrittonAlone Apr 8, 2019
7218e07
Merge pull request #168 from BrittonAlone/master
BrittonAlone Apr 8, 2019
c0352e1
merge
jingchen-z Apr 9, 2019
6899665
merge 1.1
jingchen-z Apr 9, 2019
617e37f
Merge pull request #165 from jingchen-z/master
jingchen-z Apr 9, 2019
1085b6f
DeveloperGuide: Updated diagram & description for Logic, Model, Stora…
cheahzk Apr 9, 2019
42cb514
DeveloperGuide: Corrected some mistakes.
cheahzk Apr 9, 2019
b3ac028
ModelManager: Removed unused methods.
cheahzk Apr 9, 2019
ecafe0e
Merge branch 'master' of https://github.com/cs2113-ay1819s2-t09-2/main
cheahzk Apr 9, 2019
07f7536
Merge pull request #169 from cheahzk/master
cheahzk Apr 9, 2019
6dafdef
BrowserPanel: Removed all components of browser due to no use.
cheahzk Apr 11, 2019
19a4531
Removed some unused items.
cheahzk Apr 11, 2019
3077d4b
Removed due to unrelevant to project.
cheahzk Apr 11, 2019
3e1f51f
Added test components for travis.
cheahzk Apr 11, 2019
4aed07d
Enable tests for travis test.
cheahzk Apr 11, 2019
231ae34
Travis checkstyle fix 1.0
cheahzk Apr 11, 2019
46c5a3d
Travis checkstyle fix 1.1
cheahzk Apr 11, 2019
9fedefc
Travis checkstyle fix 1.2
cheahzk Apr 11, 2019
6de77a1
Travis checkstyle fix 1.4
cheahzk Apr 11, 2019
382812b
Update GuiTestAssert.java
cheahzk Apr 11, 2019
a60a86b
Travis checkstyle fix 1.5
cheahzk Apr 11, 2019
7248778
Merge branch 'master' of https://github.com/cheahzk/main
cheahzk Apr 11, 2019
6d04037
BrowserPanel: Added back, used in some places.
cheahzk Apr 11, 2019
08694e3
Travis checkstyle fix 1.6
cheahzk Apr 11, 2019
e21c34f
Travis checkstyle fix 1.7
cheahzk Apr 11, 2019
fae9b42
Travis checkstyle fix 1.8
cheahzk Apr 11, 2019
684a7df
Modified xmlns version from 11.0.1 to 9.0.4
cheahzk Apr 11, 2019
32c9e37
Removed MainWindowCloseTest due to Travis test failed due to unknown …
cheahzk Apr 11, 2019
f3c359c
Merge pull request #171 from cheahzk/master
cheahzk Apr 11, 2019
a6102de
Added 2 more test cases, AddCommandParserTest & AddCommandIntegration…
cheahzk Apr 12, 2019
0894aef
Merge pull request #172 from cheahzk/master
cheahzk Apr 12, 2019
577ecc0
UserGuide: Added more information
cheahzk Apr 12, 2019
ccfccee
Tag: Tags should now accept space between words
cheahzk Apr 12, 2019
5d7b8d5
Merge pull request #173 from cheahzk/master
cheahzk Apr 12, 2019
3ffbc90
Merge branch 'master' of https://github.com/CS2113-AY1819S2-T09-2/main
Lizy0810 Apr 13, 2019
c8813a6
Style fix
jingchen-z Apr 13, 2019
12985be
delete thrid lib
Lizy0810 Apr 13, 2019
7c3a5fd
delete third lib 2
Lizy0810 Apr 13, 2019
d347bd5
Timeline bug fix
jingchen-z Apr 13, 2019
ea759d5
Bug fix
jingchen-z Apr 13, 2019
1c8500b
DeveloperGuide: Added extra info to current implementation of Daily T…
cheahzk Apr 13, 2019
38dd2b9
UserGuide: Added extra info to showtime command.
cheahzk Apr 13, 2019
b9586f9
Fix warning
jingchen-z Apr 13, 2019
c60745b
Update DeveloperGuide.adoc
cheahzk Apr 13, 2019
22d9b1c
Merge pull request #174 from cheahzk/master
cheahzk Apr 13, 2019
3c16d33
Updated personal PPP.
cheahzk Apr 13, 2019
e2234d8
Merge pull request #175 from cheahzk/master
cheahzk Apr 13, 2019
bba695b
PPP: Made some correction to diagram dimensions
cheahzk Apr 13, 2019
2ba2970
Merge pull request #176 from cheahzk/master
cheahzk Apr 13, 2019
33b94bb
Update cheahzk.adoc
cheahzk Apr 13, 2019
3a52daa
Update cheahzk.adoc
cheahzk Apr 13, 2019
63c286d
PPP: Solving pictures not showing.
cheahzk Apr 13, 2019
e896775
Travis checkstyle fix
cheahzk Apr 13, 2019
17e24cb
Solving pictures not showing
cheahzk Apr 13, 2019
39556f5
Update cheahzk.adoc
cheahzk Apr 13, 2019
a12514b
Merge pull request #177 from cheahzk/master
cheahzk Apr 13, 2019
d3c7117
Add files via upload
cheahzk Apr 13, 2019
3223e48
Delete DayBox.PNG
cheahzk Apr 13, 2019
0265e5e
Delete InvalidCommand.PNG
cheahzk Apr 13, 2019
c8235a2
Delete ShowTimeDate.PNG
cheahzk Apr 13, 2019
09ac642
Delete TaskBox.PNG
cheahzk Apr 13, 2019
43e4467
Changed image extension name
cheahzk Apr 13, 2019
c1dd74b
update sequence diagrams
Lizy0810 Apr 13, 2019
807fd00
Merge pull request #179 from Zeyang-Li/master
Apr 13, 2019
7e2f370
update PPP
Lizy0810 Apr 13, 2019
0764d21
update PPP 2
Lizy0810 Apr 13, 2019
0ebe813
Update DG PPP
jingchen-z Apr 13, 2019
031e4ae
Update PPP
jingchen-z Apr 13, 2019
09390eb
Update DG
jingchen-z Apr 13, 2019
c5493d1
Update DG
jingchen-z Apr 13, 2019
23d0065
Merge pull request #178 from jingchen-z/master
jingchen-z Apr 13, 2019
9ab9f01
Update PPP
jingchen-z Apr 13, 2019
8b68897
Update PPP 1.1
jingchen-z Apr 13, 2019
4f21b27
Update PPP 1.2
jingchen-z Apr 13, 2019
0430c41
Sequence Diagram for remind feature added. DG and JinShibo PPP updated.
BrittonAlone Apr 13, 2019
303a6b7
Merge pull request #180 from BrittonAlone/master
BrittonAlone Apr 13, 2019
0a3c93e
Update UG
Wanchunwei Apr 13, 2019
fc96eed
Merge branch 'master' of https://github.com/CS2113-AY1819S2-T09-2/main
Wanchunwei Apr 13, 2019
ec7b758
update UG
Wanchunwei Apr 13, 2019
9774688
Update UG2
Wanchunwei Apr 13, 2019
2a40105
update UG3
Wanchunwei Apr 13, 2019
ad8c6b0
UG
Wanchunwei Apr 13, 2019
d131c06
UG 3
Wanchunwei Apr 13, 2019
fc3ed2d
UG4
Wanchunwei Apr 13, 2019
d113e1b
Update PPP 1.3
jingchen-z Apr 14, 2019
b5706c2
Update PPP 1.4
jingchen-z Apr 14, 2019
20f519d
Update PPP 1.5
jingchen-z Apr 14, 2019
bec0463
Update PPP 1.6
jingchen-z Apr 14, 2019
bbbdbe7
Update UG PPP 1.6
jingchen-z Apr 14, 2019
80981a1
Update PPP 1.7
jingchen-z Apr 14, 2019
ca58a8d
Update PPP 1.8
jingchen-z Apr 14, 2019
e9a3d65
DG
Wanchunwei Apr 14, 2019
47d289b
Bug fix
jingchen-z Apr 14, 2019
1a025dd
Picture updated
jingchen-z Apr 14, 2019
d294e67
update tests
Lizy0810 Apr 14, 2019
bdd5567
update test cases
Lizy0810 Apr 14, 2019
a159938
Update DG
Wanchunwei Apr 14, 2019
8721809
DG 2
Wanchunwei Apr 14, 2019
5cb594c
Style fixing
jingchen-z Apr 14, 2019
5e27efe
Merge pull request #181 from Wanchunwei/master
Wanchunwei Apr 14, 2019
89f6e4d
testCASES!
Lizy0810 Apr 14, 2019
cd33eb8
DG3
Wanchunwei Apr 14, 2019
421bcb0
TESTCASE
Lizy0810 Apr 14, 2019
dc1338c
travis fix
Lizy0810 Apr 14, 2019
eadd142
travis fix 2
Lizy0810 Apr 14, 2019
bd5c181
travis fix 2
Lizy0810 Apr 14, 2019
816a589
travis fix 3
Lizy0810 Apr 14, 2019
6df7ef0
Merge branch 'master' of https://github.com/CS2113-AY1819S2-T09-2/main
Lizy0810 Apr 14, 2019
f24ed8d
Merge pull request #182 from Zeyang-Li/master
Apr 14, 2019
c41ac2c
Test cases on Timeline and Month
jingchen-z Apr 14, 2019
845eda2
Test cases on Find and History
jingchen-z Apr 14, 2019
e9914a2
Style fixing 1.0
jingchen-z Apr 14, 2019
8e7c829
test for remind feature added
BrittonAlone Apr 14, 2019
dc14b18
travis
BrittonAlone Apr 14, 2019
5c18afd
Merge pull request #183 from jingchen-z/master
jingchen-z Apr 14, 2019
b00cf78
Update DG
Wanchunwei Apr 14, 2019
1d4eee1
Merge branch 'master' of https://github.com/CS2113-AY1819S2-T09-2/main
Wanchunwei Apr 14, 2019
241a037
DG
Wanchunwei Apr 14, 2019
cd6e807
Merge pull request #184 from Wanchunwei/master
Wanchunwei Apr 14, 2019
a073dd7
test for list command
BrittonAlone Apr 14, 2019
fe8d41f
Resolve conflict
jingchen-z Apr 14, 2019
603247d
Resolve conflict
jingchen-z Apr 14, 2019
f43c905
fix on UG DG
jingchen-z Apr 14, 2019
196fd00
Style fixing
jingchen-z Apr 14, 2019
1331a47
Merge pull request #185 from jingchen-z/master
jingchen-z Apr 14, 2019
f8ebb19
Merge branch 'master' of https://github.com/CS2113-AY1819S2-T09-2/main
BrittonAlone Apr 14, 2019
7b79acb
Update PPP
Wanchunwei Apr 14, 2019
350901b
list command fix bugs
BrittonAlone Apr 14, 2019
31dc50e
ppp
Wanchunwei Apr 14, 2019
16a2f24
DG
Wanchunwei Apr 14, 2019
fbeb8b6
travis
BrittonAlone Apr 14, 2019
ebb4c0b
PPP2
Wanchunwei Apr 14, 2019
c42690f
travis
BrittonAlone Apr 14, 2019
e86293b
test
Wanchunwei Apr 14, 2019
7e86071
travis
BrittonAlone Apr 14, 2019
fd8ad70
ppp3
Wanchunwei Apr 14, 2019
ab96ce0
Merge pull request #187 from BrittonAlone/master
BrittonAlone Apr 14, 2019
106bc38
Remove tag format.
cheahzk Apr 14, 2019
75dfa75
Merge pull request #186 from Wanchunwei/master
Wanchunwei Apr 14, 2019
d0cfd0e
Updated PPP
jingchen-z Apr 14, 2019
b78f816
Merge pull request #188 from jingchen-z/master
jingchen-z Apr 14, 2019
bb8d617
PPP
Wanchunwei Apr 14, 2019
370f03b
Bug fix for valid date check
cheahzk Apr 14, 2019
4d7f19d
Travis fix
cheahzk Apr 14, 2019
c56830b
Merge pull request #189 from Wanchunwei/master
Wanchunwei Apr 14, 2019
8e576c7
Merge pull request #190 from cheahzk/master
cheahzk Apr 14, 2019
877034b
The bug found in reminder feature during PE has been fixed.
BrittonAlone Apr 21, 2019
af6fa39
travis
BrittonAlone Apr 21, 2019
9296a94
Merge pull request #191 from BrittonAlone/master
BrittonAlone Apr 21, 2019
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
35 changes: 35 additions & 0 deletions .classpath
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" output="bin/main" path="src/main/java">
<attributes>
<attribute name="gradle_scope" value="main"/>
<attribute name="gradle_used_by_scope" value="main,test"/>
</attributes>
</classpathentry>
<classpathentry kind="src" output="bin/main" path="src/main/resources">
<attributes>
<attribute name="gradle_scope" value="main"/>
<attribute name="gradle_used_by_scope" value="main,test"/>
</attributes>
</classpathentry>
<classpathentry kind="src" output="bin/test" path="src/test/java">
<attributes>
<attribute name="gradle_scope" value="test"/>
<attribute name="gradle_used_by_scope" value="test"/>
</attributes>
</classpathentry>
<classpathentry kind="src" output="bin/test" path="src/test/resources">
<attributes>
<attribute name="gradle_scope" value="test"/>
<attribute name="gradle_used_by_scope" value="test"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-9/"/>
<classpathentry kind="con" path="org.eclipse.buildship.core.gradleclasspathcontainer"/>
<classpathentry kind="lib" path="C:/Users/惠普/.gradle/caches/modules-2/files-2.1/javax.xml.bind/jaxb-api/2.2.8/f0287831b3e3550b82b5bd19152d460061859ce6/jaxb-api-2.2.8.jar" sourcepath="C:/Users/惠普/.gradle/caches/modules-2/files-2.1/javax.xml.bind/jaxb-api/2.2.8/92c1b43eee9de5ec71c1719aa0334d59983ef596/jaxb-api-2.2.8-sources.jar">
<attributes>
<attribute name="gradle_used_by_scope" value="main,test"/>
</attributes>
</classpathentry>
<classpathentry kind="output" path="bin/default"/>
</classpath>
23 changes: 23 additions & 0 deletions .project
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>Main</name>
<comment>Project main created by Buildship.</comment>
<projects>
</projects>
<buildSpec>
<buildCommand>
<name>org.eclipse.jdt.core.javabuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.buildship.core.gradleprojectbuilder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.jdt.core.javanature</nature>
<nature>org.eclipse.buildship.core.gradleprojectnature</nature>
</natures>
</projectDescription>
3 changes: 2 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ matrix:

script: >-
./config/travis/run-checks.sh &&
./gradlew clean checkstyleMain checkstyleTest headless allTests coverage coveralls asciidoctor
./gradlew clean checkstyleMain checkstyleTest headless allTests coveralls coverage asciidoctor

deploy:
skip_cleanup: true
Expand All @@ -27,3 +27,4 @@ cache:
directories:
- $HOME/.gradle/caches/
- $HOME/.gradle/wrapper/

28 changes: 13 additions & 15 deletions README.adoc
Original file line number Diff line number Diff line change
@@ -1,10 +1,7 @@
= Address Book (Level 4)
= Tasketch
ifdef::env-github,env-browser[:relfileprefix: docs/]

https://travis-ci.org/se-edu/addressbook-level4[image:https://travis-ci.org/se-edu/addressbook-level4.svg?branch=master[Build Status]]
https://ci.appveyor.com/project/damithc/addressbook-level4[image:https://ci.appveyor.com/api/projects/status/3boko2x2vr5cc3w2?svg=true[Build status]]
https://coveralls.io/github/se-edu/addressbook-level4?branch=master[image:https://coveralls.io/repos/github/se-edu/addressbook-level4/badge.svg?branch=master[Coverage Status]]
https://www.codacy.com/app/damith/addressbook-level4?utm_source=github.com&utm_medium=referral&utm_content=se-edu/addressbook-level4&utm_campaign=Badge_Grade[image:https://api.codacy.com/project/badge/Grade/fc0b7775cf7f4fdeaf08776f3d8e364a[Codacy Badge]]
https://travis-ci.org/CS2113-AY1819S2-T09-2/main[image:https://travis-ci.org/CS2113-AY1819S2-T09-2/main.svg?branch=master[Build Status]]

ifdef::env-github[]
image::docs/images/Ui.png[width="600"]
Expand All @@ -14,13 +11,14 @@ ifndef::env-github[]
image::images/Ui.png[width="600"]
endif::[]

* This is a desktop Address Book application. It has a GUI but most of the user interactions happen using a CLI (Command Line Interface).
* It is a Java sample application intended for students learning Software Engineering while using Java as the main programming language.
* It is *written in OOP fashion*. It provides a *reasonably well-written* code example that is *significantly bigger* (around 6 KLoC)than what students usually write in beginner-level SE modules.
* What's different from https://github.com/se-edu/addressbook-level3[level 3]:
** A more sophisticated GUI that includes a list panel and an in-built Browser.
** More test cases, including automated GUI testing.
** Support for _Build Automation_ using Gradle and for _Continuous Integration_ using Travis CI.
* Tasketch is an application that helps you to manage your daily time by managing your tasks.
* Tasketch is a CLI (Command Line Interface) application with GUI output so that you can have best of the both worlds.
* Tasketch is a Java application that you can run on any machine with Java Runtime Environment installed.
* What makes Tasketch special:
** Daily Time Planner monitors your time planned for different task categories of a day.
** Reminder reminds you of the important tasks.
** Command Suggestion suggests you the possible commands that you can enter.
** Auto Complete Command helps you to enter commands faster and easier.

== Site Map

Expand All @@ -32,8 +30,8 @@ endif::[]

== Acknowledgements

* Some parts of this sample application were inspired by the excellent http://code.makery.ch/library/javafx-8-tutorial/[Java FX tutorial] by
_Marco Jakob_.
* Libraries used: https://github.com/TestFX/TestFX[TextFX], https://github.com/FasterXML/jackson[Jackson], https://github.com/google/guava[Guava], https://github.com/junit-team/junit5[JUnit5]
* This application is built on the sample application https://github.com/nusCS2113-AY1819S2/addressbook-level4[Address Book (Level 4)]
* Libraries used: https://github.com/TestFX/TestFX[TextFX], https://bitbucket.org/controlsfx/controlsfx/[ControlsFX],
https://github.com/FasterXML/jackson[Jackson], https://github.com/google/guava[Guava], https://github.com/junit-team/junit5[JUnit5], http://opencsv.sourceforge.net/[opencsv]

== Licence : link:LICENSE[MIT]
1 change: 1 addition & 0 deletions _config.yml
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
theme: jekyll-theme-cayman

9 changes: 4 additions & 5 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ dependencies {
}

shadowJar {
archiveName = 'addressbook.jar'
archiveName = 'Tasketch.jar'

destinationDir = file("${buildDir}/jar/")
}
Expand Down Expand Up @@ -152,7 +152,7 @@ test {
}

if (runNonGuiTests) {
test.include 'seedu/address/**'
test.include 'systemtests/**'
}

if (runGuiTests) {
Expand Down Expand Up @@ -202,9 +202,8 @@ asciidoctor {
idprefix: '', // for compatibility with GitHub preview
idseparator: '-',
'site-root': "${sourceDir}", // must be the same as sourceDir, do not modify
'site-name': 'AddressBook-Level4',
'site-githuburl': 'https://github.com/se-edu/addressbook-level4',
'site-seedu': true, // delete this line if your project is not a fork (not a SE-EDU project)
'site-name': 'Tasketch',
'site-githuburl': 'https://github.com/CS2113-AY1819S2-T09-2/main',
]

options['template_dirs'].each {
Expand Down
47 changes: 23 additions & 24 deletions docs/AboutUs.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -4,53 +4,52 @@
:imagesDir: images
:stylesDir: stylesheets

AddressBook - Level 4 was developed by the https://se-edu.github.io/docs/Team.html[se-edu] team. +
_{The dummy content given below serves as a placeholder to be used by future forks of the project.}_ +
{empty} +
Tasketch was developed by the C2113T-T09-2 team. +
We are a team based in the http://www.comp.nus.edu.sg[School of Computing, National University of Singapore].

== Project Team

=== John Doe
image::damithc.jpg[width="150", align="left"]
{empty}[http://www.comp.nus.edu.sg/~damithch[homepage]] [https://github.com/damithc[github]] [<<johndoe#, portfolio>>]
=== Cheah Zhi Kang
image::cheahzk.png[width="150", align="left"]
{empty}[https://github.com/cheahzk[github]] [<<cheahzk#, portfolio>>]

Role: Project Advisor
Role: Team Leader +
Responsibilities: Deliverables and deadlines +

'''

=== John Roe
image::lejolly.jpg[width="150", align="left"]
{empty}[http://github.com/lejolly[github]] [<<johndoe#, portfolio>>]
=== Zhang Jingchen
image::jingchen-z.png[width="150", align="left"]
{empty}[https://github.com/jingchen-z[github]] [<<jingchen-z#, portfolio>>]

Role: Team Lead +
Responsibilities: UI
Role: Developer +
Responsibilities: Design UI and the format of Data Storage.

'''

=== Johnny Doe
image::yijinl.jpg[width="150", align="left"]
{empty}[http://github.com/yijinl[github]] [<<johndoe#, portfolio>>]
=== Jin Shibo
image::brittonalone.png[width="150", align="left"]
{empty}[http://github.com/BrittonAlone[github]] [<<BrittonAlone#, portfolio>>]

Role: Developer +
Responsibilities: Data
Responsibilities: Data + Documentation

'''

=== Johnny Roe
image::m133225.jpg[width="150", align="left"]
{empty}[http://github.com/m133225[github]] [<<johndoe#, portfolio>>]
=== Wan Chunwei
image::wanchunwei.png[width="150", align="left"]
{empty}[https://github.com/Wanchunwei[github]] [<<Wanchunwei#, portfolio>>]

Role: Developer +
Responsibilities: Dev Ops + Threading
Responsibilities: Code quality + Integration

'''

=== Benson Meier
image::yl_coder.jpg[width="150", align="left"]
{empty}[http://github.com/yl-coder[github]] [<<johndoe#, portfolio>>]
=== Li Zeyang
image::zeyang-li.png[width="150", align="left"]
{empty}[https://github.com/Zeyang-Li[github]] [<<Zeyang-Li#, portfolio>>]

Role: Developer +
Responsibilities: UI
Responsibilities: Scheduling and tracking + Testing

'''
6 changes: 3 additions & 3 deletions docs/ContactUs.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@
:site-section: ContactUs
:stylesDir: stylesheets

* *Bug reports, Suggestions* : Post in our https://github.com/se-edu/addressbook-level4/issues[issue tracker] if you noticed bugs or have suggestions on how to improve.
* *Contributing* : We welcome pull requests. Follow the process described https://github.com/oss-generic/process[here]
* *Email us* : You can also reach us at `damith [at] comp.nus.edu.sg`
* *Bug reports, Suggestions* : Post in our https://github.com/cs2113-ay1819s2-t09-2/main/issues[issue tracker] if you noticed bugs or have suggestions on how to improve.
* *Contributing* : We do not suggest making pull requests from students not enrolled in this module =(.
* *Email us* : You can also reach us at `https://github.com/cs2113-ay1819s2-t09-2`
Loading