[T13-2] SSENISUB#110

Open

valensia0711 wants to merge 508 commits intonus-cs2103-AY1819S1:masterfrom CS2103-AY1819S1-T13-2:master

+11,224-1,846

This pull request is big! We're only showing the most recent 250 commits

Commits on Oct 29, 2018

Commits on Oct 30, 2018

edit Phone equals method to check privacy
abtyx
committed
change major bug in PrivacyCommand
abtyx
committed
edit equals method for Address and Email to include checking for privacy
abtyx
committed
make private information show up as private on staff panel
abtyx
committed
edit tests to accomodate for changes
abtyx
committed
add junit testing for coveralls
abtyx
committed
fix checkstyle
abtyx
committed
Merge pull request #56 from abtyx/v1.3PrivacyInUI
NgeowXiuQi
authored
Merge branch 'master' into wip/favourite
valensia0711
authored
fix conflict resolve problem

Valensia Sebastiani
authored and
Valensia Sebastiani
committed
fix conflict resolve problem

Valensia Sebastiani
authored and
Valensia Sebastiani
committed
fix tests

Valensia Sebastiani
authored and
Valensia Sebastiani
committed
AddressBookParserTest: add test for favourite command

Valensia Sebastiani
authored and
Valensia Sebastiani
committed
Merge pull request #5 from CS2103-AY1819S1-T13-2/master
IamRENCE
authored
RateCommandParser: Add check if rating entered fulfils regex
IamRENCE
committed
RateCommandParser: Check for negative index
IamRENCE
committed
FeedbackCommandParser: Add check if feedback fulfils feedback regex
IamRENCE
committed
fix for checkstyle

Valensia Sebastiani
authored and
Valensia Sebastiani
committed
fix for checkstyle

Valensia Sebastiani
authored and
Valensia Sebastiani
committed
add test for unfavourite

Valensia Sebastiani
authored and
Valensia Sebastiani
committed
Add RateCommandSystemTest
IamRENCE
committed
Add tests for RateCommandSystemTest
IamRENCE
committed
RateCommandSystemTest: Fix test comment
IamRENCE
committed
Add FeedbackCommandSystemTest
IamRENCE
committed
Merge pull request #54 from CS2103-AY1819S1-T13-2/wip/favourite
IamRENCE
authored
RateCommandParser: Fix comment issue
IamRENCE
committed
FeedbackCommandParser: Fix tests to properly check for the correct parse failure
IamRENCE
committed
RateCommandParser: Fix tests to properly check for the correct parse failure
IamRENCE
committed
RateCommandParser: Coveralls check
IamRENCE
committed
Fix Coveralls Check
IamRENCE
committed
Merge pull request #58 from IamRENCE/master
valensia0711
authored

Commits on Oct 31, 2018

update userdoc for privacy command
abtyx
committed
Merge pull request #62 from abtyx/v1.3UserDocAsh
NgeowXiuQi
authored
Update XMLAdaptedPerson.java : Commented out unnecessary checks
NgeowXiuQi
committed
Updated XmlAdaptedPerson.java : Removed unnecessary checks
NgeowXiuQi
committed
Update Salary.java : Removed unnecessary function
NgeowXiuQi
committed
Merge pull request #63 from NgeowXiuQi/Coveralls_Fix
DanKhoo
authored
user guide: add favourite command, remove lock-unlock command

Valensia Sebastiani
authored and
Valensia Sebastiani
committed
wip: add unfavourite command

Valensia Sebastiani
authored and
Valensia Sebastiani
committed
user guide: add coming soon to lock-unlock feature

Valensia Sebastiani
authored and
Valensia Sebastiani
committed
Merge pull request #64 from CS2103-AY1819S1-T13-2/documentation
DanKhoo
authored
Update UserGuide.adoc
DanKhoo
committed
add unfavourite command

Valensia Sebastiani
authored and
Valensia Sebastiani
committed
Merge pull request #65 from DanKhoo/master
valensia0711
authored
update user guide and dev guide to include unfavourite command

Valensia Sebastiani
authored and
Valensia Sebastiani
committed
removed unused method for coveralls

Valensia Sebastiani
authored and
Valensia Sebastiani
committed
Merge pull request #67 from CS2103-AY1819S1-T13-2/documentation
NgeowXiuQi
authored
fix for coveralls

