forked from se-edu/addressbook-level4
-
Notifications
You must be signed in to change notification settings - Fork 110
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
[W7.7][T10-B1] AcquaiNote #70
Open
Hailinx
wants to merge
447
commits into
nus-cs2103-AY1718S1:master
Choose a base branch
from
CS2103AUG2017-T10-B1: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 73 commits
Commits
Show all changes
447 commits
Select commit
Hold shift + click to select a range
d5c276e
Merge pull request #59 from qihao27/master
Hailinx c8699f6
Edit build.gradle fro building jar file
Hailinx 865e823
Enhance Select command
Hailinx a536a2b
Update code style
Hailinx d004ecd
Merge branch 'master' into master
Hailinx 8f7ec4b
Add export command
qihao27 265e2fa
Add Junit Test
qihao27 ea8c7de
Merge branch 'master' into master
qihao27 d1e18ff
Update ExportCommandTest.java
qihao27 9dc41eb
Update ExportCommandParserTest.java
qihao27 ea73f3b
Merge pull request #63 from qihao27/master
Hailinx d79ca10
Update docs: update roles, README, sort implementation
qihao27 463cf95
Merge branch 'master' of https://github.com/qihao27/addressbook-level4
qihao27 9e2ed9b
Merge branch 'master' into master
qihao27 ae823b0
Add collate comment
qihao27 937b22b
Rectify style issue
qihao27 d565ce9
Todo command
Hailinx 358947e
Change getTodoItem() to return a unmodifiableList
Hailinx c6ca876
Fix the bug: when "undo", UI is not updated.
Hailinx 9138485
Add constraints when constructing TodoItem class
Hailinx 351852e
Merge pull request #64 from qihao27/master
Hailinx 64ab6bf
Add new command "switch"
Hailinx 47714d6
Implement new command "switch"
Hailinx f2f428d
Merge branch 'master' into master
Hailinx 0f3a3b6
Update annotations and codestyle
Hailinx 083aede
Merge branch 'master' of https://github.com/Hailinx/addressbook-level4
Hailinx b8e6e67
Merge branch 'master' into master
Hailinx 6c8820c
Merge branch 'master' into master
Hailinx 5571bcc
Delete trailing whitespace
Hailinx c1ace68
Modify codestyle
Hailinx f130625
Update SelectCommandSystemTest.java
Hailinx 0a86db5
Merge pull request #60 from Hailinx/master
qihao27 5b3055c
Added JUnit tests for FavouriteCommand
aaronyhsoh 29efbf8
Merge branch 'master' of https://github.com/aaronyhsoh/addressbook-le…
aaronyhsoh a2679e8
Collating
aaronyhsoh 055d0c9
Merge branch 'master' into master
aaronyhsoh 3065fa1
Merge branch 'master' into master
aaronyhsoh 2311676
Update AddressBookParser.java
aaronyhsoh e3c12b8
Rectifying Travis CI build fail
aaronyhsoh f4a52f5
Merge branch 'master' of https://github.com/aaronyhsoh/addressbook-le…
aaronyhsoh d66d6f9
Merge pull request #6 from CS2103AUG2017-T10-B1/master
Hailinx 054d974
Add collate comments
Hailinx 0746e70
Creates .md file after adding collate comments
Hailinx ca022d6
collate
aaronyhsoh a423705
rectify checkstyle errors
aaronyhsoh 75c32f0
Merge pull request #57 from aaronyhsoh/master
Hailinx 73b3609
Merge pull request #7 from CS2103AUG2017-T10-B1/master
Hailinx 1a67d1c
Update code style
Hailinx 539c3f0
Merge pull request #68 from Hailinx/master
qihao27 0bb0164
Merge pull request #2 from CS2103AUG2017-T10-B1/master
qihao27 22bb411
Change favourite person visual effect
qihao27 e34e914
Update Junit test for "todo" and "switch" command
Hailinx 11cf879
Merge pull request #69 from qihao27/master
Hailinx b5cdcdf
Merge branch 'master' into master
Hailinx d01fd28
Merge pull request #70 from Hailinx/master
qihao27 8409377
Update user guide
Hailinx 2772f12
Merge branch 'master' of https://github.com/Hailinx/addressbook-level4
Hailinx 30192ec
Update collate
Hailinx fb00e9e
Merge branch 'master' into master
Hailinx c6d9e57
Merge pull request #73 from Hailinx/master
qihao27 679d589
Merge pull request #8 from CS2103AUG2017-T10-B1/master
Hailinx 79c8170
Bug fix on export command
qihao27 095d6a0
Merge branch 'master' into master
qihao27 87be695
Merge pull request #77 from qihao27/master
Hailinx ae12738
Update collate comments
qihao27 0120f37
Added todo list count in person card
qihao27 13c52bd
Resolving conflict
qihao27 42a8a07
Rectify style issue
qihao27 2e7e048
Merge branch 'master' into master
qihao27 7f3dcb9
Update Junit test and collate comments
qihao27 07547de
Merge branch 'master' of https://github.com/qihao27/addressbook-level4
qihao27 fa426e3
Improve test coverage
qihao27 e43b6ab
Rectified bug in FavouriteCommand
aaronyhsoh 8060012
Rectify style issue
qihao27 dba6ce9
Change app name
qihao27 3c4fc2a
Fix two bugs
Hailinx 69e73cf
Merge branch 'master' into master
Hailinx c01104a
Update code style
Hailinx 02729f7
Merge branch 'master' of https://github.com/Hailinx/addressbook-level4
Hailinx ad30a28
update collates and modify errors in test cases
Hailinx 813fea5
Attemp to increase test coverage
qihao27 286057a
Attemp to inprove test coverage and codacy
qihao27 8059b85
Update JUnit tests for UI "TodoCard" and "TodoPanel"
Hailinx 73fd6f7
Update code quality
Hailinx 1923d0f
Add test file: UniqueTodoListTest.java
qihao27 95b7586
Update code quality
Hailinx 4209401
update code quality
Hailinx 3a94973
Update Developer Guide for "todo" and "select" command
Hailinx 17610aa
Merge pull request #79 from Hailinx/master
Hailinx cdfd876
Update UniqueTodoList and its coverage
qihao27 c44af62
Merge branch 'master' into master
qihao27 765f46d
Resolve conflict
qihao27 dd181be
Merge branch 'master' into master
Hailinx 39d3505
Merge branch 'master' of https://github.com/qihao27/addressbook-level4
qihao27 c03228e
Update collate
qihao27 e2bea7d
Rectify style issue
qihao27 95d0ff9
Add Project Portfolio
Hailinx d34049b
Merge branch 'master' into master
Hailinx 0bb4f95
Merge pull request #78 from qihao27/master
qihao27 5635f40
Merge branch 'master' into master
Hailinx e23bf7f
Enhanced Undo command
aaronyhsoh 1eca771
Enhanced Redo Command
aaronyhsoh a30defe
Updated user guide
aaronyhsoh 3e7d80a
Merge pull request #81 from Hailinx/master
aaronyhsoh f165170
Changed tag colour
aaronyhsoh 9a85034
Collated code
aaronyhsoh 997a19a
update developr guide
aaronyhsoh 742430e
Update developer guide
aaronyhsoh 79de445
Update DeveloperGuide.adoc
aaronyhsoh de6e7e2
Add sequence diagram for favourite command
aaronyhsoh 5a57a09
Added sequence diagram to developer guide
aaronyhsoh 45cd09e
Merge pull request #3 from CS2103AUG2017-T10-B1/master
qihao27 d380077
Add PPP
qihao27 c687637
Resolve conflict
qihao27 3a1ee4c
Merge pull request #84 from qihao27/master
Hailinx 83ff68e
Added project portfolio
aaronyhsoh cafe957
Rename Aaron Soh to AaronSoh.adoc
aaronyhsoh 66b0790
Rectified checkstyle errors
aaronyhsoh ce294d0
Merge branch 'master' of https://github.com/aaronyhsoh/addressbook-le…
aaronyhsoh ffa8d3c
Merge branch 'master' into master
aaronyhsoh 6ed9967
Merge branch 'master' into master
aaronyhsoh 234bd87
Rectifying travis error
aaronyhsoh 4bb4009
rectify travis
aaronyhsoh 298be3d
Merge pull request #85 from aaronyhsoh/master
Hailinx 3b3140b
Merge pull request #9 from CS2103AUG2017-T10-B1/master
Hailinx b4a4f21
recollate the whole project
Hailinx 3d7f024
Merge pull request #86 from Hailinx/master
Hailinx d639625
Merge pull request #1 from CS2103AUG2017-T10-B1/master
aaronyhsoh 0fd0432
change the position of fav star
Hailinx 81825ba
Small changes to result display and icon position
qihao27 7c65478
Update sort command: small changes to result display
qihao27 7038851
Refine DeleteByName command
qihao27 113db10
Update app status URL in README
qihao27 87b2147
Merge branch 'master' into master
qihao27 819a1eb
Merge branch 'master' into master
qihao27 00d43b5
Update DeleteByNameCommand.java
qihao27 5704e3d
Update DeleteByNameCommandParser.java
qihao27 82285ff
Update DeleteByNameCommandTest.java
qihao27 f233816
Update ParserUtilTest.java
qihao27 e75051b
Improve coverage
qihao27 abdc83d
Merge branch 'master' of https://github.com/qihao27/addressbook-level4
qihao27 195c1c2
Rectify style issue
qihao27 43bb9ed
Merge pull request #93 from qihao27/master
Hailinx 9a79839
Added switch buttons
qihao27 6786e46
Merge branch 'master' into master
qihao27 26202e4
Update PersonListCard.fxml
qihao27 b7c5907
Update PersonListCard.fxml
qihao27 5b946e0
fix the bug when delete a todo item the index may be out of boundary
Hailinx 379b3a0
fix the bug when "lock" or "unlock", the ui will be resized
Hailinx bccb45b
fix the bug after locking, users cannot use "exit" command
Hailinx be257ae
Merge branch 'master' into master
Hailinx 0ff8a2e
Merge branch 'master' into master
Hailinx 7158e31
Update PersonListCard.fxml
qihao27 6f76247
add systemtest for find command
Hailinx d52e195
Enhance DeleteByName command and its test
qihao27 15b6d34
Conflict issue
qihao27 a2b765d
Merge branch 'master' of https://github.com/Hailinx/addressbook-level4
Hailinx 227ca42
Improve code quality
qihao27 8bf6fab
Improve code
qihao27 f722aea
improve junit test and code style
Hailinx b9c9cca
Merge pull request #99 from Hailinx/master
qihao27 f900783
Merge branch 'master' into master
qihao27 0a0c835
Merge branch 'master' into master
qihao27 97a7125
Merge pull request #101 from qihao27/master
Hailinx 8a7c0ab
Merge pull request #4 from CS2103AUG2017-T10-B1/master
qihao27 9b16917
Update screenshot and minor changes in favouriteStar position
qihao27 679294b
Merge pull request #102 from qihao27/master
Hailinx 0a331d2
Merge pull request #10 from CS2103AUG2017-T10-B1/master
Hailinx 9b83e6b
Update collate
qihao27 48bd902
Update docs
qihao27 6fe70f4
Merge branch 'master' into master
qihao27 f48d0cb
Update DG
aaronyhsoh 047a198
Update code quality
Hailinx 7b92e56
Update collate
Hailinx 78a98fb
Update code
Hailinx 2fbdd84
Edit comment
Hailinx c87613e
Update code style
Hailinx 5e33b7a
Add JUnit test for new changes
Hailinx 59af94f
Add SampleData and TestScript template.
Hailinx 38b611d
Update code
Hailinx fea187d
update quality
Hailinx d5ba22b
Update code
Hailinx 3906e4b
Edit comment
Hailinx 2897709
Edit comment
Hailinx cc4f6d6
update code
Hailinx a1f0a89
edit comment
Hailinx 4b1d20d
Add comment
Hailinx f81cd4b
add @Ignore otherwise, there is error: seedu.address.ui.BrowserPanelT…
Hailinx 4a90f2a
ignore assertEquals(MainApp.class.getResource(FXML_FILE_FOLDER + DEFA…
Hailinx b4560d8
improve import
Hailinx 4731513
improve import
Hailinx 293ed33
optimise indentation
Hailinx 824361d
optimse style
Hailinx e9ac256
Remove space in PPP file name
qihao27 501f8d6
Merge branch 'master' of https://github.com/qihao27/addressbook-level4
qihao27 7b46a4a
Update test
Hailinx a276675
Added new line at EOF
qihao27 121b2bb
Update test case
Hailinx ee1694b
Merge pull request #116 from Hailinx/master
Hailinx 9f3b72f
Merge branch 'master' into master
Hailinx afe0b6a
fix the bug when clear, todo list will not be clear
Hailinx 18c3565
Merge pull request #117 from qihao27/master
Hailinx 8ec7f9b
Merge branch 'master' into master
Hailinx 6507460
Merge pull request #118 from Hailinx/master
qihao27 a141beb
update help message for "lock" command
Hailinx 3b2cbbc
Merge branch 'master' of https://github.com/Hailinx/addressbook-level4
Hailinx 957c65a
Merge pull request #11 from CS2103AUG2017-T10-B1/master
Hailinx 4e663ab
Merge branch 'master' of https://github.com/Hailinx/addressbook-level4
Hailinx cc3237e
Update sampledata
Hailinx 2ff6027
Update testscript
Hailinx e1a89a7
Merge pull request #119 from Hailinx/master
qihao27 f744711
Merge pull request #5 from CS2103AUG2017-T10-B1/master
qihao27 3e4011b
Update docs
qihao27 ba45262
Minor updates to PPP
qihao27 ef5a814
Merge pull request #121 from qihao27/master
Hailinx fc66d29
Merge pull request #12 from CS2103AUG2017-T10-B1/master
Hailinx bf23e61
update docs
Hailinx b514138
Update UG (undo redo)
aaronyhsoh b58d078
update UG (add)
aaronyhsoh 69db0fe
update ug (add)
aaronyhsoh d836583
Update docs
Hailinx 22ae95f
Merge pull request #122 from Hailinx/master
qihao27 90bbd1d
Update AboutUs, PPP, TestScript
qihao27 1e1bd27
Merge pull request #6 from CS2103AUG2017-T10-B1/master
qihao27 60a65aa
Merge branch 'master' of https://github.com/qihao27/addressbook-level4
qihao27 597a96f
Add portfolio link
qihao27 90ce45e
Merge pull request #123 from qihao27/master
Hailinx 4cda218
Update developer guide
aaronyhsoh 85d52cb
Update UG (undo and redo enhanced)
aaronyhsoh eaab96a
Update UG (rewrite enhanced redo and undo)
aaronyhsoh ebb8220
Update UG (redocomand)
aaronyhsoh 4241a2c
Update UG formatting
aaronyhsoh b7f234b
Final update
aaronyhsoh f81a95e
Merge branch 'master' into master
aaronyhsoh 2b76c29
Merge branch 'master' into master
aaronyhsoh e8967b9
Add valensia's PPP
aaronyhsoh c234d83
Rename Valensia Sebastiani to Valensia Sebastiani.adoc
aaronyhsoh f9ebcc1
Rectifying Travis checkstyle error
aaronyhsoh bddd037
Update PPP
aaronyhsoh 050be77
Update AaronSoh.adoc
aaronyhsoh 9c73223
Update UserGuide.adoc
aaronyhsoh 18416c7
Update AaronSoh.adoc
aaronyhsoh 8b592f4
Update AaronSoh.adoc
aaronyhsoh 70a3cf0
Update DeveloperGuide.adoc
aaronyhsoh 09a71db
Update AaronSoh.adoc
aaronyhsoh faf6696
Update AaronSoh.adoc
aaronyhsoh e16ce3a
Update UserGuide.adoc
aaronyhsoh 41a8f10
Update AaronSoh.adoc
aaronyhsoh 91153f2
Update AaronSoh.adoc
aaronyhsoh 5b75d32
Merge pull request #125 from aaronyhsoh/master
aaronyhsoh File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
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
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.
Good job for updating AboutUS.