[F11-2] Concierge#68

Open

adamwth wants to merge 559 commits intonus-cs2103-AY1819S1:masterfrom CS2103-AY1819S1-F11-2:master

+28,120-6,759

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

Commits on Oct 30, 2018

PasswordHashUtil.java: Add reference site
pikulet
committed
PasswordsStorage.java: Add password storage interface
pikulet
committed
UserPrefs.java: Add functionality to read in password file path
pikulet
committed
XmlUtilTest and XmlSerializableConciergeTest: update with new format of valid concierge, refactor to remove SOME hard-coded test cases from AB4
Adam
committed
XmlSerializableConciergeTest: update
Adam
committed
TypicalConcerge: Refactor name of getTypicalConcierge -> getTypicalConciergeClean, and getTypicalConciergeWithRoomBookings -> getTypicalConcierge
Adam
committed
fix style
Adam
committed
XmlConciergeStorageTest: update tests and relevant xml files used for tests
Adam
committed
XmlSerializableConciergeTest: update tests and add relevant XML files for updated tests
Adam
committed
Fix checkstyle errors
pikulet
committed
Merge branch 'master' into sign-in-feature
pikulet
committed
XmlUtilTest: update the format of how tests are conducted, RoomListPanelHandle: fix NodeNotFoundException bug by changing FXML id of RoomCard
Adam
committed
DarkTheme.css: update with roomCardPane
Adam
committed

Commits on Oct 31, 2018

Commits on Nov 1, 2018

Commits on Nov 2, 2018

Minor edits for UserGuide (#190 )

teowz46
authored and
pikulet
committed
[v1.4] User Guide update and Ui.png fix (#188 )

adamwth
authored and
pikulet
committed
UserGuide.adoc: Update to provide admin account (#191 )

pikulet
authored and
neilish3re
committed
Merge remote-tracking branch 'upstream/master' into service
teowz46
committed
Merge branch 'service' of https://github.com/teowz46/main into service
teowz46
committed
UserGuide: update
Adam
committed
mainapp: update
Adam
committed
include passwords.json
Adam
committed
update preferences.json
Adam
committed
UserGuide: update
Adam
committed
fix style'
Adam
committed
UserGuide: update (#195 )

adamwth
authored and
pikulet
committed

Commits on Nov 5, 2018

Commits on Nov 6, 2018

resolve merge conflict
Adam
committed

Commits on Nov 7, 2018

[v1.4] User Guide update (#220 )

adamwth
authored and
pikulet
committed
[v1.4] Select command tests (#219 )

adamwth
authored and
pikulet
committed
Merge remote-tracking branch 'upstream/master'
Adam
committed

Commits on Nov 8, 2018

Autocomplete feature (#221 )

neilish3re
authored and
JiaqingTan
committed
[v1.4] Reassign command (#222 )

adamwth
authored and
pikulet
committed
[v1.4] Docs update (#225 )

adamwth
authored and
pikulet
committed
Merge remote-tracking branch 'upstream/master'
Adam
committed
Revert "[v1.4] Docs update (#225 )"
adamwth
authored
Revert "[v1.4] Reassign command (#222 )"
adamwth
authored
Revert "Autocomplete feature (#221 )"
adamwth
authored
Merge pull request #227 from CS2103-AY1819S1-F11-2/revert-221-Autocomplete
adamwth
authored
Merge remote-tracking branch 'upstream/master'
Adam
committed
Create PPP template
pikulet
committed

Commits on Nov 9, 2018

Commits on Nov 10, 2018

Commits on Nov 11, 2018

Commits on Nov 12, 2018

UserGuide: add minor corrections
teowz46
committed
UG and DG updates for Expenses stuff (#247 )

teowz46
authored and
adamwth
committed
Change uppercase PNG to lowercase png (#250 )
neilish3re
authored
Merge remote-tracking branch 'upstream/master' into user-dev-guide
teowz46
committed
UserGuide and DeveloperGuide: minor edits from previous PR
teowz46
committed
UserGuide: use important icon
teowz46
committed
UserGuide: fix some formatting errors
teowz46
committed
UG and DG updates (#252 )

teowz46
authored and
adamwth
committed
UserGuide: rearrange stuff in service
teowz46
committed
Merge remote-tracking branch 'upstream/master' into user-dev-guide
teowz46
committed
More UG updates (#253 )

teowz46
authored and
adamwth
committed
AboutUs: update my PPP link
teowz46
committed
Updated LogicComponentClassDiagram (#251 )

neilish3re
authored and
JiaqingTan
committed
AboutUs: update my pic
teowz46
committed
Merge remote-tracking branch 'upstream/master' into user-dev-guide
teowz46
committed
Merge pull request #254 from teowz46/user-dev-guide
teowz46
authored
Renaming of parser in Logic Component Class Diagram (#255 )

neilish3re
authored and
JiaqingTan
committed
AddExpenseSequenceDiagram: fix out of alignment objects (#256 )

teowz46
authored and
JiaqingTan
committed
README: update link for ConciergeFinal.png to show properly in index.html and github (#259 )

teowz46
authored and
JiaqingTan
committed
Remove gitter badge
pikulet
authored
[v1.4] Docs update (#257 )
adamwth
authored
Update to UserGuide for List + Find (#261 )

JiaqingTan
authored and
pikulet
committed
Update documentation (#260 )
pikulet
authored
[v1.4] SampleDataUtil: add yesterday-today booking to r/005 (#263 )

adamwth
authored and
pikulet
committed
Update PPP links (#262 ) - forced merge
pikulet
authored
README (#264 )

teowz46
authored and
adamwth
committed
DeveloperGuide: add manual testing instructions for service (#265 )

teowz46
authored and
pikulet
committed
Add instructions for manual testing: list, find, autocomplete (#266 )
pikulet
authored
DG: update manual test instructions for checkin, checkout, reassign (#267 ) - forced merge

adamwth
authored and
pikulet
committed

Commits on Nov 13, 2018

DG fix (#268 )

adamwth
authored and
pikulet
committed