Valensia Sebastiani
authored and
Valensia Sebastiani
committed
Merge pull request #66 from CS2103-AY1819S1-T13-2/wip/unfavourite
DanKhoo
authored
Merge pull request #6 from CS2103-AY1819S1-T13-2/master
IamRENCE
authored
Feedback: Add check for Profanity
IamRENCE
committed
FeedbackTest: Add tests to check if profanities get rejected
IamRENCE
committed
FeedbackCommandParser & RateCommandParser: Update minor bug where wrong error message is displayed
IamRENCE
committed
FeedbackCommandParserTest & RateCommandParserTest: Update tests to follow correct error message output
IamRENCE
committed
RateCommandSystemTest: Update test to display correct error message
IamRENCE
committed
FeedbackCommandSystemTest: Add test to check if profanity in input is rejected
IamRENCE
committed
README: Update Acknowledgements for Profanity Filter code
IamRENCE
committed
Revert "README: Update Acknowledgements for Profanity Filter code"
IamRENCE
committed
Update UserGuide on feedback and rate command
IamRENCE
committed
Create Bad_Words_List
IamRENCE
authored
Update Bad_Words_List
IamRENCE
authored
Delete dummy Bad_Words_List
IamRENCE
authored
Update input file to be txt instead of csv
IamRENCE
committed
Feedback: Improve code quality
IamRENCE
committed
Improve code coverage
IamRENCE
committed

Commits on Nov 1, 2018

UserGuide: Fix typos
IamRENCE
committed
Merge pull request #75 from IamRENCE/master
DanKhoo
authored
add UI for favourite command

Valensia Sebastiani
authored and
Valensia Sebastiani
committed
edit UI for favourite command

Valensia Sebastiani
authored and
Valensia Sebastiani
committed
fix for checkstyle

Valensia Sebastiani
authored and
Valensia Sebastiani
committed
add sort command

Valensia Sebastiani
authored and
Valensia Sebastiani
committed
fix bug when sorting with favourited persons

Valensia Sebastiani
authored and
Valensia Sebastiani
committed
add tests for sort command

Valensia Sebastiani
authored and
Valensia Sebastiani
committed
Update UserGuide : Added Net Salary note in Edit Command
NgeowXiuQi
committed
Edited UserGuide : Removed formula
NgeowXiuQi
committed
update userdoc for privacy
abtyx
committed
Update Feedback profanity Filter to work for jar file
IamRENCE
committed
Feedback: Fix checkstyle
IamRENCE
committed
Test fix NoClassDefFoundError in travis
IamRENCE
committed
Merge pull request #79 from abtyx/v1.3UserDocAsh
NgeowXiuQi
authored
Merge branch 'master' of https://github.com/CS2103-AY1819S1-T13-2/main into UserGuide_Update
NgeowXiuQi
committed
Update UserGuide : Shifted Salary, OT Hours, OT Rate and Pay Deductibles to have its own section in the user guide
NgeowXiuQi
committed
Merge pull request #78 from NgeowXiuQi/UserGuide_Update
abtyx
authored
Create dummy file
IamRENCE
authored
Add Bad_Words_List.txt
IamRENCE
authored
Delete dummy file
IamRENCE
authored
Feedback: Edit bad words text source
IamRENCE
committed
Merge branch 'master' of https://github.com/IamRENCE/main
IamRENCE
committed
Delete wrong Bad_Words_List.txt
IamRENCE
authored
Create Dummy File
IamRENCE
authored
Add Bad_Words_List.txt
IamRENCE
authored
Delete Dummy File
IamRENCE
authored
Update Bad_Words_List.txt
IamRENCE
committed
Merge pull request #76 from CS2103-AY1819S1-T13-2/wip/favourite
DanKhoo
authored
Merge pull request #80 from IamRENCE/master
DanKhoo
authored

Commits on Nov 2, 2018

fix for checkstyle

Valensia Sebastiani
authored and
Valensia Sebastiani
committed
fix tests

Valensia Sebastiani
authored and
Valensia Sebastiani
committed
fix tests

Valensia Sebastiani
authored and
Valensia Sebastiani
committed

Commits on Nov 4, 2018

resolve issue: undo and redo did not work properly in regards to favourite/unfavourite

Valensia Sebastiani
authored and
Valensia Sebastiani
committed

Commits on Nov 5, 2018

Update UserGuide.adoc
IamRENCE
authored

Commits on Nov 6, 2018

Commits on Nov 8, 2018

Merge pull request #81 from CS2103-AY1819S1-T13-2/wip/sort
IamRENCE
authored

Commits on Nov 10, 2018

Commits on Nov 11, 2018

