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.

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

[CS2103T-T12-1] +Work #110

Open
wants to merge 912 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
912 commits
Select commit Hold shift + click to select a range
19af92f
Merge pull request #157 from ambhinav/abhinav-settings-feature
ambhinav Nov 6, 2019
3001a46
update some command example usage
ambhinav Nov 6, 2019
255df4b
Updated to fix find member
seahlynn Nov 6, 2019
4aba3e9
Merge branch 'master' of https://github.com/AY1920S1-CS2103T-T12-1/main
seahlynn Nov 6, 2019
a74ab88
Fixed find task UI
seahlynn Nov 6, 2019
a41cee0
Merge pull request #158 from seahlynn/master
seahlynn Nov 6, 2019
f4f553b
Merge branch 'master' of https://github.com/AY1920S1-CS2103T-T12-1/m…
ambhinav Nov 6, 2019
59f3ad4
fix app shutdown bug
ambhinav Nov 6, 2019
10e3f68
Merge pull request #159 from ambhinav/abhinav-settings-feature
ambhinav Nov 6, 2019
039bc09
UG1
ArunBeCoding Nov 6, 2019
fa05e03
Merge branch 'UG'
ArunBeCoding Nov 6, 2019
915b83f
Merge pull request #161 from ArunBeCoding/master
ArunBeCoding Nov 6, 2019
a9f5bb8
added unit tests for settings commands
ambhinav Nov 6, 2019
064e150
Merge branch 'master' of https://github.com/AY1920S1-CS2103T-T12-1/main
Nov 7, 2019
7ed4046
Updated UG
seahlynn Nov 7, 2019
6afe134
removed instances of addressbook in packages
Nov 7, 2019
710104c
Merge pull request #162 from elsakoh/master
elsakoh Nov 7, 2019
4e255f2
Merge branch 'master' of https://github.com/AY1920S1-CS2103T-T12-1/main
seahlynn Nov 7, 2019
1d80597
fix conflicts and merge
ambhinav Nov 7, 2019
f260dc6
fix package name change
ambhinav Nov 7, 2019
1647d9e
fixed failing tests caused by package rename
ambhinav Nov 7, 2019
bfd8242
optimise imports for project
ambhinav Nov 7, 2019
04eef26
rename-refactor some task commands
ambhinav Nov 7, 2019
b22b24d
added unit tests for settings in model
ambhinav Nov 7, 2019
58afca7
added settings command tests in parser
ambhinav Nov 7, 2019
ee29ffc
Updated for task-stats
seahlynn Nov 7, 2019
72a7d60
Merge pull request #163 from seahlynn/master
seahlynn Nov 7, 2019
289a265
added settings tests for storage
ambhinav Nov 7, 2019
b3b307d
DG update
ArunBeCoding Nov 7, 2019
44777a4
BugFixes-Inv
ArunBeCoding Nov 7, 2019
9289a9d
merge-DG updates
ArunBeCoding Nov 7, 2019
3b2fc26
Merge pull request #164 from ArunBeCoding/master
ArunBeCoding Nov 7, 2019
c3c66c4
MultiLine&UG-Refined
ArunBeCoding Nov 7, 2019
421334c
Merge pull request #165 from ArunBeCoding/master
ArunBeCoding Nov 7, 2019
0cd5617
checkstyle changes
gabrielseow Nov 7, 2019
880d380
Merge branch 'master' of https://github.com/AY1920S1-CS2103T-T12-1/ma…
gabrielseow Nov 7, 2019
f6b3259
Changed behaviour of setDeadline and editTask
ambhinav Nov 7, 2019
27c41b6
fix conflicts and merge
ambhinav Nov 7, 2019
669104d
refactor to optimise imports
ambhinav Nov 7, 2019
26c5cbb
change dateTime parsing to allow only future dates
ambhinav Nov 7, 2019
633840d
update dateTime util tests
ambhinav Nov 7, 2019
5bc4730
fix EOF errors
ambhinav Nov 7, 2019
934b3fe
fix gradlew.bat
ambhinav Nov 7, 2019
03956ba
change line seperator
ambhinav Nov 7, 2019
c8b87f8
Merge pull request #166 from ambhinav/abhinav-settings-feature
ambhinav Nov 7, 2019
06bda8c
integrated undo/redo functionality and removed ListTaskByMember
gabrielseow Nov 7, 2019
5146b9d
Updated DG
seahlynn Nov 7, 2019
ee819f4
Sequene diagrams
seahlynn Nov 7, 2019
41f8308
Added class diagram for DG
seahlynn Nov 7, 2019
3e23539
update UG and PPP
ambhinav Nov 8, 2019
319f170
standardised Meeting List fxml according to main app
gabrielseow Nov 8, 2019
85c7391
creating addMeetingCommandTest
gabrielseow Nov 8, 2019
7dc56a9
dealing with merge conflicts from team master
gabrielseow Nov 8, 2019
065dc3a
add meeting command test almost complete
gabrielseow Nov 8, 2019
e91d31b
fixed errors with addMeetingCommandTest
gabrielseow Nov 8, 2019
ae77782
fixed test errors
gabrielseow Nov 8, 2019
9563485
Merge pull request #167 from gabrielseow/master
gabrielseow Nov 8, 2019
79dcc96
updates to autocorrect drop down styling to make sure it is not invis…
Nov 9, 2019
6f32422
added checks for invaid start time and end time
gabrielseow Nov 9, 2019
0cad13c
added update support for deleted Calendars
gabrielseow Nov 9, 2019
7f5e8de
Updated DG
seahlynn Nov 9, 2019
f76a12b
Updated DG
seahlynn Nov 9, 2019
60710e8
fixed fxml display for members under a meeting
gabrielseow Nov 9, 2019
dd5db47
Updated DG
seahlynn Nov 9, 2019
c0d66af
modified duplicateCalendarException to check for membername only
gabrielseow Nov 9, 2019
88e2d60
Updated DG
seahlynn Nov 9, 2019
9934946
Edited PPP
seahlynn Nov 9, 2019
c1de257
Merge branch 'master' of https://github.com/AY1920S1-CS2103T-T12-1/m…
ambhinav Nov 9, 2019
209cb02
added test cases for AddMeetingCommandTest and removed check if deadl…
gabrielseow Nov 9, 2019
c5bc3df
update UG to include latest pictures
ambhinav Nov 9, 2019
50aefea
added test cases for FindMeetingTimeCommandTest
gabrielseow Nov 9, 2019
87c3109
Merge branch 'master' of https://github.com/AY1920S1-CS2103T-T12-1/main
gabrielseow Nov 9, 2019
4084b8d
Merge pull request #169 from gabrielseow/master
gabrielseow Nov 9, 2019
26e2a03
updated UG to include edit-task and pics
ambhinav Nov 9, 2019
97fc03c
Updated PPP
seahlynn Nov 9, 2019
9930f3a
Updated PPP
seahlynn Nov 9, 2019
a3174c6
Updated PPP
seahlynn Nov 9, 2019
3a75136
Updated PPP
seahlynn Nov 9, 2019
8d435b6
Updated PPP (trying to shorten it)
seahlynn Nov 9, 2019
0d93645
Updated PPP
seahlynn Nov 9, 2019
281e5b5
Updated PPP
seahlynn Nov 9, 2019
dc1f66e
Updated PPP
seahlynn Nov 10, 2019
d5b887a
Merge branch 'master' of https://github.com/AY1920S1-CS2103T-T12-1/main
Nov 10, 2019
2471a0e
travis fix
Nov 10, 2019
1f81f79
Merge pull request #168 from elsakoh/master
elsakoh Nov 10, 2019
13ef42c
Added test for edit member command
seahlynn Nov 10, 2019
688d093
TestCases
ArunBeCoding Nov 10, 2019
2be4ca4
Merge branch 'TestCases'
ArunBeCoding Nov 10, 2019
c30d2dd
Merge pull request #170 from ArunBeCoding/master
ArunBeCoding Nov 10, 2019
f08b61a
Added test for addmembercommand parser
seahlynn Nov 10, 2019
3b1e0f1
Merge branch 'master' of https://github.com/AY1920S1-CS2103T-T12-1/main
seahlynn Nov 10, 2019
5334251
Update README.adoc
ArunBeCoding Nov 10, 2019
1969466
Update README.adoc
ArunBeCoding Nov 10, 2019
78397cb
Update README.adoc
ArunBeCoding Nov 10, 2019
49c8af9
UG-updatePics
ArunBeCoding Nov 10, 2019
30f16d5
Merge pull request #171 from ArunBeCoding/master
ArunBeCoding Nov 10, 2019
2ceb451
update DG dashbaord feature
ambhinav Nov 10, 2019
c358af6
Edited PPP
seahlynn Nov 10, 2019
6bffa80
Merge branch 'master' of https://github.com/AY1920S1-CS2103T-T12-1/main
seahlynn Nov 10, 2019
88a6a8a
added acknowledgements for iCal4j external library
gabrielseow Nov 10, 2019
4460f9a
merged from team master and fixed merge conflicts
gabrielseow Nov 10, 2019
fb10301
updated DG to organise UI component
ambhinav Nov 10, 2019
db1bdc7
Fixed checkstyle
seahlynn Nov 10, 2019
bad236e
Fixed checkstyle
seahlynn Nov 10, 2019
305b7f0
Fixed checkstyle for diagrams
seahlynn Nov 10, 2019
5ef9768
Merge pull request #172 from seahlynn/master
seahlynn Nov 10, 2019
793dcaf
fix conflicts and merge with #172
ambhinav Nov 10, 2019
e024d5e
Merge pull request #173 from ambhinav/abhinav-UG-DG
ambhinav Nov 10, 2019
ab89021
added test cases for FindMeetingTimeCommand and AddCalendarCommand
gabrielseow Nov 10, 2019
2b5fa67
dealt with merge conflicts from team master
gabrielseow Nov 10, 2019
c576606
fixed some import errors from merge conflicts
gabrielseow Nov 10, 2019
48fc99c
Merge pull request #174 from gabrielseow/master
gabrielseow Nov 10, 2019
aee21e3
update PPP intro and contributions
ambhinav Nov 10, 2019
9c8d051
update UG settings feature
ambhinav Nov 10, 2019
546e4b0
update PPP and DG to improve content
ambhinav Nov 10, 2019
ad5f8c8
Merge branch 'master' of https://github.com/AY1920S1-CS2103T-T12-1/m…
ambhinav Nov 10, 2019
f527e3e
Merge pull request #175 from ambhinav/abhinav-UG-DG
ambhinav Nov 10, 2019
b92f1f5
Updated PPP
seahlynn Nov 10, 2019
8c3334f
Merge branch 'master' of https://github.com/AY1920S1-CS2103T-T12-1/main
seahlynn Nov 10, 2019
8eda986
finalise PPP attempt 1
ambhinav Nov 10, 2019
55e510c
change UI to Ui in PPP
ambhinav Nov 10, 2019
e5980fd
Updated pictures for UG (interlaced image)
seahlynn Nov 10, 2019
881a189
fix PPP spelling errors
ambhinav Nov 10, 2019
aa518c7
Merge pull request #176 from ambhinav/abhinav-UG-DG
ambhinav Nov 10, 2019
165ed6a
edited UG
gabrielseow Nov 10, 2019
164f752
Updated UG, DG and PPP
seahlynn Nov 10, 2019
b9e483b
Merge branch 'master' of https://github.com/AY1920S1-CS2103T-T12-1/main
seahlynn Nov 10, 2019
c5bc3a1
finalise PPP v2
ambhinav Nov 10, 2019
9c922dd
Merge pull request #177 from ambhinav/abhinav-UG-DG
ambhinav Nov 10, 2019
d8fd86b
added displayDateRange method in DateTimeUtil
gabrielseow Nov 10, 2019
db3b0c2
Updated PPP
seahlynn Nov 10, 2019
b7d1ce1
Merge branch 'master' of https://github.com/AY1920S1-CS2103T-T12-1/main
seahlynn Nov 10, 2019
2715d3d
resize images for UG/DG submission
ambhinav Nov 10, 2019
6de98fa
update AboutUs.adoc
ambhinav Nov 10, 2019
07e43e6
fix addTaskIntegration test
ambhinav Nov 10, 2019
59cf34e
Updated UG, DG, PPP
seahlynn Nov 10, 2019
fa54c18
Merge pull request #178 from seahlynn/master
seahlynn Nov 10, 2019
b821d19
HTML vers of PPP
seahlynn Nov 10, 2019
b43dd0c
Merge branch 'master' of https://github.com/AY1920S1-CS2103T-T12-1/main
seahlynn Nov 10, 2019
30136f8
HTML vers of Abhi's PPP
seahlynn Nov 10, 2019
b98bf24
Update AboutUs.adoc
seahlynn Nov 10, 2019
bd9babf
Fixed checkstyle
seahlynn Nov 10, 2019
41792dc
Merge pull request #179 from seahlynn/master
seahlynn Nov 10, 2019
60a85d1
Updated DG to include manual testing
seahlynn Nov 10, 2019
48dd01b
update DG manual testing for settings, task and db
ambhinav Nov 10, 2019
4eac702
fix conflicts and merge
ambhinav Nov 10, 2019
f863d01
update DG links
ambhinav Nov 10, 2019
032bb5c
update README.md
ambhinav Nov 10, 2019
8bdc5ad
Merge pull request #181 from ambhinav/abhinav-UG-DG
ambhinav Nov 10, 2019
f54754f
support for using shift key for autocomplete
Nov 10, 2019
1d6ffbe
Merge branch 'master' of https://github.com/AY1920S1-CS2103T-T12-1/main
Nov 10, 2019
b8293f5
Merge pull request #182 from elsakoh/master
elsakoh Nov 10, 2019
d1fb68a
Merge branch 'master' of https://github.com/AY1920S1-CS2103T-T12-1/main
Nov 10, 2019
6de2c7f
ppp
Nov 10, 2019
1d5a898
arun-PPP updates
ArunBeCoding Nov 11, 2019
237b383
Merge pull request #183 from ArunBeCoding/master
ArunBeCoding Nov 11, 2019
d15a663
Fixed task-stats
seahlynn Nov 11, 2019
48b0cab
Merge branch 'master' of https://github.com/AY1920S1-CS2103T-T12-1/main
seahlynn Nov 11, 2019
2b67c3b
fixed error for DeleteMeetingCommand
gabrielseow Nov 11, 2019
ae1317d
Merge pull request #180 from seahlynn/master
seahlynn Nov 11, 2019
b914af1
Made sure task-stats works
seahlynn Nov 11, 2019
a765fb8
update UG
gabrielseow Nov 11, 2019
16cda68
Merge branch 'master' of https://github.com/AY1920S1-CS2103T-T12-1/main
gabrielseow Nov 11, 2019
04f211f
Fixed test
seahlynn Nov 11, 2019
6923356
Merge pull request #184 from seahlynn/master
seahlynn Nov 11, 2019
485ecc8
fix add task in UG
ambhinav Nov 11, 2019
7a0aadd
finalised UG update
gabrielseow Nov 11, 2019
f2993f6
UG, DG, PPP and bug fix for autocomplete
Nov 11, 2019
668402a
fix checkstyle
ambhinav Nov 11, 2019
9e72fce
reformat code to optimise imports
ambhinav Nov 11, 2019
eeb640c
BugFix
ArunBeCoding Nov 11, 2019
1ee17ac
Merge branch 'master' of https://github.com/AY1920S1-CS2103T-T12-1/m…
ambhinav Nov 11, 2019
a7bde94
Merge pull request #186 from ArunBeCoding/master
ArunBeCoding Nov 11, 2019
1b9156f
added half test cases for DeleteCalendarCommandTest
gabrielseow Nov 11, 2019
203fbc6
Merge branch 'master' of https://github.com/AY1920S1-CS2103T-T12-1/main
gabrielseow Nov 11, 2019
baf696f
changed java gradle version to java11
gabrielseow Nov 11, 2019
e2c35d3
Merge pull request #185 from gabrielseow/master
gabrielseow Nov 11, 2019
39ade6d
renamed editcommandparser to include task
ambhinav Nov 11, 2019
8ce9f54
add comments to make code clearer
ambhinav Nov 11, 2019
ee7f638
organise logic classes
ambhinav Nov 11, 2019
4c9f559
ppp pdf and minor bug fix for autocomplete
Nov 11, 2019
8d510b7
fix merge conflict
Nov 11, 2019
f1a7303
travis fix
Nov 11, 2019
cce184b
organise classes in logic test folder
ambhinav Nov 11, 2019
ee5602f
reformat code to optimise imports
ambhinav Nov 11, 2019
23a5e8d
fix conflicts and merge with #185
ambhinav Nov 11, 2019
f8f6521
Merge pull request #187 from elsakoh/elsakoh-UG-DG
elsakoh Nov 11, 2019
a1b8cdc
fix tests
ambhinav Nov 11, 2019
dcaba43
fix conflicts and merge
ambhinav Nov 11, 2019
ff616a7
update UG faq
ambhinav Nov 11, 2019
f3aebc3
Merge pull request #188 from ambhinav/abhinav-UG-DG
ambhinav Nov 11, 2019
18008b8
Delete Ui.png
ArunBeCoding Nov 11, 2019
18af4ad
Add files via upload
ArunBeCoding Nov 11, 2019
856e970
Delete Ui.png
ArunBeCoding Nov 11, 2019
9cbce50
no message
ArunBeCoding Nov 11, 2019
0494486
Merge pull request #189 from ArunBeCoding/master
ArunBeCoding Nov 11, 2019
c40a693
Update arunkumarr.html
ArunBeCoding Nov 11, 2019
7e6aad4
minor bug fix for autocomplete prefix usage for edit-inv
Nov 11, 2019
8021a8b
update UG formatting and content
ambhinav Nov 11, 2019
83d0f84
travis checks
Nov 11, 2019
2d92585
Merge pull request #190 from elsakoh/master
elsakoh Nov 11, 2019
6f0f3de
update some class diagrams in DG
ambhinav Nov 11, 2019
5336d9c
fix conflicts and merge
ambhinav Nov 11, 2019
96b13c4
Merge pull request #191 from ambhinav/abhinav-UG-DG
ambhinav Nov 11, 2019
770e7fa
Update README.adoc
ArunBeCoding Nov 11, 2019
effd46f
undo to lower case
Nov 11, 2019
231e196
refactor user view update
ambhinav Nov 11, 2019
4534e7d
Merge pull request #192 from elsakoh/master
elsakoh Nov 11, 2019
e1f9585
fix checkStyle
ambhinav Nov 11, 2019
1246a61
Merge branch 'master' of https://github.com/AY1920S1-CS2103T-T12-1/m…
ambhinav Nov 11, 2019
a71849e
Merge pull request #193 from ambhinav/abhinav-UG-DG
ambhinav Nov 11, 2019
eb93ce2
fix for member index
Nov 11, 2019
2bcd58b
improve task command res messages
ambhinav Nov 11, 2019
7a61e6e
fix upcoming deadlines bug
ambhinav Nov 11, 2019
a593f7d
Merge pull request #194 from ambhinav/master
ambhinav Nov 11, 2019
8c65a68
updates to ppp
Nov 11, 2019
f793f8f
travis fix
Nov 11, 2019
fc226fa
Merge pull request #195 from elsakoh/master
elsakoh Nov 11, 2019
d56ecef
Updated DG
seahlynn Nov 11, 2019
131fd1e
Merge branch 'master' of https://github.com/AY1920S1-CS2103T-T12-1/main
seahlynn Nov 11, 2019
e6d4af3
updated DG
gabrielseow Nov 11, 2019
d734b53
merged from team master
gabrielseow Nov 11, 2019
d278406
Merge pull request #196 from gabrielseow/master
gabrielseow Nov 11, 2019
d43fb97
Added more sample members
seahlynn Nov 11, 2019
1ed4ec7
Merge branch 'master' of https://github.com/AY1920S1-CS2103T-T12-1/main
seahlynn Nov 11, 2019
ce07828
Merge pull request #197 from seahlynn/master
seahlynn Nov 11, 2019
821ba86
change control to right arrow and ppp updates
Nov 11, 2019
224c3d7
giving credit
ambhinav Nov 11, 2019
712e58d
removed a line
ambhinav Nov 11, 2019
cbafac5
Merge branch 'master' of https://github.com/AY1920S1-CS2103T-T12-1/main
ambhinav Nov 11, 2019
e810507
ppp update
Nov 11, 2019
3135587
Merge branch 'master' of https://github.com/AY1920S1-CS2103T-T12-1/main
Nov 11, 2019
1147785
travis eof fix
Nov 11, 2019
07d42af
Merge pull request #198 from elsakoh/master
elsakoh Nov 11, 2019
a44c4f7
Merge branch 'master' of https://github.com/AY1920S1-CS2103T-T12-1/main
ambhinav Nov 11, 2019
9d35e47
Cleaning up ug and dg
seahlynn Nov 11, 2019
8970a27
Merge branch 'master' of https://github.com/AY1920S1-CS2103T-T12-1/main
seahlynn Nov 11, 2019
ec81291
Merge pull request #199 from ambhinav/master
ambhinav Nov 11, 2019
7cd0821
ppp pdf
Nov 11, 2019
e99ae8d
Merge pull request #200 from elsakoh/master
elsakoh Nov 11, 2019
022c204
fix tests
ambhinav Nov 11, 2019
8a44277
Updated UG and DG
seahlynn Nov 11, 2019
fc2c481
Merge pull request #201 from ambhinav/master
ambhinav Nov 11, 2019
20c20ea
Merge branch 'master' of https://github.com/AY1920S1-CS2103T-T12-1/main
seahlynn Nov 11, 2019
68a76e9
Merge pull request #202 from seahlynn/master
seahlynn Nov 11, 2019
bbcc508
added ppp
gabrielseow Nov 11, 2019
dc5ac06
Merge pull request #203 from gabrielseow/master
gabrielseow Nov 11, 2019
491f533
Rename arunkumarr.adoc to ArunBeCoding.adoc
ArunBeCoding Nov 15, 2019
eeae5c9
Delete arunkumarr.pdf
ArunBeCoding Nov 15, 2019
0a416a9
Add files via upload
ArunBeCoding Nov 15, 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
  •  
  •  
  •  
