forked from se-edu/addressbook-level4
-
Notifications
You must be signed in to change notification settings - Fork 69
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
[v1.5][W11-B4] StardyTogether #82
Open
yeggasd
wants to merge
1,220
commits into
nus-cs2103-AY1718S2:master
Choose a base branch
from
CS2103JAN2018-W11-B4:master
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
1220 commits
Select commit
Hold shift + click to select a range
1a3a4e6
Fix checkstyle
jingyinno 306126e
Merge branch 'master' into alias-list-11Apr
jingyinno 456957c
Modify test files to binary format
caijun7 56b484f
Remove encrypted file
caijun7 a767a64
Remove encrypted file
caijun7 65be8df
Merge branch 'master' of https://github.com/CS2103JAN2018-W11-B4/addr…
caijun7 ee15b1d
Modify checkstyle to ignore newline at EOF for XML files
caijun7 ab9338d
Change to binary file
caijun7 925dcf2
Remove files
caijun7 4a3ad84
Update test password
caijun7 22585cb
Improve code quality
caijun7 4b2804c
Add PersonDetailsCardTest
yeggasd b07fa4b
Improve Code Quality
yeggasd 6f31153
Merge branch 'master' into alias-list-11Apr
jingyinno d51c236
fix codacy issues
jingyinno dbbc01f
remove unused imports
jingyinno 5db70ef
Remove unused imports
yeggasd c8f5cb5
Create new event to refresh ui
jingyinno 76d9e85
remove construct as codacy suggested
jingyinno 976d2ec
Add Defensive Programming and Refactor
yeggasd b2486e7
Add Collate
yeggasd a9d0e42
Remove unused Lines
yeggasd 409979b
Rename Variables used
yeggasd 4aa7886
Add more sample data
yeggasd d16ea49
Change comment
yeggasd 47b273d
Refactorof PasswordUImanager to take advantage of Polymorphism
yeggasd 34cbda3
Merge pull request #231 from jingyinno/alias-list-11Apr
jingyinno da4def1
Merge pull request #28 from CS2103JAN2018-W11-B4/master
jingyinno efe47a8
Fix test cases error
caijun7 726898e
Merge branch 'master' of https://github.com/CS2103JAN2018-W11-B4/addr…
caijun7 7b04988
Fix errors due to merge conflicts
caijun7 e952804
Remove redundant clean up
caijun7 e76f08f
Fix checkstyle
caijun7 de72570
Improve code quality
caijun7 c8bbcc3
Refactor code
caijun7 784156f
Fix checkstyle
caijun7 22e34e8
alias sys test
jingyinno 55b43c8
Remove redundant codes
caijun7 37d4308
fix undo redo test
jingyinno ba0c562
change assert design to take in alias object
jingyinno 606ba27
fix infoPanel throwing error
jingyinno dceeba4
Add test cases for GoogleDriveStorage
caijun7 666089f
new gui alias list test
jingyinno 8cee3ef
unalias system test skeleton
jingyinno a042d01
annotate test
jingyinno 0995682
Add alias sys test
jingyinno f7b2c8b
rename method and change comments --> method clears both persons and …
jingyinno 0d960c8
make sorted alias list
jingyinno 2f3e567
fix check style
jingyinno 683d83c
Add PasswordCommandSystemTest
yeggasd 6fd48e9
Fix Import ordering
yeggasd 59ccb00
Add RemovePasswordCommandSystemTest
yeggasd 35508fd
Remove unused variable
yeggasd 4ef7b92
Merge branch 'master' of https://github.com/CS2103JAN2018-W11-B4/main…
yeggasd 71b7801
Add system tests for import, export, and upload commands
caijun7 a399cde
Fix Comments
yeggasd 5802377
Fix checkstyle
caijun7 3c25363
Improve code quality
caijun7 50c403a
Remove redundant file
caijun7 ad91565
Merge pull request #230 from Caijun7/ExportCommand
caijun7 f1b7ad0
update unalias sys test skeleton
jingyinno 4278a0b
Merge pull request #29 from jingyinno/alias-list-gui-test
jingyinno a240674
Merge pull request #30 from jingyinno/unalias-sys-test-skeleton
jingyinno c1a2720
Refactoring of code
262fc9b
Merge branch 'master' of https://github.com/CS2103JAN2018-W11-B4/main…
yeggasd 320287e
Update Collate
yeggasd 0ac43a9
unique alias list test
jingyinno bdae4ca
alias model test
jingyinno 7c93c7a
update user guide
jingyinno 1e4e96a
update alias command parser for new commands
jingyinno 4c98e88
add alias command system tests
jingyinno 29e8586
Merge branch 'master-with-failingRedo' of https://github.com/jingyinn…
jingyinno 94b8f39
Fix alias sorting
jingyinno 0e2bb4b
refactor sorting method
jingyinno 0d66858
parserUtilTest
jingyinno 2a81734
MapCommand Equals test
jingyinno ca9fd8c
Merge branch 'master-with-failingRedo' of https://github.com/jingyinn…
jingyinno 3170bd2
alias list test
jingyinno bfa0115
Fix english
cdd655f
Refactoring of setStyle method
yeggasd d9a8614
Change conversion of OddEven to index
yeggasd aabd314
Fix collate
yeggasd 8ef17ab
Update JavaDoc
yeggasd f5df6a8
Add collate
yeggasd 60f7f29
Change birthday list to be scrollable
9c6e56e
add unalias system test
jingyinno 06f1c6e
Refactor toBack()
yeggasd 93bc64c
Make capitalize to only first letter Caps
yeggasd d8ef8a0
Add StringUtil test
yeggasd c3d57b1
Add ParserUtilTest
yeggasd 8496b3f
Refactor Setstyle
yeggasd 5d92579
move mapCommand parsing to parserUtil
jingyinno c66f132
Merge branch 'master-with-failingRedo' of https://github.com/jingyinn…
jingyinno 8dd4ba2
Improve code quality
yeggasd fe819d4
Remove extra space
yeggasd 170069a
Modify tests, correct wrong exception thrown, correct english
031bd99
fix check style
jingyinno b6bdcbc
Merge pull request #228 from yeggasd/Production
yeggasd a91842d
Merge pull request #31 from CS2103JAN2018-W11-B4/master
jingyinno 0c51ca6
Rename AddressBook to StardyTogether
caijun7 2e1835a
Update collate
caijun7 40e55d2
Merge branch 'master' of https://github.com/CS2103JAN2018-W11-B4/addr…
bc3dbfa
Merge branch 'master' of https://github.com/jingyinno/addressbook-lev…
jingyinno 29028d8
Update developer guide
jingyinno 16dabbe
Merge pull request #234 from AzuraAiR/FinalImprovementVRC
bcb9552
Add new section, edit several commmands
3919538
Merge branch 'master' of https://github.com/CS2103JAN2018-W11-B4/addr…
5536072
Correct formatting
5922769
Add line
412afac
Attempt to correct table formatting
794e3e4
Update DeveloperGuide
yeggasd d1a9204
Add new sections, manual numbering in table
2c0229c
Fix White Text Yellow Background
yeggasd 4f667c5
Merge branch 'master' into DeveloperGuide-update
yeggasd c21ddf5
Merge branch 'master' into Production
yeggasd b9fbae7
Merge branch 'master-with-failingRedo' of https://github.com/jingyinn…
jingyinno 73c5f79
Merge pull request #235 from yeggasd/Production
yeggasd 771b2af
Merge pull request #236 from yeggasd/master
yeggasd 8d2e710
Merge branch 'master' into master
yeggasd 88990a7
Update Developer guide
caijun7 9b93323
Merge branch 'master' of https://github.com/CS2103JAN2018-W11-B4/addr…
caijun7 abde8f7
Merge branch 'master' into DeveloperGuide-update
caijun7 00a40e1
Update Developer guide
caijun7 ecaf17a
Merge pull request #232 from Caijun7/DeveloperGuide-update
caijun7 0a5bad8
Merge branch 'master' of https://github.com/CS2103JAN2018-W11-B4/addr…
caijun7 fc05222
Merge pull request #237 from Caijun7/DeveloperGuide-update
caijun7 9a09713
refactor info panel method
jingyinno 3839cad
Change commands to "You" wording
c809e7c
Correct formatting for warning dialogs
ead7680
Merge branch 'master' of https://github.com/CS2103JAN2018-W11-B4/addr…
6242fe0
Change all instances of person in UG to friend
a4de846
Failing tests
jingyinno 047ab8e
Update birthdays images
496af9f
Correct typo
3522c6e
Merge branch 'master' into master-with-failingRedo
jingyinno f3ec2ac
Correct typo
84b1629
Fix checkstyle
jingyinno feaad71
Merge branch 'master-with-failingRedo' of https://github.com/jingyinn…
jingyinno 677f0c0
Italize version numbers, added content to upcoming features
1737a21
Correct formatting
5861614
Improve english
46cac33
rename
jingyinno a178980
fix checkstyle
jingyinno b42a4e7
Fix checkstyle
jingyinno 185e0bb
Fix checkstyle
jingyinno 8ce1573
Merge pull request #238 from jingyinno/master-with-failingRedo
jingyinno a58da44
Update developer guide
jingyinno 727714f
Merge branch 'master' into master
acbf5b7
Add diagrams
caijun7 dd3b3d1
Merge branch 'master' of https://github.com/CS2103JAN2018-W11-B4/addr…
caijun7 61f6821
Fix bug
caijun7 6f1e032
Add and modify test
581383c
Update ver number
3cfd398
Update collate
d1d9c66
Resolve merge conflict
e8a9846
Update collate
82b7306
Merge branch 'master' of https://github.com/CS2103JAN2018-W11-B4/addr…
ca13518
Merge branch 'master' of https://github.com/AzuraAiR/addressbook-level4
fbf4df2
Add sequence diagram
caijun7 2cdb43f
Update DG
jingyinno 84c2b38
Merge branch 'master' into master-with-failingRedo
jingyinno ee6069f
Merge pull request #240 from Caijun7/DeveloperGuide-update
caijun7 c8692f1
Merge branch 'master' into master-with-failingRedo
jingyinno 3633d56
Add code snippets
3b7dc54
Merge branch 'master' of https://github.com/CS2103JAN2018-W11-B4/addr…
9ff4c58
Merge branch 'master' into FinalImprovementVRC
a0ad363
Add tip
1c3b64b
Fix alias bug
jingyinno 5755736
Merge branch 'master-with-failingRedo' of https://github.com/jingyinn…
jingyinno 78864fc
Update user guide
caijun7 a2630dd
Fix checkstyle
jingyinno 2174981
Modify diagrams
caijun7 9420eda
update main code comments
jingyinno 5dd5efa
Merge branch 'master-with-failingRedo' of https://github.com/jingyinn…
jingyinno 5a9c185
Update collated
caijun7 aa76682
Merge branch 'master' of https://github.com/CS2103JAN2018-W11-B4/addr…
caijun7 7c1a675
fix check style
jingyinno f768d14
Merge pull request #239 from AzuraAiR/master
e834417
Update developer guide
caijun7 347755e
Merge branch 'master' of https://github.com/CS2103JAN2018-W11-B4/addr…
caijun7 77efcbf
Merge branch 'master' into FinalImprovementVRC
15f1118
Merge pull request #243 from Caijun7/DeveloperGuide-update
caijun7 58cf73f
Merge branch 'master' into FinalImprovementVRC
c3be5a9
Merge branch 'master' into master-with-failingRedo
jingyinno 009204c
Fix no labels
caijun7 6b325ab
Merge branch 'master' of https://github.com/CS2103JAN2018-W11-B4/addr…
caijun7 cb87db8
Update collate
786965e
Merge pull request #241 from AzuraAiR/FinalImprovementVRC
d08a1ca
Merge branch 'master' into master-with-failingRedo
jingyinno 1250e60
Remove "more to be added" and update future feature
caijun7 e51f54f
Merge branch 'master' of https://github.com/CS2103JAN2018-W11-B4/addr…
caijun7 668cdad
Update dg
caijun7 d75c874
Merge branch 'master' of https://github.com/CS2103JAN2018-W11-B4/addr…
22f2b8d
Add diagram and update ppp.
bf257c6
update ui image
jingyinno 0c24493
Merge pull request #242 from jingyinno/master-with-failingRedo
jingyinno 3f862af
update comments in test components
jingyinno 02365ca
Merge branch 'master-with-failingRedo' of https://github.com/jingyinn…
jingyinno 177c3ce
Reupdate collate
6cdacc1
Merge branch 'master' into master
d2184fc
Merge branch 'master' into master-with-failingRedo
jingyinno d8a9420
Update DG
yeggasd 966251b
Update dg
caijun7 4ec9b73
Update PPP
yeggasd e41885d
Merge branch 'master' of https://github.com/CS2103JAN2018-W11-B4/addr…
caijun7 d7d79b8
Reupdate collate
b9e6776
Merge branch 'master' of https://github.com/AzuraAiR/addressbook-level4
6642c92
fix userguide formatting
jingyinno a008ced
Merge branch 'master-with-failingRedo' of https://github.com/jingyinn…
jingyinno 43e2122
Reupdate collate
a0d13b8
update dg
caijun7 7430786
Merge pull request #244 from Caijun7/DeveloperGuide-update
caijun7 1dfbc66
Merge branch 'master' into master-with-failingRedo
jingyinno a891526
Merge branch 'master' into master
6febb8a
Merge pull request #246 from jingyinno/master-with-failingRedo
jingyinno 7b2cdfe
Merge branch 'master' into master
582c61c
Add Manual Testing for encrypt decrypt and select
yeggasd 43fd51b
Merge pull request #245 from AzuraAiR/master
ae035af
Merge branch 'master' into Production
yeggasd 200dabb
update dg
caijun7 02712eb
Merge branch 'master' of https://github.com/CS2103JAN2018-W11-B4/addr…
caijun7 f2798db
Merge pull request #247 from yeggasd/Production
yeggasd e80c6a7
Update dg
caijun7 564a1b0
Update dg
caijun7 0a1defc
Merge pull request #32 from CS2103JAN2018-W11-B4/master
jingyinno 24ac62a
Merge pull request #248 from Caijun7/DeveloperGuide-update
caijun7 24658d4
Final collate
jingyinno 6a134fb
Merge branch 'master' into master
jingyinno de27134
Add sections
a519b7d
Update DG
yeggasd 40494cc
Merge branch 'master' into master
6cdbc0b
Update PPP
yeggasd ce03243
Remove trailing whitespace
a011769
Merge branch 'master' into master
yeggasd 0b0943b
Merge pull request #251 from yeggasd/master
yeggasd 8628b5e
Merge branch 'master' into master
yeggasd dd90c8b
Merge branch 'master' into master
a47f0be
Update UG
4b34348
Merge branch 'master' of https://github.com/AzuraAiR/addressbook-level4
32c4094
Merge pull request #250 from AzuraAiR/master
e147ab3
Merge branch 'master' into master
yeggasd c63d8f7
Merge pull request #249 from jingyinno/master
yeggasd 23451c5
Fix broken link
11358c2
Merge branch 'master' into Production
yeggasd 6bf72e4
Merge pull request #252 from yeggasd/Production
yeggasd 2c0792b
Merge branch 'master' of https://github.com/CS2103JAN2018-W11-B4/main
a67ac3c
Merge pull request #253 from AzuraAiR/master
692fd0a
Merge pull request #33 from CS2103JAN2018-W11-B4/master
jingyinno 8bb43fb
update dg
jingyinno 1a86375
Merge pull request #259 from jingyinno/master
jingyinno File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,10 +1,10 @@ | ||
= Address Book (Level 4) | ||
= StardyTogether | ||
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/CS2103JAN2018-W11-B4/main[image:https://travis-ci.org/CS2103JAN2018-W11-B4/main.svg?branch=master[Build Status]] | ||
https://ci.appveyor.com/project/yeggasd/main[image:https://ci.appveyor.com/api/projects/status/kc7eo8888cc960u0?svg=true[Build status]] | ||
https://coveralls.io/github/CS2103JAN2018-W11-B4/main?branch=master[image:https://coveralls.io/repos/github/CS2103JAN2018-W11-B4/main/badge.svg?branch=master[Coverage Status]] | ||
https://app.codacy.com/app/yeggasd/main[image:https://api.codacy.com/project/badge/Grade/81c0e706007944e881b2290412d87325[Codacy Badge]] | ||
https://gitter.im/se-edu/Lobby[image:https://badges.gitter.im/se-edu/Lobby.svg[Gitter chat]] | ||
|
||
ifdef::env-github[] | ||
|
@@ -15,19 +15,15 @@ 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. | ||
* This is a desktop Address Book application for students studying in NUS (National University of Singapore). | ||
* Manage the contacts of your friends in University, keep track of your friends' Birthdays, find the location of your lecture venues! | ||
* Share useful information with your friends who are taking the same modules and find a common studying time! | ||
* StardyTogether has a GUI (Graphic User Interface) but most of the user interactions happen using a CLI (Command Line Interface). | ||
|
||
== Site Map | ||
|
||
* <<UserGuide#, User Guide>> | ||
* <<DeveloperGuide#, Developer Guide>> | ||
* <<LearningOutcomes#, Learning Outcomes>> | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Good job removing irrelevant sections |
||
* <<AboutUs#, About Us>> | ||
* <<ContactUs#, Contact Us>> | ||
|
||
|
@@ -36,5 +32,6 @@ endif::[] | |
* 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/TomasMikula/EasyBind[EasyBind], 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/junit4[JUnit4] | ||
* Source code is from AddressBook-Level4 project created by SE-EDU initiative at https://github.com/se-edu/ | ||
|
||
== Licence : link:LICENSE[MIT] |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,16 @@ | ||
# AzuraAiR-reused | ||
###### /java/seedu/address/storage/StorageManager.java | ||
``` java | ||
@Override | ||
public void backupAddressBook(ReadOnlyAddressBook addressBook) throws IOException, WrongPasswordException { | ||
logger.fine("Attempting to write to backup data file: "); | ||
addressBookStorage.backupAddressBook(addressBook); | ||
} | ||
``` | ||
###### /java/seedu/address/storage/XmlAddressBookStorage.java | ||
``` java | ||
@Override | ||
public void backupAddressBook(ReadOnlyAddressBook addressBook) throws IOException, WrongPasswordException { | ||
saveAddressBook(addressBook, filePath + ".backup"); | ||
} | ||
``` |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Just noticed that your mock UI has the name "Address App" :P