UserPrefs: Rename data output file to "ssenisub.xml"
IamRENCE
committed
Add Sequence Diagrams
IamRENCE
committed
Update DeveloperGuide with Feedback command features
IamRENCE
committed
Update UserGuide with Feedback features
IamRENCE
committed
Merge pull request #108 from DanKhoo/fix_ui_bug
IamRENCE
authored
Merge pull request #109 from IamRENCE/master
valensia0711
authored
SampleDataUtil: Make 1st person favourited
IamRENCE
committed
Merge pull request #10 from CS2103-AY1819S1-T13-2/master
IamRENCE
authored
Merge branch 'master' of https://github.com/IamRENCE/main
IamRENCE
committed
SampleDataUtil: Undo "favourite 1st person by default"
IamRENCE
committed
add sortByDept, sortByRatingUp, sortByRatingDown commands

Valensia Sebastiani
authored and
Valensia Sebastiani
committed
Add PPP for IamRENCE
IamRENCE
committed
Update IamRENCE PPP
IamRENCE
committed
Merge pull request #111 from IamRENCE/master
DanKhoo
authored
Merge pull request #11 from CS2103-AY1819S1-T13-2/master
IamRENCE
authored
Fix tag typo in UserGuide
IamRENCE
committed
Update UserGuide.adoc
DanKhoo
committed
Merge pull request #112 from IamRENCE/master
DanKhoo
authored
add command is now unable to add a person with existing phone or email
abtyx
committed
Merge pull request #12 from CS2103-AY1819S1-T13-2/master
IamRENCE
authored
Update DeveloperGuide
IamRENCE
committed
Merge pull request #113 from DanKhoo/updateDocs
IamRENCE
authored
Merge pull request #115 from IamRENCE/master
DanKhoo
authored
fix tests
abtyx
committed
PPP created
abtyx
committed
fix checkstyle
abtyx
committed
Update Ssenisub.java
abtyx
authored
Update EditCommand.java
abtyx
authored
Merge pull request #114 from abtyx/v1.4finalAsh
DanKhoo
authored
update userguide, devguide and PPP
abtyx
committed
Merge branch 'master' of https://github.com/CS2103-AY1819S1-T13-2/main into PPP
abtyx
committed
Merge pull request #117 from abtyx/PPP
DanKhoo
authored
Update all diagrams for Dev Guide
DanKhoo
committed
Update DeveloperGuide
DanKhoo
committed
Update UserGuide.adoc
DanKhoo
committed
Merge pull request #118 from DanKhoo/updateDocs
DanKhoo
authored
add tests for the different sort commands

Valensia Sebastiani
authored and
Valensia Sebastiani
committed
add valensia0711.adoc

Valensia Sebastiani
authored and
Valensia Sebastiani
committed
add parser tests for new commands to increase coverage

Valensia Sebastiani
authored and
Valensia Sebastiani
committed
Merge pull request #119 from CS2103-AY1819S1-T13-2/wip/sort_withparam
NgeowXiuQi
authored
minor changes in User Guide

Valensia Sebastiani
authored and
Valensia Sebastiani
committed
Added NgeowXiuQi.adoc : For PPP
NgeowXiuQi
committed
minor changes to user guide: grammar fix

Valensia Sebastiani
authored and
Valensia Sebastiani
committed
Merge pull request #120 from NgeowXiuQi/master
valensia0711
authored
Edited AboutUs.adoc to link to team members' PPP
NgeowXiuQi
committed
Updated my PPP (NgeowXiuQi.adoc)
NgeowXiuQi
committed
Corrected Spelling error in Ashburn's PPP
NgeowXiuQi
committed
Merge pull request #121 from NgeowXiuQi/NgeowXiuQi_PPP
valensia0711
authored
fix typos and grammar errors

Valensia Sebastiani
authored and
Valensia Sebastiani
committed
reorder command list in user guide

Valensia Sebastiani
authored and
Valensia Sebastiani
committed
add sort commands to user guide

Valensia Sebastiani
authored and
Valensia Sebastiani
committed
fix typo

Valensia Sebastiani
authored and
Valensia Sebastiani
committed
Merge branch 'master' of https://github.com/CS2103-AY1819S1-T13-2/main into ppp

Valensia Sebastiani
authored and
Valensia Sebastiani
committed
fix for checkstyle: add newline at EOF

Valensia Sebastiani
authored and
Valensia Sebastiani
committed
add PPP for valensia0711

Valensia Sebastiani
authored and
Valensia Sebastiani
committed
fix: sortRatingDown should be sortRatingUp