30 changes: 30 additions & 0 deletions .classpath
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
<?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-11/"/>
<classpathentry kind="con" path="org.eclipse.buildship.core.gradleclasspathcontainer"/>
<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>
2 changes: 2 additions & 0 deletions .settings/org.eclipse.buildship.core.prefs
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
connection.project.dir=
eclipse.preferences.version=1
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ matrix:
- jdk: openjdk11

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

deploy:
skip_cleanup: true
Expand Down
27 changes: 27 additions & 0 deletions .vscode/launch.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
{
// Use IntelliSense to learn about possible attributes.
// Hover to view descriptions of existing attributes.
// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
"version": "0.2.0",
"configurations": [
{
"type": "java",
"name": "Debug (Launch) - Current File",
"request": "launch",
"mainClass": "${file}"
},
{
"type": "java",
"name": "Debug (Launch)-Main<main>",
"request": "launch",
"mainClass": "seedu.address.Main",
"projectName": "main"
},
{
"type": "java",
"name": "Debug (Launch)-ComboBox",
"request": "launch",
"mainClass": "ComboBox"
}
]
}
4 changes: 2 additions & 2 deletions LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@ MIT License

Copyright (c) 2016 Software Engineering Education - FOSS Resources

Permission is hereby granted, free of charge, to any person obtaining a copy
Permission is hereby granted, free of charge, to any task obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
copies of the Software, and to permit tasks to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all
Expand Down
29 changes: 29 additions & 0 deletions LICENSE.ical4j
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
BSD 3-Clause License

