forked from se-edu/addressbook-level4
-
Notifications
You must be signed in to change notification settings - Fork 64
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
[F11-2] Concierge #68
Open
adamwth
wants to merge
559
commits into
nus-cs2103-AY1819S1:master
Choose a base branch
from
CS2103-AY1819S1-F11-2: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 78 commits
Commits
Show all changes
559 commits
Select commit
Hold shift + click to select a range
4f6643a
Resolve merge conflict from #153 and #162
d9583b7
LogInCommandParser.java: Add parseAndHash method for password
pikulet dc1235f
ModelManager.java: Create username field
pikulet 780d331
Model.java: Introduce InvalidPasswordException
pikulet 1cdf159
fix style
2dd1762
PasswordHashUtil.java: Add reference site
pikulet 4d8c5d6
PasswordsStorage.java: Add password storage interface
pikulet b6eae31
UserPrefs.java: Add functionality to read in password file path
pikulet 573cd51
XmlUtilTest and XmlSerializableConciergeTest: update with new format …
8b72ea3
XmlSerializableConciergeTest: update
d3b349f
TypicalConcerge: Refactor name of getTypicalConcierge -> getTypicalCo…
d1e5d0d
fix style
1307c4b
XmlConciergeStorageTest: update tests and relevant xml files used for…
ddce539
XmlSerializableConciergeTest: update tests and add relevant XML files…
d4c4387
Fix checkstyle errors
pikulet 0fb0a26
Merge branch 'master' into sign-in-feature
pikulet 2f6edc6
XmlUtilTest: update the format of how tests are conducted, RoomListPa…
0485eaf
DarkTheme.css: update with roomCardPane
a4b92a5
JsonUtil.java: Add functionality to parse string to jsonnode
pikulet 2f2774f
fix codacy style
4b9ffef
fix style
59944aa
[v1.3] XML tests (#166)
adamwth bb30a9e
HashingException.java: move to model/util, Rename InvalidPasswordExce…
pikulet 580ee77
InvalidLogInException: Add support for invalid username and password
pikulet 5dbd9cf
Fix checkstyle errors
pikulet 0767c5a
Merge branch 'master' into sign-in-feature
pikulet 495cb57
PasswordHashList.java: Add support for retrieving password hashes
pikulet 24331b8
LogInHelper.java: Add functionality to manage login
pikulet 134f643
Model.java: redirect login features to LogInHelper
pikulet 6ba8ff7
LogInCommand.java: Catch InvalidLogInException
pikulet a49bf77
Add Javadocs and fix checkstyle errors
pikulet 2411658
Merge pull request #171 from adamwth/guest-checkin
adamwth d72cfbe
PasswordHashList.java: Resolve NullPointerException caused by invalid…
pikulet e0fe381
ConciergeParser.java: Add functionality to accept login command
pikulet 33f343c
LogInHelper.java: Enforce lowercase comparison of hashed passwords
pikulet 1a1ed7d
Concierge.java: add support for checked-in guest list, Rooms and othe…
e4a8085
StorageManager.java: Add passwordstorage as parameter for constructor
pikulet 5cfac08
LogInHelper.java: improve code quality with equalsIgnoreCase method
pikulet a282b71
Fix checkstyle issues
pikulet 342388a
Update data/passwords.json
pikulet a137ec2
LogInCommand.java: Add case-sensitive specification
pikulet 0507de5
Merge branch 'master' into user-guide-update
pikulet 987e490
Add login command documentation
pikulet 2c4fa14
Remove delete documentation, update command summary
pikulet deeed22
Rename LogInHelper to LogInExecutor
pikulet ddcf03a
Add LogInVerifier.java and UnauthorisedCommandException
pikulet 97b54ae
LogicManager.java: Add sign-in verification
pikulet 976c6e8
Model.java: add method to get username
pikulet 09ef8e4
Rename LogInExecutor to LogInManager
pikulet 5bd0fa8
AddCommandTest.java: Override "getUsername" method
pikulet 8f19f2a
Add LogInUtil to allow for simulated log-ins
pikulet 763baa1
SystemTests: Add login before attempting to execute delete
pikulet dc779da
pass_testing.json: change password to hashed version
pikulet 8a32f1b
Fix checkstyle errors
pikulet a6d7995
ClearCommandSystemTest.java: remove support for asserting login success
pikulet d355c7f
Fix checkstyle issues (for travis)
pikulet a1b2ab8
TypicalConcierge & TypicalRooms: Refactor to move all typical room se…
1e7e64c
all: fixed some Codacy detected issues
teowz46 228e9e0
XmlSerializableConcierge: change menu storage to list
teowz46 4bbd279
Merge remote-tracking branch 'upstream/master' into service
teowz46 210e0eb
test: change try catch to throws Exception for tests where no excepti…
teowz46 0d87d3e
Concierge: add guest list for checked-in guests and support for said …
d4cc2cf
ParserUtil: renamed FLAG_ARCHIVED_GUEST to FLAG_CHECKED_IN_GUEST and …
edd5f2f
XmlSerializableConcierge: add support to build checked-in guest list …
7ed0324
ListCommand: refactor arguments
3b3adab
PasswordHashList.java: add test unit
pikulet aa915e3
ParserUtil.java: Add support for whitespace before passwords
pikulet 26d1dc0
Fix codacy issues
pikulet 6f0f8ad
Fix typo
pikulet 3a08087
LogInManager.java: Add signOut method
pikulet 063e00b
Fix style issues
pikulet 527bd97
Add LogOutCommand
pikulet b4a2d30
Fix style issues
pikulet 8e7f3ab
Fix checkstyle issues
pikulet 695c05c
Merge pull request #164 from pikulet/user-guide-update
adamwth 4417324
TypicalConcierge: fix bug
e57708e
Room: add support for adding tags
251954b
Concierge: add addTag method
23a90ee
Model: add addTag method
7be9269
TypicalTags: add class for typical tags for both guests and rooms
9dc30e6
test: add more expenses tests, fix existing tests
teowz46 8406e8d
LogInManagerTest: add isSignedIn test
pikulet 68e1c17
fix tests
e9a38df
Resolve merge conflict from #171
1801731
fix style
ff2517c
.gitignore: add dynamic XML test files to gitignore
93d673e
build.gradle: configure gradle build to show exception stack trace
0cbbc10
CommandTestUtil: attempt to fix travis bug
17b2757
Merge branch 'master' into sign-in-feature
pikulet 469d6e3
fix style
0476541
test: add integration tests for Expenses related classes in other cla…
teowz46 e72cb73
all: fix checkstyle errors
teowz46 bdd8366
Merge branch 'master' into service
teowz46 33c01fa
ServiceCommandTest: fix Codacy style error
teowz46 db8156f
Add LogInManagerTest
pikulet 6c49d83
Fix checkstyle errors
pikulet bec942b
AddCommand: refactor, update all AddCommand related tests
486b713
test: add more tests based on Coveralls
teowz46 b400f1a
RoomUtil: add utility methods for room commands, update and fix tests
883332e
fix style
401e5bf
all: fix checkstyle errors
teowz46 e51a5ab
[v1.3] List checked in guests (#178)
adamwth f1d1897
Merge remote-tracking branch 'upstream/master' into sign-in-feature
pikulet a17e778
test: fix Codacy errors
teowz46 a606c1b
Merge pull request #168 from pikulet/sign-in-feature
adamwth 63d5e56
Merge branch 'master' into service
teowz46 25e8982
Resolve merge conflict from #168
af28bdb
Merge branch 'master' into service
teowz46 07b1796
all: fix bugs due to merging
teowz46 3d933cc
all: fix checkstyle errors due to merge
teowz46 803c851
Merge pull request #158 from teowz46/service
adamwth 3ff713c
[v1.3] Update test descriptions (#179)
adamwth 7e61656
[v1.3] Update UserGuide (#181)
adamwth 68d0709
UserGuide: add section for service
teowz46 1a7c0e9
Merge remote-tracking branch 'upstream/master' into service
teowz46 d283cbe
Modify "Find" Function (#169)
JiaqingTan 13e9c84
Concierge: urgent fix to checkout
90e383d
Merge pull request #183 from teowz46/service
teowz46 3ef1e34
fix style
45ca374
UserGuide: remove "Coming in v1.3"
teowz46 8e033eb
Merge remote-tracking branch 'upstream/master' into service
teowz46 caad29f
User guide: Documentation for add, clear, login/ logout, and select (…
pikulet 5254889
Merge pull request #185 from adamwth/list-checked-in-guests
adamwth d6ceb82
UserGuide: add additional stuff for service command
teowz46 dc57981
Merge branch 'master' into service
teowz46 5e128b5
Minor edits for UserGuide (#190)
teowz46 ecc8b05
[v1.4] User Guide update and Ui.png fix (#188)
adamwth db20779
UserGuide.adoc: Update to provide admin account (#191)
pikulet d46b45b
Merge remote-tracking branch 'upstream/master' into service
teowz46 55dc874
Merge branch 'service' of https://github.com/teowz46/main into service
teowz46 f834695
UserGuide: update
b22b0f5
mainapp: update
61fd832
include passwords.json
8ec9726
update preferences.json
5fb702d
UserGuide: update
23a0299
fix style'
225d704
UserGuide: update (#195)
adamwth 565de77
Merge remote-tracking branch 'upstream/master'
teowz46 a5401a2
Room: fix addExpense bug
teowz46 68718fc
all: fix checkstyle errors and failing test
teowz46 2a7e2fc
Merge pull request #212 from teowz46/menu
adamwth 2a68a1e
RoomDetailedCard: add FlowPane for Expenses
teowz46 be23352
Merge remote-tracking branch 'upstream/master' into expense
teowz46 1203ce7
Expenses: fix checkstyle error
teowz46 442b001
test: fix failing tests due to expenses
teowz46 3f21754
RoomDetailedCardTest: add comparisons for "Expenses", "Active booking…
teowz46 c94ff2f
RoomDetailedCardTest: add one more test for expenses FlowPane
teowz46 bb92820
[v1.4] Select command fix (#211)
adamwth 794aeaf
Expenses: fix toStringTotalCost method throwing MoneyLimitExceededExc…
teowz46 8d76a85
RoomDetailedCardHandle: modify equals()
teowz46 8494d65
Merge pull request #213 from teowz46/expense
adamwth b1ade19
resolve merge conflict
2919238
[v1.4] User Guide update (#220)
adamwth d200b49
[v1.4] Select command tests (#219)
adamwth 3e46751
Merge remote-tracking branch 'upstream/master'
bc79eba
Autocomplete feature (#221)
neilish3re f59c3b7
[v1.4] Reassign command (#222)
adamwth 909c735
[v1.4] Docs update (#225)
adamwth b6643eb
Merge remote-tracking branch 'upstream/master'
4c84c21
Revert "[v1.4] Docs update (#225)"
adamwth cf3ae42
Revert "[v1.4] Reassign command (#222)"
adamwth dd438a0
Revert "Autocomplete feature (#221)"
adamwth 9411261
Merge pull request #227 from CS2103-AY1819S1-F11-2/revert-221-Autocom…
adamwth 37bcc00
Merge remote-tracking branch 'upstream/master'
ab0838b
Create PPP template
pikulet 608ce13
Bug Fixes, Changes and Added Functionality (#224)
JiaqingTan 970d47e
Address the issues in the PE-dry-run (#229)
pikulet e711170
Update README.adoc
pikulet 75d9b00
Remove edit command (#233)
pikulet 60f7158
[LogIn module improvements] Add default login account, erase command …
pikulet ab5f45c
Merge remote-tracking branch 'upstream/master' into portfolio
pikulet 8ceeb82
Update UserGuide.adoc: Login
pikulet ee16c0c
Merge remote-tracking branch 'upstream/master'
0ae9a37
Readme: update
e0ad198
MainWindow and UiManager: change AB icon to Concierge icon
fabb114
Merge pull request #234 from pikulet/portfolio
adamwth 1e7ec87
UserGuide: beautify
c4d7d2d
UserGuide: update Ui.png and FAQ
46ae3b5
DeveloperGuide: update
44d3ec0
TypicalConcierge: change ab to concierge
fb1635e
DeveloperGuide: add activity diagram for checkIn
92381c4
XmlAdaptedRoom: fix IllegalValueException due to expenses present in …
teowz46 4186912
adamwth.adoc: add PPP
2fac28a
fix style
6234801
SampleDataUtil: add two more expense types into sample
teowz46 6b5aed5
Merge remote-tracking branch 'upstream/master'
02d21e0
Resolve merge conflict
1a08983
UserGuide: update service section with the two adjustment expense types
teowz46 e6ade99
UserGuide: add v2.0 section
c6885c8
UserGuide: update
0cebd8b
UserGuide: fix minor stuff
teowz46 6dee7c1
UserGuide: try fixing icon size
e88e3f4
AboutUs: update with link to PPP
736edf2
adamwth.adoc: update PPP
2342ac9
UGDG: update
d2f8e2c
UG: update image size
cb48a71
UG: update image size
ee1efb4
Merge pull request #238 from adamwth/adam-ppp
adamwth 69e1cf4
UserGuide: minor fix (#239)
adamwth 28ac5b1
Update config.json
JiaqingTan 54742a2
update author names for reposense (#230)
neilish3re 0115580
DeveloperGuide: add ServiceCommand stuff with a flowchart
teowz46 776575f
Merge remote-tracking branch 'upstream/master' into user-dev-guide
teowz46 0a74fe1
[v1.4] Update Adam's PPP (#244)
adamwth fe75060
ModelClassDiagram: update with current structure
teowz46 60c5b76
ModelClassDiagram: update the better diagram also
teowz46 c8fae31
UserGuide and DevGuide documentation (#235)
pikulet 51a6011
Fix implementation of resetUndoRedoHistory (#236)
pikulet a65c4b3
DeveloperGuide: add sequence diagram for addExpense
teowz46 af51381
DeveloperGuide: make addExpense sequence diagram bigger
teowz46 0650c70
Autocomplete Feature (#237)
neilish3re a5c7916
DeveloperGuide: add more design considerations
teowz46 c2be068
all: fix checkstyle errors
teowz46 00e2abc
Documentation updates, test cases, comments (#246)
pikulet 3578f0b
Change Application Name to "Concierge", edit PPP (#243)
JiaqingTan 3233656
UserGuide, DevGuide, PPP documentation (#245)
neilish3re 4d9f6e1
docs: add my own PPP
teowz46 d37709b
XmlAdaptedRoomTest: add more tests to increase coverage
teowz46 507a397
XmlAdaptedRoomTest: fix checkstyle errors
teowz46 7f938d8
Update doc images from jpg to png format (#249)
neilish3re 58700e6
UserGuide: add minor corrections
teowz46 e177b85
UG and DG updates for Expenses stuff (#247)
teowz46 db39bcd
Change uppercase PNG to lowercase png (#250)
neilish3re d1a7a6b
Merge remote-tracking branch 'upstream/master' into user-dev-guide
teowz46 5511dc6
UserGuide and DeveloperGuide: minor edits from previous PR
teowz46 a7a14fd
UserGuide: use important icon
teowz46 09a16c0
UserGuide: fix some formatting errors
teowz46 01ff4f3
UG and DG updates (#252)
teowz46 87112f6
UserGuide: rearrange stuff in service
teowz46 3c5352e
Merge remote-tracking branch 'upstream/master' into user-dev-guide
teowz46 61a6397
More UG updates (#253)
teowz46 acb4536
AboutUs: update my PPP link
teowz46 5d6ded3
Updated LogicComponentClassDiagram (#251)
neilish3re 787fa8c
AboutUs: update my pic
teowz46 298d416
Merge remote-tracking branch 'upstream/master' into user-dev-guide
teowz46 9dd368f
Merge pull request #254 from teowz46/user-dev-guide
teowz46 31fa3a1
Renaming of parser in Logic Component Class Diagram (#255)
neilish3re 9f6e7d2
AddExpenseSequenceDiagram: fix out of alignment objects (#256)
teowz46 fbb4eed
README: update link for ConciergeFinal.png to show properly in index.…
teowz46 a8d9903
Remove gitter badge
pikulet e5f8172
[v1.4] Docs update (#257)
adamwth 36b4638
Update to UserGuide for List + Find (#261)
JiaqingTan f692f06
Update documentation (#260)
pikulet a20c63b
[v1.4] SampleDataUtil: add yesterday-today booking to r/005 (#263)
adamwth c7b7174
Update PPP links (#262) - forced merge
pikulet 7573517
README (#264)
teowz46 c857168
DeveloperGuide: add manual testing instructions for service (#265)
teowz46 8f9c6c7
Add instructions for manual testing: list, find, autocomplete (#266)
pikulet 7d02fae
DG: update manual test instructions for checkin, checkout, reassign (…
adamwth 4bd7e62
DG fix (#268)
adamwth 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
Large diffs are not rendered by default.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
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.
I don't think you're supposed to edit the license
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.
Oops, thanks!