Valensia Sebastiani
authored and
Valensia Sebastiani
committed

Commits on Nov 12, 2018

Merge pull request #123 from CS2103-AY1819S1-T13-2/documentation
NgeowXiuQi
authored
Merge pull request #124 from CS2103-AY1819S1-T13-2/ppp
NgeowXiuQi
authored
Add dankhoo.adoc ppp and AboutUs.adoc
DanKhoo
committed
Merge pull request #125 from DanKhoo/updateDocs
abtyx
authored
add Activity Diagram to dev guide
abtyx
committed
Edited ngeowxiuqi.adoc to include changes
NgeowXiuQi
committed
Merge pull request #126 from abtyx/PPP
IamRENCE
authored
Rename NgeowXiuQi.adoc to ngeowxiuqi.adoc
NgeowXiuQi
authored
Update asciidoctor.css
DanKhoo
authored
Merge pull request #128 from CS2103-AY1819S1-T13-2/NgeowXiuQi-patch-1
NgeowXiuQi
authored
Merge branch 'master' of https://github.com/CS2103-AY1819S1-T13-2/main into NgeowXiuQi_PPP
NgeowXiuQi
committed
Removed ngeowxiuqi.adoc PPP
NgeowXiuQi
committed
Merge pull request #129 from CS2103-AY1819S1-T13-2/updateCSS
DanKhoo
authored
Merge pull request #130 from NgeowXiuQi/NgeowXiuQi_PPP
DanKhoo
authored
Re-added ngeowxiuqi.adoc
NgeowXiuQi
committed
Merge pull request #132 from NgeowXiuQi/NgeowXiuQi_PPP
DanKhoo
authored
Edited AboutUs to accomodate for my PPP
NgeowXiuQi
committed
DeveloperGuide.adoc: Add manual test cases for add, select and find-n
DanKhoo
committed
Merge pull request #133 from NgeowXiuQi/NgeowXiuQi_PPP
valensia0711
authored
Edited DeveloperGuide and my PPP
NgeowXiuQi
committed
Merge pull request #134 from DanKhoo/updateDocs
NgeowXiuQi
authored
Update dankhoo.adoc PPP
DanKhoo
committed
Merge pull request #135 from NgeowXiuQi/NgeowXiuQi_PPP
DanKhoo
authored
Merge pull request #13 from CS2103-AY1819S1-T13-2/master
IamRENCE
authored
Merge pull request #136 from DanKhoo/updateDocs
IamRENCE
authored
Merge pull request #14 from CS2103-AY1819S1-T13-2/master
IamRENCE
authored
Update Rate Command Sequence Diagrams
IamRENCE
committed
Update Feedback Command Sequence Diagram
IamRENCE
committed
Add Feedback Profanity Filter Sequence Diagram
IamRENCE
committed
Update DeveloperGuide with Profanity Filter Sequence Diagram
IamRENCE
committed
Merge pull request #137 from IamRENCE/master
DanKhoo
authored
edit developer guide to include sort commands and favourite/unfavourite sequence diagrams

Valensia Sebastiani
authored and
Valensia Sebastiani
committed
fix typo in developer guide for feedback command

Valensia Sebastiani
authored and
Valensia Sebastiani
committed
reorder contents in command implementation

Valensia Sebastiani
authored and
Valensia Sebastiani
committed
reorder contents in use cases

Valensia Sebastiani
authored and
Valensia Sebastiani
committed
reorder contents in manual testing guide

Valensia Sebastiani
authored and
Valensia Sebastiani
committed
add manual test for favourite command

Valensia Sebastiani
authored and
Valensia Sebastiani
committed
add manual test for unfavourite command

Valensia Sebastiani
authored and
Valensia Sebastiani
committed
Merge pull request #138 from CS2103-AY1819S1-T13-2/documentation
DanKhoo
authored
edit PPP: valensia0711.adoc

Valensia Sebastiani
authored and
Valensia Sebastiani
committed
Merge pull request #15 from CS2103-AY1819S1-T13-2/master
IamRENCE
authored
Fix typo in DeveloperGuide
IamRENCE
committed
Fix typo in PPP
IamRENCE
committed
Merge pull request #139 from CS2103-AY1819S1-T13-2/documentation
IamRENCE
authored
Merge pull request #140 from IamRENCE/master
DanKhoo
authored
Update README.adoc
DanKhoo
authored
Merge pull request #141 from CS2103-AY1819S1-T13-2/updateDocs
NgeowXiuQi
authored
Update AboutUs.adoc
DanKhoo
authored