Copyright (c) 2012, Ben Fortuna
All rights reserved.

Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met:

* Redistributions of source code must retain the above copyright notice, this
list of conditions and the following disclaimer.

* Redistributions in binary form must reproduce the above copyright notice,
this list of conditions and the following disclaimer in the documentation
and/or other materials provided with the distribution.

* Neither the name of the copyright holder nor the names of its
contributors may be used to endorse or promote products derived from
this software without specific prior written permission.

THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
28 changes: 11 additions & 17 deletions README.adoc
Original file line number Diff line number Diff line change
@@ -1,36 +1,30 @@
= Address Book (Level 3)
= +Work
ifdef::env-github,env-browser[:relfileprefix: docs/]

https://travis-ci.org/se-edu/addressbook-level3[image:https://travis-ci.org/se-edu/addressbook-level3.svg?branch=master[Build Status]]
https://ci.appveyor.com/project/damithc/addressbook-level3[image:https://ci.appveyor.com/api/projects/status/3boko2x2vr5cc3w2?svg=true[Build status]]
https://coveralls.io/github/se-edu/addressbook-level3?branch=master[image:https://coveralls.io/repos/github/se-edu/addressbook-level3/badge.svg?branch=master[Coverage Status]]
https://www.codacy.com/app/damith/addressbook-level3?utm_source=github.com&utm_medium=referral&utm_content=se-edu/addressbook-level3&utm_campaign=Badge_Grade[image:https://api.codacy.com/project/badge/Grade/fc0b7775cf7f4fdeaf08776f3d8e364a[Codacy Badge]]
https://gitter.im/se-edu/Lobby[image:https://badges.gitter.im/se-edu/Lobby.svg[Gitter chat]]
image:https://travis-ci.org/AY1920S1-CS2103T-T12-1/main.svg?branch=master["Build Status", link="https://travis-ci.org/AY1920S1-CS2103T-T12-1/main"]
https://coveralls.io/github/AY1920S1-CS2103T-T12-1/main?branch=master[image:https://coveralls.io/repos/github/AY1920S1-CS2103T-T12-1/main/badge.svg?branch=master[Coverage Status]]

