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-F09-4] Volant #18

Open
wants to merge 394 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 133 commits
Commits
Show all changes
394 commits
Select commit Hold shift + click to select a range
fef7aee
Merge remote-tracking branch 'AY1920S2-CS2103T-F09-4/master'
Mar 27, 2020
458d1bb
Fix build error
Mar 27, 2020
c06522d
Merge pull request #6 from AY1920S2-CS2103T-F09-4/master
zsoh97 Mar 27, 2020
ec17c0b
Merge remote-tracking branch 'AY1920S2-CS2103T-F09-4/master'
Mar 27, 2020
d70d995
Sorting activity list chronologically update
zsoh97 Mar 27, 2020
0fcd8c1
Update GUI
Mar 28, 2020
38b0daa
Merge pull request #144 from raniceyue/master
raniceyue Mar 28, 2020
62a67c0
Merge pull request #6 from AY1920S2-CS2103T-F09-4/master
mikhailfaiz Mar 28, 2020
dc6b643
Merge remote-tracking branch 'AY1920S2-CS2103T-F09-4/master'
Mar 29, 2020
414f0d9
Update UserGuide following 10-01 meeting
grrrrnt Mar 30, 2020
f41ed20
Merge pull request #8 from AY1920S2-CS2103T-F09-4/master
vuhieunguyen Mar 30, 2020
fb89a4a
Merge pull request #7 from AY1920S2-CS2103T-F09-4/master
zsoh97 Mar 31, 2020
d8b50a7
ui update commit
zsoh97 Mar 31, 2020
a2978bc
Merge pull request #7 from AY1920S2-CS2103T-F09-4/master
grrrrnt Mar 31, 2020
192012e
Updated Grant's portfolio
grrrrnt Apr 1, 2020
1dcf7fa
Update JournalEntryCard.fxml
Apr 1, 2020
fa93cca
Merge pull request #159 from AY1920S2-CS2103T-F09-4/branch-ranice-gui
raniceyue Apr 1, 2020
94056a1
Merge remote-tracking branch 'AY1920S2-CS2103T-F09-4/master'
Apr 1, 2020
a6dc044
Merge pull request #158 from grrrrnt/master
raniceyue Apr 1, 2020
a015823
Merge remote-tracking branch 'AY1920S2-CS2103T-F09-4/master'
mikhailfaiz Apr 1, 2020
a7ccbc1
Merge pull request #8 from AY1920S2-CS2103T-F09-4/master
grrrrnt Apr 1, 2020
3688cd5
Merge pull request #8 from AY1920S2-CS2103T-F09-4/master
zsoh97 Apr 1, 2020
18c114b
merge conflic commit
zsoh97 Apr 1, 2020
db729c7
merge conflict commit
zsoh97 Apr 1, 2020
1591dc4
Added character limit for journal content, made all command keywords …
mikhailfaiz Apr 1, 2020
1f1e8be
Updated User Guide URL in Help window, fixed Enter button bug, implem…
grrrrnt Apr 1, 2020
35d0979
delete for trip now deletes entire folder.
zsoh97 Apr 1, 2020
0e1da77
Implement sorting of HOME page
Apr 1, 2020
85fbdcb
Merge pull request #162 from grrrrnt/master
raniceyue Apr 1, 2020
4991d72
Merge pull request #163 from raniceyue/master
raniceyue Apr 1, 2020
5b2b8b9
Merge remote-tracking branch 'AY1920S2-CS2103T-F09-4/master'
Apr 1, 2020
b0787ab
codee refactoring commit
zsoh97 Apr 1, 2020
7831033
commit to pass travis
zsoh97 Apr 1, 2020
8069fa7
Merge branch 'master' into master
zsoh97 Apr 1, 2020
7790147
Add HomeCommand
Apr 1, 2020
f29b42e
Changed DateRange format to "DD-MM-YYYY"
mikhailfaiz Apr 1, 2020
eef55b1
Merge remote-tracking branch 'AY1920S2-CS2103T-F09-4/master'
mikhailfaiz Apr 1, 2020
5fb7acc
Merge pull request #168 from raniceyue/master
raniceyue Apr 1, 2020
8859109
Merge branch 'master' into master
raniceyue Apr 1, 2020
09283b0
Fix trip delete bug, Implement chronological sorting for activities (…
zsoh97 Apr 1, 2020
ccc738e
Fixed checkstyle errors
mikhailfaiz Apr 1, 2020
bdf9ad6
Fix bugs from PR #165 (#171)
raniceyue Apr 1, 2020
de1d377
Codacy fix
mikhailfaiz Apr 1, 2020
e730420
Implement Journal entry character limit, Implement command case insen…
mikhailfaiz Apr 1, 2020
e8cef5c
Fix missing exception for goto command on trip page (#172)
raniceyue Apr 1, 2020
5ba886d
Merge pull request #9 from AY1920S2-CS2103T-F09-4/master
vuhieunguyen Apr 1, 2020
7bb0bd1
Added Find command for Itinerary Title
vuhieunguyen Apr 1, 2020
815c071
Implemented Find command for Itinerary with multiple fields
vuhieunguyen Apr 2, 2020
dd74dcc
implemented exceptions for itinerary, created folder for trip upon ad…
zsoh97 Apr 2, 2020
82ad2ce
Merge branch 'master' of https://github.com/zsoh97/main
zsoh97 Apr 2, 2020
9ed650c
Merge branch 'master' into master
zsoh97 Apr 2, 2020
6f9bdb0
Merge pull request #9 from AY1920S2-CS2103T-F09-4/master
zsoh97 Apr 2, 2020
e9c2eb4
corrections to pass travis commit
zsoh97 Apr 2, 2020
f510f03
Implement FindCommand for Itinerary (#174)
vuhieunguyen Apr 2, 2020
cbb5ca5
Updated User Guide according to tutor feedback (#176)
grrrrnt Apr 2, 2020
9417b49
Update command feedback messages (#179)
raniceyue Apr 2, 2020
e6ccbc5
Implement exceptions for itinerary, Fix bug where title being empty w…
zsoh97 Apr 2, 2020
af18235
Fixed error for worried feeling
mikhailfaiz Apr 2, 2020
fd915e8
Fixed worried feeling for JournalPageCard (#180)
mikhailfaiz Apr 2, 2020
b5c63ce
Implemented sort command for Journal
mikhailfaiz Apr 2, 2020
70ef618
Automatically sort by new when new entry is added
mikhailfaiz Apr 2, 2020
3b81541
Merge remote-tracking branch 'AY1920S2-CS2103T-F09-4/master'
mikhailfaiz Apr 2, 2020
f6c9b82
Checkstyle fix
mikhailfaiz Apr 2, 2020
333e416
Codacy fix
mikhailfaiz Apr 2, 2020
0f42fca
Travis fix
mikhailfaiz Apr 2, 2020
317f3a8
Sort command for Journal (#181)
mikhailfaiz Apr 3, 2020
b5cc858
Merge remote-tracking branch 'AY1920S2-CS2103T-F09-4/master'
mikhailfaiz Apr 3, 2020
0bf8709
Standardize prefix for ACTIVITY_TITLE (#220)
raniceyue Apr 3, 2020
801950b
Fix result display bugs (#221)
raniceyue Apr 3, 2020
5b47469
Merge branch 'master' into master
zsoh97 Apr 4, 2020
1ca535c
Merge pull request #10 from AY1920S2-CS2103T-F09-4/master
zsoh97 Apr 4, 2020
bf52104
Fixed definition of trip to include name, daterange and location. imp…
zsoh97 Apr 4, 2020
0357b79
Merge branch 'master' of https://github.com/zsoh97/main
zsoh97 Apr 4, 2020
db7f4c3
fixed bug with date clash causing exception causing no trips to be ab…
zsoh97 Apr 4, 2020
75ac065
update to pass codacy
zsoh97 Apr 4, 2020
14c00a3
update to pass travis
zsoh97 Apr 4, 2020
13dd863
Implement exceptions for trips, Fix definition for trip, Fix status b…
zsoh97 Apr 4, 2020
02384b7
Implement refresh command (#224)
raniceyue Apr 4, 2020
96d490a
Make elements on home page scroll together (#225)
raniceyue Apr 4, 2020
b19514f
Touch up GUI (#227)
raniceyue Apr 5, 2020
d303406
Implement help window for home page (#228)
raniceyue Apr 5, 2020
f334a26
Add some screenshots to user guide (#229)
raniceyue Apr 5, 2020
a44c2e4
Merge remote-tracking branch 'AY1920S2-CS2103T-F09-4/master'
mikhailfaiz Apr 6, 2020
db47cee
fixed code to pass codacy
zsoh97 Apr 6, 2020
246f798
Merge branch 'master' of https://github.com/zsoh97/main
zsoh97 Apr 6, 2020
7f515d5
Merge pull request #11 from AY1920S2-CS2103T-F09-4/master
zsoh97 Apr 6, 2020
084c91f
Refactored code where triplist was unnecessarily passed between const…
zsoh97 Apr 6, 2020
6b0ef40
fixed number of activities and journal entries not displaying
zsoh97 Apr 7, 2020
48f7e64
Merge branch 'master' into master
vuhieunguyen Apr 7, 2020
ec1c4d1
Merge pull request #10 from AY1920S2-CS2103T-F09-4/master
vuhieunguyen Apr 7, 2020
a20e4b1
Merge remote-tracking branch 'AY1920S2-CS2103T-F09-4/master'
mikhailfaiz Apr 7, 2020
8ac98c2
Merge pull request #232 from zsoh97/master
zsoh97 Apr 7, 2020
399ea87
Update user guide with screenshots (#230)
raniceyue Apr 7, 2020
8ee2bab
Merge remote-tracking branch 'AY1920S2-CS2103T-F09-4/master'
mikhailfaiz Apr 7, 2020
a46e6c5
Merge pull request #11 from AY1920S2-CS2103T-F09-4/master
vuhieunguyen Apr 8, 2020
d4c4e7a
Refractor the code for JUnit testing. Added basic tests for Trip feature
vuhieunguyen Apr 8, 2020
53c96fa
Refractor the code for JUnit testing. Added basic tests for Trip feat…
vuhieunguyen Apr 9, 2020
a55fac3
Add screenshots to user guide (#235)
raniceyue Apr 9, 2020
eec0b4a
Implement help windows, Implement universal help command (#237)
raniceyue Apr 9, 2020
71bec29
refactoring
zsoh97 Apr 9, 2020
857b5ff
Merge branch 'master' into master
zsoh97 Apr 9, 2020
0f9b304
Merge pull request #12 from AY1920S2-CS2103T-F09-4/master
zsoh97 Apr 9, 2020
7a678ad
fixed build error from previous merge.
zsoh97 Apr 9, 2020
7290fda
Merge pull request #238 from zsoh97/master
zsoh97 Apr 9, 2020
e466d93
Update zsoh97.adoc
zsoh97 Apr 9, 2020
7d2d32a
Update zsoh97.adoc
zsoh97 Apr 9, 2020
c5d93db
Update UserGuide.adoc
zsoh97 Apr 9, 2020
d962afc
Merge remote-tracking branch 'AY1920S2-CS2103T-F09-4/master'
mikhailfaiz Apr 10, 2020
0586644
Updated UG: diagram titles, matched use cases to screenshots
mikhailfaiz Apr 10, 2020
db4cb14
Merge pull request #240 from mikhailfaiz/master
zsoh97 Apr 10, 2020
415f15a
Update UserGuide.adoc
zsoh97 Apr 10, 2020
342853a
Update UserGuide.adoc
zsoh97 Apr 10, 2020
ef9719b
Update UserGuide.adoc
zsoh97 Apr 10, 2020
7203c5c
Merge branch 'master' into master
zsoh97 Apr 10, 2020
679c759
Merge pull request #13 from AY1920S2-CS2103T-F09-4/master
zsoh97 Apr 10, 2020
d1ed9fe
Update UserGuide.adoc
zsoh97 Apr 10, 2020
c12c66c
Update UserGuide.adoc
zsoh97 Apr 10, 2020
59c4d7f
Update UserGuide.adoc
zsoh97 Apr 10, 2020
c755859
Update UserGuide.adoc
zsoh97 Apr 10, 2020
b453fce
Update UserGuide.adoc
zsoh97 Apr 10, 2020
ed8802e
implemented table for command summary, fixed releases link, added add…
zsoh97 Apr 10, 2020
0970305
Merge branch 'master' into master
vuhieunguyen Apr 10, 2020
3805cdc
Merge pull request #12 from AY1920S2-CS2103T-F09-4/master
vuhieunguyen Apr 10, 2020
3cb904e
Add files via upload
zsoh97 Apr 10, 2020
96d1ee5
Add files via upload
zsoh97 Apr 10, 2020
dac7413
Add files via upload
zsoh97 Apr 10, 2020
45818c8
Update DeveloperGuide.adoc
zsoh97 Apr 10, 2020
b4cfbad
Fix GUI bugs
Apr 10, 2020
e2cdc4f
Merge remote-tracking branch 'AY1920S2-CS2103T-F09-4/master'
mikhailfaiz Apr 10, 2020
d99d58a
Update DeveloperGuide.adoc
zsoh97 Apr 10, 2020
868972d
Add files via upload
zsoh97 Apr 10, 2020
a03fdcd
fixed bug where user could editing trips and activities to break func…
zsoh97 Apr 10, 2020
672451c
Merge branch 'master' of https://github.com/zsoh97/main
zsoh97 Apr 10, 2020
7577e3b
removed unnecessary files from images.
zsoh97 Apr 10, 2020
b63c6ae
Add NFR for DG, Updated use case to fit tutor feedback, Fix bug where…
zsoh97 Apr 10, 2020
c4dae61
Fix GUI bugs (#244)
raniceyue Apr 10, 2020
238a7f4
Added JUnit tests for most of Itinerary's Commands
vuhieunguyen Apr 10, 2020
0b58259
Fixed test to pass Travis
vuhieunguyen Apr 10, 2020
a9e4c77
Fixed code to pass Travis
vuhieunguyen Apr 10, 2020
f89951f
Fixed import to pass Travis
vuhieunguyen Apr 11, 2020
20360f6
Fixed code to pass Travis
vuhieunguyen Apr 11, 2020
1182b55
Fixed code to pass Travis
vuhieunguyen Apr 11, 2020
a1a84cc
Added JUnit tests for most of Itinerary's Commands (#245)
vuhieunguyen Apr 11, 2020
81f5a46
update UIClassDiagram
zsoh97 Apr 11, 2020
92a6391
Merge pull request #14 from AY1920S2-CS2103T-F09-4/master
zsoh97 Apr 11, 2020
3b31e5d
Merge remote-tracking branch 'AY1920S2-CS2103T-F09-4/master'
mikhailfaiz Apr 12, 2020
5202bc5
Added JUnit tests for most of Itinerary's parsers
vuhieunguyen Apr 12, 2020
4b1ef95
Added remaining JUnit tests for Itinerary's parsers
vuhieunguyen Apr 12, 2020
281ab15
Updated UG and DG
vuhieunguyen Apr 12, 2020
d407816
Added JUnit testing for itinerary Model and Storage.
zsoh97 Apr 12, 2020
8686757
commit to pass travis
zsoh97 Apr 12, 2020
4851813
Updated vuhieunguyen.adoc
vuhieunguyen Apr 12, 2020
f679c78
Added JUnit testing for itinerary model and storage. (#248)
zsoh97 Apr 12, 2020
77ebf56
Fix Journal bugs, update UG with exit command, correct command summa…
grrrrnt Apr 12, 2020
ece3979
Updated DG to centralise all diagrams
vuhieunguyen Apr 12, 2020
122a26f
Resolved merge conflict
vuhieunguyen Apr 12, 2020
c17980b
Resolved merge conflict for DG
vuhieunguyen Apr 12, 2020
8fdabaa
Added JUnit tests for Itinerary's parsers (#247)
vuhieunguyen Apr 12, 2020
8ce9a0c
Partial JUnit for Journal
mikhailfaiz Apr 12, 2020
af727ef
edit functionality lost after previous bug fix, reverting changes
zsoh97 Apr 12, 2020
3a9ea76
Merge branch 'master' into master
zsoh97 Apr 12, 2020
4118a27
Bug fix for edit functionality (#250)
zsoh97 Apr 12, 2020
5c58528
Fix UG screenshots, Remove Tag (#249)
raniceyue Apr 12, 2020
b9dfbc4
Merge remote-tracking branch 'AY1920S2-CS2103T-F09-4/master'
mikhailfaiz Apr 12, 2020
8e0c421
Auto stash before merge of "master" and "AY1920S2-CS2103T-F09-4/master"
mikhailfaiz Apr 12, 2020
8b640af
Resolved merge conflict
vuhieunguyen Apr 12, 2020
1a41d3f
Centralised images in UG and DG
vuhieunguyen Apr 12, 2020
21ec63a
Fixed code to pass Travis
vuhieunguyen Apr 12, 2020
d30dfe4
Fixed vuhieunguyen.adoc
vuhieunguyen Apr 12, 2020
40d124f
Updated UG and DG (#251)
vuhieunguyen Apr 12, 2020
fdb4486
Centralised all diagrams in UG
vuhieunguyen Apr 13, 2020
43c251c
Merge branch 'master' into master
vuhieunguyen Apr 13, 2020
4efdd5f
Centralised all diagrams in UG (#252)
vuhieunguyen Apr 13, 2020
ae64f06
Update UML diagrams in DG (#253)
grrrrnt Apr 13, 2020
e4bd950
Fix itinerary delete bug (#254)
raniceyue Apr 13, 2020
5cea767
Merge remote-tracking branch 'AY1920S2-CS2103T-F09-4/master'
mikhailfaiz Apr 13, 2020
7daab37
fixed json and itinerary not being saved accordingly
zsoh97 Apr 13, 2020
f7956db
Update DeveloperGuide.adoc
zsoh97 Apr 13, 2020
638c822
Remove AB3 diagrams, Add navigation summary diagram, Update Ranice's …
raniceyue Apr 13, 2020
4f41c5d
Add files via upload
zsoh97 Apr 13, 2020
3aff948
Merge branch 'master' of https://github.com/zsoh97/main
zsoh97 Apr 13, 2020
fd76a3e
Update DeveloperGuide.adoc
zsoh97 Apr 13, 2020
b520481
Merge pull request #14 from AY1920S2-CS2103T-F09-4/master
vuhieunguyen Apr 13, 2020
1bd81e0
update dg on add trip and sort function. fixed bug with storage. (#256)
zsoh97 Apr 13, 2020
651323a
Merge pull request #15 from AY1920S2-CS2103T-F09-4/master
vuhieunguyen Apr 13, 2020
14cfeec
Implementation for data storage (DG), fix spelling error in TripPageI…
grrrrnt Apr 13, 2020
8cb0e1c
Fix UG screenshots (#258)
raniceyue Apr 13, 2020
3f13e71
Fix feeling tag bug (#259)
grrrrnt Apr 13, 2020
d82cb66
Update DeveloperGuide.adoc
zsoh97 Apr 13, 2020
2fbffe9
update portfolio
zsoh97 Apr 13, 2020
d36ce0c
Updated DG with AddActivity and FindActivity commands implementation
vuhieunguyen Apr 13, 2020
9345177
Merge branch 'master' into master
vuhieunguyen Apr 13, 2020
67b0284
Updated DG with AddActivity and FindActivity commands implementation …
vuhieunguyen Apr 13, 2020
3186121
Rearranged DG (#261)
grrrrnt Apr 13, 2020
f9a33e6
Merge branch 'master' into master
zsoh97 Apr 13, 2020
1e56076
JUnit tests for Journal, PPP and UG updates
mikhailfaiz Apr 13, 2020
9be07d4
Merge pull request #15 from AY1920S2-CS2103T-F09-4/master
zsoh97 Apr 13, 2020
a12696f
Merge remote-tracking branch 'AY1920S2-CS2103T-F09-4/master'
mikhailfaiz Apr 13, 2020
5fde6d1
Merge pull request #262 from mikhailfaiz/master
mikhailfaiz Apr 13, 2020
d1a2025
Merge remote-tracking branch 'AY1920S2-CS2103T-F09-4/master'
mikhailfaiz Apr 13, 2020
be37547
Fix GUI bug on HOME page (#263)
raniceyue Apr 13, 2020
5982507
added delete and rf functions in DG
zsoh97 Apr 13, 2020
ab61c40
Merge remote-tracking branch 'AY1920S2-CS2103T-F09-4/master'
mikhailfaiz Apr 13, 2020
5ac1cf6
Add files via upload
zsoh97 Apr 13, 2020
0a4464b
removed unnecessary classes
zsoh97 Apr 13, 2020
53ec045
Merge branch 'master' of https://github.com/zsoh97/main
zsoh97 Apr 13, 2020
685ac6c
Update implementation in DG (#264)
raniceyue Apr 13, 2020
aae45c6
Update DeveloperGuide.adoc
zsoh97 Apr 13, 2020
37e679d
Merge pull request #265 from zsoh97/master
zsoh97 Apr 13, 2020
85194dd
Update zsoh97.adoc
zsoh97 Apr 13, 2020
fb5907c
Update sequence diagram in DG (#266)
raniceyue Apr 13, 2020
84c1437
Cleanup Javadocs and comments
mikhailfaiz Apr 13, 2020
e511f3f
Merge pull request #267 from mikhailfaiz/master
mikhailfaiz Apr 13, 2020
a66677b
Update DG with HelpWindow implementation (#268)
raniceyue Apr 13, 2020
88b5a6b
refactored code to fit liskov substitution principle.
zsoh97 Apr 13, 2020
a022be9
Merge branch 'master' of https://github.com/zsoh97/main
zsoh97 Apr 13, 2020
2a10177
Add coveralls badge to repo
raniceyue Apr 13, 2020
45cecd1
Merge remote-tracking branch 'AY1920S2-CS2103T-F09-4/master'
mikhailfaiz Apr 13, 2020
2a90623
Resolved merge conflict
vuhieunguyen Apr 13, 2020
15d9745
Resolved merge conflict
vuhieunguyen Apr 13, 2020
ab25367
merge conflict commit
zsoh97 Apr 13, 2020
2f75969
Update Ranice's PPP (#270)
raniceyue Apr 13, 2020
5b0d718
Merge pull request #269 from zsoh97/master
zsoh97 Apr 13, 2020
56cd604
Updated PPP
vuhieunguyen Apr 13, 2020
9d6312f
Update zsoh97.adoc
zsoh97 Apr 13, 2020
af7dc20
Add files via upload
zsoh97 Apr 13, 2020
70e709e
Update AboutUs.adoc and Ranice's PPP (#271)
raniceyue Apr 13, 2020
309810e
Fix bug where LEGEND does not appear on website
raniceyue Apr 13, 2020
7a88ba3
Update use cases in DG, appendix for manual testing formatting
mikhailfaiz Apr 13, 2020
4021635
Proof-read, review and format UG for v1.4 submission (#272)
grrrrnt Apr 13, 2020
5e52306
Updated PPP
vuhieunguyen Apr 13, 2020
282ab2c
Update use cases in DG, appendix for manual testing formatting (#273)
mikhailfaiz Apr 13, 2020
ac1b53a
Merge branch 'master' into master
vuhieunguyen Apr 13, 2020
975216b
Add files via upload
zsoh97 Apr 13, 2020
cc2adf6
Update Ranice's PPP (#274)
raniceyue Apr 13, 2020
37a2a8f
Update zsoh97.adoc
zsoh97 Apr 13, 2020
6f4cab7
Fix DG bugs (#275)
raniceyue Apr 13, 2020
72b115c
Update zsoh97.adoc
zsoh97 Apr 13, 2020
a16f2fd
Updated vuhieunguyen.adoc (#276)
vuhieunguyen Apr 13, 2020
2898c1d
fix reference in storage
zsoh97 Apr 13, 2020
deed1cc
Fix bugs in Ranice's PPP (#277)
raniceyue Apr 13, 2020
49781a1
Update zsoh97.adoc
zsoh97 Apr 13, 2020
7fa84fb
Fix bug where figure 14 does not appear
raniceyue Apr 13, 2020
c383fc9
Update Mik PPP
mikhailfaiz Apr 13, 2020
59eede2
Merge remote-tracking branch 'AY1920S2-CS2103T-F09-4/master'
mikhailfaiz Apr 13, 2020
0df7326
Update zsoh97.adoc
zsoh97 Apr 13, 2020
33b7b5a
ppp update
mikhailfaiz Apr 13, 2020
1e3ef65
pppppp
mikhailfaiz Apr 13, 2020
662527c
Merge pull request #278 from mikhailfaiz/master
mikhailfaiz Apr 13, 2020
91567d3
Update DG (#279)
grrrrnt Apr 13, 2020
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
  •  
  •  
  •  
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 trip 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 trips 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
24 changes: 9 additions & 15 deletions README.adoc
Original file line number Diff line number Diff line change
@@ -1,23 +1,18 @@
= Address Book (Level 3)
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]]


ifdef::env-github[]
image::docs/images/Ui.png[width="600"]
ifndef::env-github[]
image::images/volantLogo.jpg[width="500px"]
endif::[]

https://travis-ci.org/se-edu/addressbook-level3[image:https://travis-ci.org/AY1920S2-CS2103T-F09-4/main.svg?branch=master[Build Status]]
image:https://api.codacy.com/project/badge/Grade/88d0a6f6f3d54309a5fd560383e7f780[link="https://app.codacy.com/gh/AY1920S2-CS2103T-F09-4/main?utm_source=github.com&utm_medium=referral&utm_content=AY1920S2-CS2103T-F09-4/main&utm_campaign=Badge_Grade_Dashboard"]

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.
* This is a simple travel planning application to assist beginner solo travellers with the logistics of their travels.
* It has a GUI but most of the user interactions happen using a CLI (Command Line Interface).
* It is written in Java 11 using object oriented programming.

== Site Map

Expand All @@ -29,8 +24,7 @@ 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_.
* This application's base code is based off the Address Book application developed by the CS2103T team for the CS2103T software engineering module.
* Libraries used: https://openjfx.io/[JavaFX], https://github.com/FasterXML/jackson[Jackson], https://github.com/junit-team/junit5[JUnit5]

== Licence : link:LICENSE[MIT]
9 changes: 4 additions & 5 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -67,8 +67,7 @@ dependencies {
}

shadowJar {
archiveName = 'addressbook.jar'

archiveName = 'volant.jar'
destinationDir = file("${buildDir}/jar/")
}

Expand Down Expand Up @@ -133,9 +132,9 @@ asciidoctor {
idprefix: '', // for compatibility with GitHub preview
idseparator: '-',
'site-root': "${sourceDir}", // must be the same as sourceDir, do not modify
'site-name': 'AddressBook-Level3',
'site-githuburl': 'https://github.com/se-edu/addressbook-level3',
'site-seedu': true, // delete this line if your project is not a fork (not a SE-EDU project)
'site-name': 'Volant by CS2103T-F09-4',
'site-githuburl': 'https://github.com/AY1920S2-CS2103T-F09-4/main',
/*'site-seedu': true, // delete this line if your project is not a fork (not a SE-EDU project)*/
]

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

AddressBook - Level 3 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} +
Volant was developed by us. +

We are a team based in the http://www.comp.nus.edu.sg[School of Computing, National University of Singapore].

Learn more about us below.

== 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>>]
=== Ranice Tan
image::raniceyue.png[width="150", align="left"]
{empty}[https://github.com/raniceyue[github]] [<<raniceyue#, portfolio>>]

Role: Project Advisor
Role: Team Lead +
Responsibilities:

'''

=== John Roe
image::lejolly.jpg[width="150", align="left"]
{empty}[http://github.com/lejolly[github]] [<<johndoe#, portfolio>>]
=== Grant Lee
image::grrrrnt.png[width="200", align="left"]
{empty}[https://github.com/grrrrnt[github]] [<<grrrrnt#, portfolio>>]

Role: Team Lead +
Responsibilities: UI
Role: Developer +
Responsibilities:

'''

=== Johnny Doe
image::yijinl.jpg[width="150", align="left"]
{empty}[http://github.com/yijinl[github]] [<<johndoe#, portfolio>>]
=== Zeke Soh
image::zsoh97.png[width="200", align="left"]
{empty}[https://github.com/zsoh97[github]] [<<zsoh97#, portfolio>>]

Role: Developer +
Responsibilities: Data
Responsibilities:

'''

=== Johnny Roe
image::m133225.jpg[width="150", align="left"]
{empty}[http://github.com/m133225[github]] [<<johndoe#, portfolio>>]
=== Vu Hieu Nguyen
image::vuhieunguyen.png[width="200", align="left"]
{empty}[https://github.com/vuhieunguyen[github]] [<<vuhieunguyen#, portfolio>>]

Role: Developer +
Responsibilities: Dev Ops + Threading
Responsibilities:

'''

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

Role: Developer +
Responsibilities: UI
Responsibilities:

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

* *Bug reports, Suggestions* : Post in our https://github.com/se-edu/addressbook-level3/issues[issue tracker] if you noticed bugs or have suggestions on how to improve.
* *Bug reports, Suggestions* : Post in our https://github.com/AY1920S2-CS2103T-F09-4/main/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`
6 changes: 3 additions & 3 deletions docs/DevOps.adoc
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
= AddressBook Level 3 - Dev Ops
= Volant - Dev Ops
:site-section: DeveloperGuide
:toc:
:toc-title:
Expand All @@ -12,7 +12,7 @@ ifdef::env-github[]
:note-caption: :information_source:
:warning-caption: :warning:
endif::[]
:repoURL: https://github.com/se-edu/addressbook-level3/tree/master
:repoURL: https://github.com/AY1920S2-CS2103T-F09-4/main

== Build Automation

Expand All @@ -34,7 +34,7 @@ When a pull request has changes to asciidoc files, you can use https://www.netli

Here are the steps to create a new release.

. Update the version number in link:{repoURL}/src/main/java/seedu/address/MainApp.java[`MainApp.java`].
. Update the version number in link:{repoURL}/src/main/java/seedu/location/MainApp.java[`MainApp.java`].
. Generate a JAR file <<UsingGradle#creating-the-jar-file, using Gradle>>.
. Tag the repo with the version number. e.g. `v0.1`
. https://help.github.com/articles/creating-releases/[Create a new release using GitHub] and upload the JAR file you created.
Expand Down
Loading