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.1][F09-B1]Your TA #80
Open
WoodySIN
wants to merge
506
commits into
nus-cs2103-AY1718S2:master
Choose a base branch
from
CS2103JAN2018-F09-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 32 commits
Commits
Show all changes
506 commits
Select commit
Hold shift + click to select a range
369c192
Fixed minor todo-card bug: removed date label
JoonKai1995 705749b
Login v2.0 working
Pearlissa 7dfc016
Login v2.0 working
Pearlissa 055dce4
Merge branch 'master' of https://github.com/CS2103JAN2018-F09-B1/main…
Pearlissa 0999d31
Update backslashes to forward
Alaru 20a5e8e
Update logic to save Display Picture
Alaru 345fae5
Add MarkCommand integration test
Alaru 9065cd5
add deleteTaskCommandTest and its parser test
WoodySIN d80e392
add EditTaskCommandTest
WoodySIN 785de63
update collate
WoodySIN 98e15bd
Add integration tests for Participation
Alaru 2c4538e
Add Integration tests
Alaru 1328dd7
Collated files
Alaru 0077a70
Recollate unused files
Alaru 95641bf
Update documentation
Alaru 79f10c1
Updated:
JoonKai1995 82683db
Updated:
JoonKai1995 885ba29
Updated:
JoonKai1995 c3e86b8
Login UGDG
Pearlissa 7e2492b
fix list Command does not show Person List
WoodySIN aef5a72
Updated:
JoonKai1995 eda312d
Update DG
Alaru b6064a4
Updated:
JoonKai1995 af15008
Updated:
JoonKai1995 42dea4a
Updated:
JoonKai1995 02697a0
fix bugs in list command test
WoodySIN 3da2bbb
Login UGDG added user class
Pearlissa 73a9a93
remove unused imports
WoodySIN f63161f
remove unused imports in commandtasktestutil and taskbuilder
WoodySIN 2be58ce
PPP_v1
Pearlissa 09e4c7d
remove inconsistent System Test
WoodySIN 741c700
inconsistent system test
WoodySIN bb0a04d
Finished implementation of DisplayPic in DG
Alaru 8b3779f
Finished implementation portion for DisplayPic and Participation in DG
Alaru 1fd7c38
Upload pictures for DG
Alaru 83daf6e
Update DeveloperGuide.adoc
Alaru 06ac2a2
Update PPP
Alaru c541a4f
Merge remote-tracking branch 'origin/v1.5rcdocumentation' into v1.5rc…
Alaru 5147fb4
Update UG
Alaru 675f9b7
update ug and ppp
Alaru f421a55
fix a bug of reload to do list
WoodySIN e55b860
Merge branch 'master' into master
WoodySIN 7d66707
add task related methods in system tests
WoodySIN 8b7628d
Merge branch 'master' of https://github.com/CS2103JAN2018-F09-B1/main
WoodySIN bce48de
Merge remote-tracking branch 'WoodySIN/master'
WoodySIN d3a39bc
Merge pull request #100 from Pearlissa/Login_v2
Alaru f25a147
Merge pull request #103 from JoonKai1995/UG_DG_FInal
Alaru 10c5c25
Merge branch 'master' into UGDG_login
Alaru 3f1e26a
Merge pull request #104 from Pearlissa/UGDG_login
Alaru 645131f
Merge pull request #106 from JoonKai1995/PPP
Alaru e16e28e
Merge branch 'master' into PPP
Alaru 4f06dec
Merge pull request #107 from Pearlissa/PPP
Alaru 5a9492f
fix some bugs in system test
WoodySIN f7c2db3
remove incompatiable system tests
WoodySIN e7330b4
Merge branch 'master' of https://github.com/CS2103JAN2018-F09-B1/main…
Alaru c339318
Merge branch 'master' into 1.4bugfixes
WoodySIN 9400852
Merge pull request #84 from Alaru/1.4bugfixes
WoodySIN 6b4b432
Documentation: update application icon and default display picture
Alaru 7791c0e
Merge branch 'v1.5rctest' into v1.5rcdocumentation
Alaru e52349f
remove collate
WoodySIN 86c0850
Merge branch 'master' into v1.5rcdocumentation
WoodySIN 8120314
Merge pull request #108 from Alaru/v1.5rcdocumentation
WoodySIN a4a9625
Delete Wu.md
WoodySIN 56020fb
Delete Wu.md
WoodySIN bb903d7
update collate
WoodySIN 9284912
Merge branch 'master' of https://github.com/CS2103JAN2018-F09-B1/main
WoodySIN b0a7d33
Merge remote-tracking branch 'WoodySIN/master'
WoodySIN 80b70d8
Revert "Add login feature: v1.5rc"
Alaru a24ccde
Merge pull request #110 from CS2103JAN2018-F09-B1/revert-100-Login_v2
WoodySIN 40a3049
fix no eof
WoodySIN aaaeaa5
Merge branch 'master' of https://github.com/CS2103JAN2018-F09-B1/main
WoodySIN bf53275
Logic: Add support to delete display pictures
Alaru 8cd0120
update PPP
WoodySIN 36ada65
add javadocmethod to Participation isValidParticipation method
WoodySIN 32a714b
remove systemtests
WoodySIN b27eb83
no message
WoodySIN efd3733
no message
WoodySIN c9b6a3f
fix style errors
WoodySIN d5c8b83
Merge pull request #109 from WoodySIN/master
WoodySIN 8aff6a2
Merge pull request #111 from Alaru/v1.5rcdocumentation
WoodySIN 5edca32
Issues fixes.
JoonKai1995 03914d6
fix edittask and deleteTask bugs
WoodySIN 14fea03
fix deleteTaskcommand bug
WoodySIN 7db1751
Issues fixes.
JoonKai1995 f12007c
Issues fixes.
JoonKai1995 56818e2
Merge branch 'master' of https://github.com/CS2103JAN2018-F09-B1/main…
JoonKai1995 b340316
login fix, .xml file can now be created and new accounts start with s…
Pearlissa 3211749
login fix, .xml file can now be created and new accounts start with s…
Pearlissa c8e87ff
Merge branch 'master' of https://github.com/CS2103JAN2018-F09-B1/main
Pearlissa 43f6a5b
Login Bug fix
Pearlissa d10df78
Issues fixes.
JoonKai1995 148a493
fixed checkstyles
Pearlissa 91181cb
STORAGE: Fix deletion of display pictures
Alaru 5fd12fa
Merge branch 'Bug_fixes'
JoonKai1995 eb21c02
#1 add list task command
WoodySIN 2dd5163
removed an unused import in CommandTestUtil
WoodySIN be3dc01
Fixed storage bug for task deadline.
JoonKai1995 435670f
revert
WoodySIN 365a695
Merge remote-tracking branch 'WoodySIN/master'
WoodySIN 271b43a
add task list commands
WoodySIN e6c63b4
update UG
WoodySIN 6f3f6c8
remove unused import
WoodySIN a66d6f5
Storage: Add logging to DisplayPicStorage
Alaru 7d0b65e
Merge branch 'master' of https://github.com/CS2103JAN2018-F09-B1/main…
Alaru c488773
Merge pull request #118 from WoodySIN/master
Alaru c7296c9
Logic: Update logging when deleting image files/display pictures
Alaru 0b130ab
Logic: Update logging when deleting image files/display pictures
Alaru fb2635d
Documentation: Update DG
Alaru 5fb8e2c
Documentation: Fix DG english. Change use cases.
Alaru 90d3434
Documentation: Fix DG english.
Alaru 4c08098
reverted tasklist back to UniqueTaskList
JoonKai1995 fe2d842
Merge pull request #114 from Pearlissa/login_fix
JoonKai1995 f9884bc
reverted tasklist back to UniqueTaskList
JoonKai1995 d2e8a63
reverted tasklist back to UniqueTaskList
JoonKai1995 a29bb10
Documentation: Fix comments and update some typos.
Alaru 290242e
login testing
Pearlissa bfd9af6
Merge branch 'master' of https://github.com/CS2103JAN2018-F09-B1/main…
Pearlissa 3ce0562
Code: Checkstyle fixes
Alaru 03dec4c
Tests: Fix application name change
Alaru 161d886
Fixed minor bug:
JoonKai1995 8a756c3
Removed collated file
JoonKai1995 ce47e73
Merge branch 'master' into Test_cases
JoonKai1995 ab44de2
login testing
Pearlissa 468c8b7
Documentation: DG fixes
Alaru af7d20b
Merge pull request #121 from JoonKai1995/Test_cases
JoonKai1995 a633d09
Added support to access username and changed filepaths.
JoonKai1995 ed18237
Added support to access username and changed filepaths.
JoonKai1995 b533de7
Storage: Removed check if duplicate image when creating filename
Alaru 8a7d75e
Storage: Removed check if duplicate image when creating filename
Alaru 7fd6a0e
Merge branch 'master' of https://github.com/CS2103JAN2018-F09-B1/main…
Alaru b372dd1
Documentation: Collated Alaru code
Alaru 7abea23
Code: Fix missing newline
Alaru 5ecf671
Codestyle: Removed unused import
Alaru 1bfa720
Documentation: Update UG and added screenshots
Alaru 37ed9d9
update DG
WoodySIN a2977a9
Merge branch 'master' of https://github.com/CS2103JAN2018-F09-B1/main
WoodySIN 7afd073
Merge pull request #123 from Alaru/v1.5allChanges
WoodySIN feef68c
update ppp
WoodySIN 1d704ef
Merge branch 'master' of https://github.com/CS2103JAN2018-F09-B1/main
WoodySIN 5466f87
update UGDG and add sample data
WoodySIN 19ec455
Merge pull request #124 from WoodySIN/master
WoodySIN 22520bb
update PPP
WoodySIN e99a77f
add user tests in DG
WoodySIN f979d7c
Made Login page display prompt text on errors
JoonKai1995 0979311
Made Login page display promot text on errors
JoonKai1995 5e5b18f
Merge branch 'Login_user_text'
JoonKai1995 3bd919d
Made Login page display promot text on errors
JoonKai1995 5f0c32a
Update Login.java
JoonKai1995 d1a8b41
Update Login.java
JoonKai1995 203704f
login testing
Pearlissa 387e3aa
login testing
Pearlissa cb0959b
login testing
Pearlissa 89ca9e5
Documentation: Update Alaru PPP, UGDG
Alaru 2d575e8
Merge branch 'master' of https://github.com/CS2103JAN2018-F09-B1/main…
Pearlissa d64c68a
Updated DG for calendar and matriculation number
JoonKai1995 5ef2f5a
Merge remote-tracking branch 'origin/UGDG_FINAL' into UGDG_FINAL
JoonKai1995 de9a2c7
Merge pull request #127 from Pearlissa/login_testing
JoonKai1995 e6375fc
Merge branch 'master' of https://github.com/CS2103JAN2018-F09-B1/main…
JoonKai1995 bb0ccb3
Documentation: Merged Wudi changes
Alaru 81bcf95
Documentation: Add unused code
Alaru f05eee7
Merge branch 'UGDG_FINAL' of https://github.com/JoonKai1995/main into…
Alaru 1a8d9d7
Updated login tests, all works now.
JoonKai1995 a36d892
Merge pull request #128 from JoonKai1995/UGDG_FINAL
JoonKai1995 998d82b
Merge branch 'master' into LoginStorage_test
JoonKai1995 0c4aeab
Update LoginManager.java
JoonKai1995 18c5e33
Merge branch 'master' of https://github.com/CS2103JAN2018-F09-B1/main…
Alaru 4b737c7
Merge branch 'LoginStorage_test' of https://github.com/JoonKai1995/ma…
Alaru 567ea79
Update LoginManager.java
JoonKai1995 0a87790
Merge pull request #129 from JoonKai1995/LoginStorage_test
JoonKai1995 591ac17
Merge branch 'master' of https://github.com/CS2103JAN2018-F09-B1/main…
Alaru a8eb823
Documentation:
Alaru ed513b1
Documentation:
Alaru 3f0c8f2
Checkstye: Fixed EOF errors
Alaru ea3aec1
Merge pull request #125 from WoodySIN/master
Alaru 45633ba
Merge branch 'master' of https://github.com/CS2103JAN2018-F09-B1/main…
Alaru 3af6cbd
Documentation: Rename UIInitial to UI
Alaru 081cb26
collated_pearlissa
Pearlissa 4f405e5
collated_pearlissa
Pearlissa 380420f
Merge branch 'master' into login_testing
Pearlissa 939da56
Merge pull request #130 from Alaru/v1.5allChanges
JoonKai1995 401afd0
Merge branch 'master' of https://github.com/CS2103JAN2018-F09-B1/main
Pearlissa 13ff1ff
Updated PPP, slight bit on UG and collated code for JoonKai1995.
JoonKai1995 2747801
Found small typo in DG
JoonKai1995 7a50428
Documentation: Recollated files
Alaru 5824c56
Merge branch 'LoginStorage_test' of https://github.com/JoonKai1995/ma…
Alaru 2a2fd1e
Documentation: UserGuide fixed broken switchTab link
Alaru 6e28e42
Fixed naming issue causing jar file to hang.
JoonKai1995 b4d0c51
Merge pull request #133 from Alaru/v1.5allChanges
JoonKai1995 d9a9059
Merge branch 'Jar_fix' of https://github.com/JoonKai1995/main into v1…
Alaru 8227468
Fixed naming issue causing jar file to hang.
JoonKai1995 364998a
Merge branch 'master' into Jar_fix
JoonKai1995 fd89703
Merge branch 'master' of https://github.com/CS2103JAN2018-F09-B1/main…
JoonKai1995 1049c76
Updated PPP.
JoonKai1995 19b5f64
Merge remote-tracking branch 'origin/Jar_fix' into Jar_fix
JoonKai1995 7709a1f
changed fxml file names in java controllers to lower case.
JoonKai1995 787c4d1
Update invalidUserLogin.xml
JoonKai1995 1633d42
Update Login.fxml
JoonKai1995 b722ebb
Merge branch 'Jar_fix' of https://github.com/JoonKai1995/main into v1…
Alaru be420be
Merge pull request #135 from JoonKai1995/Jar_fix
WoodySIN 72b102f
Merge pull request #131 from Pearlissa/login_testing
WoodySIN a697367
change it to String FXML name to lower case
WoodySIN 3decd39
Merge branch 'master' of https://github.com/CS2103JAN2018-F09-B1/main
WoodySIN 69d2523
Version: Changed version to 1.5.0 non early access
Alaru c975d29
UG_final
Pearlissa 07ad367
UG_final
Pearlissa accbae3
UG_final
Pearlissa ccf8870
Merge branch 'master' into UGDG_final
JoonKai1995 efadaba
Merge pull request #136 from Pearlissa/UGDG_final
JoonKai1995 004e015
Update UserGuide.adoc
JoonKai1995 a68e9bb
Merge branch 'master' of https://github.com/CS2103JAN2018-F09-B1/main…
Alaru cde3b67
Update UserGuide.adoc
JoonKai1995 77ade58
Corrected UG link
JoonKai1995 48f2fd1
Update UserGuide.adoc
JoonKai1995 ae8e698
Update UserGuide.adoc
JoonKai1995 790e19c
update PPP
WoodySIN 22bb08f
Update JoonKai1995.adoc
JoonKai1995 fbbe862
Merge branch 'master' of https://github.com/CS2103JAN2018-F09-B1/main
JoonKai1995 fe58087
Corrected UG link
JoonKai1995 88cd863
Corrected PPP
JoonKai1995 aa91201
DG_final
Pearlissa 51819b4
Documentation: UG - fix case sensitive images
Alaru 600c909
Merge branch 'master' of https://github.com/CS2103JAN2018-F09-B1/main…
Pearlissa 6da295d
collated_final
Pearlissa 038ea85
collated_final
Pearlissa f0d020d
Update UserGuide.adoc
JoonKai1995 4083fd2
Update AddressBookParserTest.java
JoonKai1995 b16be19
Merge pull request #140 from Pearlissa/UGDG_final
JoonKai1995 568a55f
Merge pull request #139 from JoonKai1995/master
JoonKai1995 8f45128
Merge pull request #138 from WoodySIN/master
JoonKai1995 d7cc7f7
Merge branch 'master' into added_collate
JoonKai1995 6799cfb
Merge pull request #141 from Pearlissa/added_collate
JoonKai1995 7a33b08
Documentation: UGDG fixes
Alaru 43af59a
Corrected PPP, and collated final.
JoonKai1995 7da27ff
Merge pull request #142 from JoonKai1995/PPP_and_finalcollate
JoonKai1995 f93a2e0
Logic: markPart now can only add 1 to 100
Alaru c96c5f8
Logic: markPart now can only add 1 to 100
Alaru a508e8c
Documentation: Fix typo in UG
Alaru 7f1e3ac
Reverted Logic: markPart now can only add 1 to 100
Alaru ab7a0e8
Merge pull request #143 from Alaru/v1.5allChanges
Alaru ed5f601
PPP_final
Pearlissa a8d6fac
Update MarkCommand.java
Alaru ce87bfd
Merge branch 'master' into PPP_final
JoonKai1995 b735add
Merge pull request #144 from Pearlissa/PPP_final
JoonKai1995 eb60156
Update MarkCommand.java
Alaru 892fe3a
remove collate
WoodySIN f56a7b1
Merge branch 'master' of https://github.com/CS2103JAN2018-F09-B1/main
WoodySIN aec191d
update collate
WoodySIN d1f5838
update collate name
WoodySIN aa64d13
update collate name
WoodySIN 4b653a3
Rename wudi.adoc to WoodySIN.adoc
WoodySIN 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
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
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.
Make sure for your user stories you are in sync with your target profile.