ifdef::env-github[]
image::docs/images/Ui.png[width="600"]
endif::[]
"Smash those deadlines"

ifndef::env-github[]
image::images/Ui.png[width="600"]
// image::docs/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.
image::docs/images/Ui.png[width="600"]

* +Work is a desktop project management application. It has a GUI but most of the user interactions happen using a CLI (Command Line Interface).
* The application is targeted at NUS students who are project leaders for organisations, school work or CCA.

== Site Map

* <<UserGuide#, User Guide>>
* <<DeveloperGuide#, Developer Guide>>
* <<LearningOutcomes#, Learning Outcomes>>
* <<AboutUs#, About Us>>
* <<ContactUs#, Contact Us>>

== 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://openjfx.io/[JavaFX], https://github.com/FasterXML/jackson[Jackson], https://github.com/junit-team/junit5[JUnit5]
* Some parts of this sample application were inspired by the AddressBook-Level3 project created by https://se-education.org[SE-EDU Initiative].
* Libraries used: https://openjfx.io/[JavaFX], https://github.com/FasterXML/jackson[Jackson], https://github.com/junit-team/junit5[JUnit5], https://github.com/itext[itext], https://github.com/ical4j[iCal4j]

== Licence : link:LICENSE[MIT]
3 changes: 2 additions & 1 deletion _config.yml
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
theme: jekyll-theme-cayman
theme: jekyll-theme-minimal

15 changes: 15 additions & 0 deletions bin/main/ical4j.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
net.fortuna.ical4j.timezone.registry=net.fortuna.ical4j.model.DefaultTimeZoneRegistryFactory
net.fortuna.ical4j.timezone.update.enabled={true|false}
net.fortuna.ical4j.factory.decoder=net.fortuna.ical4j.util.DefaultDecoderFactory
net.fortuna.ical4j.factory.encoder=net.fortuna.ical4j.util.DefaultEncoderFactory
net.fortuna.ical4j.recur.maxincrementcount=1000
net.fortuna.ical4j.timezone.cache.impl=net.fortuna.ical4j.util.MapTimeZoneCache
net.fortuna.ical4j.unfolding.relaxed=true
net.fortuna.ical4j.validation.relaxed=true
net.fortuna.ical4j.compatibility.outlook=true
net.fortuna.ical4j.compatibility.notes=true
#Original parser configuration
#net.fortuna.ical4j.parser=net.fortuna.ical4j.data.HCalendarParserFactory
#Solved: Pushback buffer overflow using https://github.com/ical4j/ical4j/issues/219
net.fortuna.ical4j.parser=net.fortuna.ical4j.data.DefaultCalendarParserFactory
net.fortuna.ical4j.parsing.relaxed=true
Binary file added bin/main/images/DaUser.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added bin/main/images/address_book_32.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added bin/main/images/calendar.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added bin/main/images/clock.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added bin/main/images/fail.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added bin/main/images/help_icon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added bin/main/images/info_icon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added bin/main/seedu/pluswork/AppParameters.class
Binary file not shown.
Binary file added bin/main/seedu/pluswork/Main.class
Binary file not shown.
Binary file added bin/main/seedu/pluswork/MainApp.class
Binary file not shown.
Binary file added bin/main/seedu/pluswork/commons/Keywords.class
Binary file not shown.
Binary file added bin/main/seedu/pluswork/commons/core/Config.class
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file added bin/main/seedu/pluswork/logic/Logic.class
Binary file not shown.
Binary file added bin/main/seedu/pluswork/logic/LogicManager.class
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file added bin/main/seedu/pluswork/logic/commands/Command.class
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file added bin/main/seedu/pluswork/logic/parser/Parser.class
Binary file not shown.
Binary file not shown.
Binary file added bin/main/seedu/pluswork/logic/parser/Prefix.class
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file added bin/main/seedu/pluswork/model/Model.class
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file added bin/main/seedu/pluswork/model/UserPrefs.class
Binary file not shown.
Binary file added bin/main/seedu/pluswork/model/UserSettings.class
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file added bin/main/seedu/pluswork/model/mapping/Mapping.class
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file added bin/main/seedu/pluswork/model/member/Member.class
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file added bin/main/seedu/pluswork/model/tag/Tag.class
Binary file not shown.
Binary file added bin/main/seedu/pluswork/model/task/Name.class
Binary file not shown.
Binary file not shown.
Binary file added bin/main/seedu/pluswork/model/task/Task.class
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file added bin/main/seedu/pluswork/storage/Storage.class
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file added bin/main/seedu/pluswork/ui/CommandBox$1.class
Binary file not shown.
Binary file not shown.
Binary file added bin/main/seedu/pluswork/ui/CommandBox.class
Binary file not shown.
Binary file added bin/main/seedu/pluswork/ui/HelpCard.class
Binary file not shown.
Binary file added bin/main/seedu/pluswork/ui/HelpWindow.class
Binary file not shown.
Binary file added bin/main/seedu/pluswork/ui/MainWindow.class
Binary file not shown.
Binary file added bin/main/seedu/pluswork/ui/ResultDisplay.class
Binary file not shown.
Binary file added bin/main/seedu/pluswork/ui/StatusBarFooter.class
Binary file not shown.
Binary file added bin/main/seedu/pluswork/ui/Ui.class
Binary file not shown.
Binary file added bin/main/seedu/pluswork/ui/UiManager.class
Binary file not shown.
Binary file added bin/main/seedu/pluswork/ui/UiPart.class
Binary file not shown.
Binary file not shown.
Binary file added bin/main/seedu/pluswork/ui/UserViewMain.class
Binary file not shown.
Binary file not shown.
Binary file added bin/main/seedu/pluswork/ui/UserViewUpdate.class
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file added bin/main/seedu/pluswork/ui/views/TaskCard.class
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
8 changes: 8 additions & 0 deletions bin/main/view/CommandBox.fxml
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>

<?import javafx.scene.control.TextField?>
<?import javafx.scene.layout.StackPane?>
<StackPane styleClass="stack-pane" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1">
<TextField fx:id="commandTextField" onAction="#handleCommandEntered" promptText="Enter command here..."/>
</StackPane>

7 changes: 7 additions & 0 deletions bin/main/view/CommandListPanel.fxml
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>

<?import javafx.scene.control.ListView?>
<?import javafx.scene.layout.VBox?>
<VBox xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1">
<ListView fx:id="commandListView" VBox.vgrow="ALWAYS"/>
</VBox>
Loading