Code

Photo Update and Delete Extra files#164

Code

Open

SalsabilTasnia wants to merge 223 commits intonusCS2113-AY1819S1:masternusCS2113-AY1819S1/addressbook-level3:masterfrom SalsabilTasnia:masterSalsabilTasnia/addressbook-level3:masterCopy head branch name to clipboard

+7,118-572

Commits

Commits on Sep 25, 2018

• added About Us

  kangmingtay

  committed
  ac4930c

• Merge pull request CS2113-AY1819S1-F09-2#1 from kangmingtay/master

  Show description for 6846cfd
  kangmingtay

  authored
  6846cfd

• updated link to 'build status' badge

  kangmingtay

  committed
  0ea373e

• Merge pull request CS2113-AY1819S1-F09-2#2 from kangmingtay/master

  Show description for 346ec97
  kangmingtay

  authored
  346ec97

• updated the layout

  kangmingtay

  committed
  2594b66

• added coveralls badge

  kangmingtay

  committed
  5ccdc7b

• fixed some minor layout issues

  kangmingtay

  committed
  b3a84d0

• added UI image

  kangmingtay

  committed
  45f037d

• Merge pull request CS2113-AY1819S1-F09-2#3 from kangmingtay/master

  Show description for c3a6f21
  kangmingtay

  authored
  c3a6f21

Commits on Sep 26, 2018

• Add the "About Us" documentation

  kangmingtay

  committed
  e23125d

• Add px1099.png (Pham's picture)

  px1099

  committed
  019bf83

• Merge pull request CS2113-AY1819S1-F09-2#4 from kangmingtay/master

  Show description for d2eac69
  kangmingtay

  authored
  d2eac69

• Merge branch 'Update_Pham_docs'

  px1099

  committed
  5fd6f92

• move the "About Us" file to docs

  kangmingtay

  committed
  d5e00a5

• Merge pull request CS2113-AY1819S1-F09-2#6 from kangmingtay/master

  Show description for f5d2d98
  kangmingtay

  authored
  f5d2d98

• Merge branch 'master' of https://github.com/CS2113-AY1819S1-F09-2/main

  px1099

  committed
  a2b235b

• Merge pull request CS2113-AY1819S1-F09-2#5 from px1099/master

  Show description for c2e19fc
  px1099

  authored
  c2e19fc

• AboutUs.adoc: Change Pham's detail

  px1099

  committed
  1779bea

• Remove pham.jpg (already replaced by px1099.png)

  px1099

  committed
  c64a483

• Merge pull request CS2113-AY1819S1-F09-2#7 from px1099/master

  Show description for a458b2f
  px1099

  authored
  a458b2f

• Add first few use cases as templates to be used in the future

  

  Wei Ming

  committed
  cacb262

• Add non functional requirements

  

  Wei Ming

  committed
  db4c727

• Merge pull request CS2113-AY1819S1-F09-2#8 from AngWM/topic-updateDeveloperGuide

  Show description for 0dc29a2
  AngWM

  authored
  0dc29a2

• Change User Guide

  kianhong95

  committed
  df5c72b

• Merge pull request CS2113-AY1819S1-F09-2#9 from kianhong95/master

  Show description for ef2de84
  kianhong95

  authored
  ef2de84

Commits on Sep 29, 2018

• updated the readme.adoc

  Show description for c2be251
  SalsabilTasnia

  committed
  c2be251

• Update README.adoc

  SalsabilTasnia

  authored
  c686209

Commits on Oct 2, 2018

• Update README.adoc

  SalsabilTasnia

  authored
  bef607a

• Update README.adoc

  SalsabilTasnia

  authored
  3f72628

• Merge pull request CS2113-AY1819S1-F09-2#14 from SalsabilTasnia/master

  Show description for adc5826
  kangmingtay

  authored
  adc5826

• add ListMemberCommand that extends the Command Class but without the logic

  kangmingtay

  committed
  861e193

• changes made

  SalsabilTasnia

  committed
  a442e3b

• changes made to readme

  SalsabilTasnia

  committed
  fdaa42b

• changes made to readme

  SalsabilTasnia

  committed
  01137f9

• Merge branch 'master' of https://github.com/CS2113-AY1819S1-F09-2/main into updatereadme

  SalsabilTasnia

  committed
  2cea135

• Update README.adoc

  SalsabilTasnia

  authored
  f8af264

Commits on Oct 3, 2018

• add ordering classes in data package

  px1099

  committed
  0084766

• add OrderList class

  px1099

  committed
  be3b3ea

• remove unnecessary import from OrderList

  px1099

  committed
  3daad21

Commits on Oct 4, 2018

• add RestaurantManagementSystem class (equivilent to the AddressBook class)

  px1099

  committed
  80b1e0f

• rename RMS class

  px1099

  committed
  6118c26

• Order.java: add getDishQuantitiy( )

  px1099

  committed
  2861c17

• Rename member of Order class.

  px1099

  committed
  95ab1f4

• change typing of price members from int to double

  px1099

  committed
  c6bf95a

• add Storage classes for Order List

  px1099

  committed
  71c7b37

• made many changes

  SalsabilTasnia

  committed
  246a3a5

• Add methods for Dish class

  px1099

  committed
  83c1268

• changed back the UI to be customised to RMS

  SalsabilTasnia

  committed
  4fa7d30

• edit the Logic, Command, CommandResult classes

  px1099

  committed
  84eb71e

• edit the Main classes and add OrderCommandResult class

  px1099

  committed
  a1ab470

• add listorder command

  px1099

  committed
  cc242cc

• update userGuide for listOrder command

  px1099

  committed
  41acc92

• Merge pull request CS2113-AY1819S1-F09-2#15 from px1099/add-ordering-classes

  Show description for 8b69ae4
  px1099

  authored
  8b69ae4

• Added List Employees Command

  kianhong95

  committed
  7970ff1

• Merge pull request CS2113-AY1819S1-F09-2#16 from SalsabilTasnia/salsabil

  Show description for 5baa759
  AngWM

  authored
  5baa759

• Fix CS2113-AY1819S1-F09-2#16 pull request merge conflicts with master

  

  Wei Ming

  committed
  d3f9f99

• Merge pull request CS2113-AY1819S1-F09-2#18 from AngWM/topic-fixPr16Conflicts

  Show description for eb70dd3
  AngWM

  authored
  eb70dd3

• Merge branch 'master' into EmployeeClass

  AngWM

  authored
  ac1490c

• Merge pull request CS2113-AY1819S1-F09-2#17 from kianhong95/EmployeeClass

  Show description for 3a6d9e2
  AngWM

  authored
  3a6d9e2

• Fix CS2113-AY1819S1-F09-2#17 pull request merge conflicts with master

  

  Wei Ming

  committed
  d7a3980

• Merge pull request CS2113-AY1819S1-F09-2#20 from AngWM/topic-fixPr17Conflicts

  Show description for 3ea393b
  AngWM

  authored
  3ea393b

• Merge branch 'master' into add-members-feature

  AngWM

  authored
  65e80c9

• Merge pull request CS2113-AY1819S1-F09-2#19 from kangmingtay/add-members-feature

  Show description for 9e806e8
  AngWM

  authored
  9e806e8

• Merge branch 'master' into salsabil

  AngWM

  authored
  4c31a93

Commits on Oct 5, 2018

• Testing travis fix

  

  Wei Ming

  committed
  13e1b8a

• Testing travis fix 2

  

  Wei Ming

  committed
  51db7f1

• Merge pull request CS2113-AY1819S1-F09-2#22 from AngWM/fix-travisTestFailed

  Show description for d493eaf
  AngWM

  authored
  d493eaf

• made listmenu command and viewallmenu

  SalsabilTasnia

  committed
  98746f7

• deleted extra files

  SalsabilTasnia

  committed
  f567adb

• deleted extra files

  SalsabilTasnia

  committed
  ce1f2f3

• Merge remote-tracking branch 'origin/salsabil' into salsabil

  SalsabilTasnia

  committed
  733bd5e

Commits on Oct 9, 2018

• Add files via upload

  AngWM

  authored
  5618f12

• add kangmingtay.png file

  kangmingtay

  committed
  990386a

• Merge pull request CS2113-AY1819S1-F09-2#23 from kangmingtay/master

  Show description for fafba5d
  kangmingtay

  authored
  fafba5d

• change AboutUs.adoc file

  kangmingtay

  committed
  bdf0d8c

• Merge pull request CS2113-AY1819S1-F09-2#24 from kangmingtay/master

  Show description for 409b8f7
  kangmingtay

  authored
  409b8f7

• Modified the MESSAGES file

  Show description for 2488397
  SalsabilTasnia

  committed
  2488397

• Merge branch 'master' of https://github.com/CS2113-AY1819S1-F09-2/main

  SalsabilTasnia

  committed
  1394f83

• Modified the Welcome Message

  SalsabilTasnia

  committed
  182f0f9

• Modified the Welcome Message

  SalsabilTasnia

  committed
  d779180

• add changes to first 2 lines

  kangmingtay

  committed
  3bd2907

• Merge pull request CS2113-AY1819S1-F09-2#25 from kangmingtay/master

  Show description for 59547e6
  kangmingtay

  authored
  59547e6

• add kianhong's picture to AboutUs.adoc

  kangmingtay

  committed
  b5f455d

• Merge pull request CS2113-AY1819S1-F09-2#26 from kangmingtay/master

  Show description for 643a1d6
  kangmingtay

  authored
  643a1d6

• Merge pull request CS2113-AY1819S1-F09-2#27 from SalsabilTasnia/master

  Show description for 241f00d
  SalsabilTasnia

  authored
  241f00d

Commits on Oct 10, 2018

• Merge branch 'master' of https://github.com/CS2113-AY1819S1-F09-2/main

  SalsabilTasnia

  committed
  b584326

• Changed the about us photo

  SalsabilTasnia

  committed
  02f6938

• Merge branch 'master' of https://github.com/CS2113-AY1819S1-F09-2/main

  SalsabilTasnia

  committed
  279f644

• Modified the MainWindow file to display MESSAGE_WELCOME instead of MESSAGE_RMS_WELCOME

  SalsabilTasnia

  committed
  afbabbc

• deleted the MESSAGE_RMS_WELCOME

  SalsabilTasnia

  committed
  a463160

• deleted the MESSAGE_RMS_WELCOME

  SalsabilTasnia

  committed
  e974113

• Clean up code with standardization

  

  Wei Ming

  committed
  4edd44f

• Change storage file name

  

  Wei Ming

  committed
  ef3bd91

• Remove displayWelcomeMessage

  

  Wei Ming

  committed
  a38c71b

• Merge pull request CS2113-AY1819S1-F09-2#29 from AngWM/fix-cleaningUpCode

  Show description for 5e62797
  AngWM

  authored
  5e62797

• Merge pull request CS2113-AY1819S1-F09-2#28 from SalsabilTasnia/master

  Show description for 6dd50e5
  AngWM

  authored
  6dd50e5

• Change profile images to lowercase

  

  Wei Ming

  committed
  865d23e

• Merge pull request CS2113-AY1819S1-F09-2#30 from AngWM/fix-profileImageName

  Show description for 2b7e92e
  AngWM

  authored
  2b7e92e

• Change profile images to lowercase

  

  Wei Ming

  committed
  25047c9

• Merge pull request CS2113-AY1819S1-F09-2#31 from AngWM/fix-profileImageName

  Show description for c36f524
  AngWM

  authored
  c36f524

• add member's feature

  kangmingtay

  committed
  24e33eb

• Merge branch 'pr-32' into fix-mergePR32

  Show description for 0c84ca9
  

  Wei Ming

  committed
  0c84ca9

• Continue merging pull request CS2113-AY1819S1-F09-2#32

  

  Wei Ming

  committed
  a75f44b

• Merge pull request CS2113-AY1819S1-F09-2#33 from AngWM/fix-mergePR32

  Show description for 1802b7b
  AngWM

  authored
  1802b7b

• Refactor code to make it more readable and remove unnecessary CommandResult constructor

  px1099

  committed
  86cd562

• Merge pull request CS2113-AY1819S1-F09-2#34 from px1099/remove_CommandResult_constructors

  Show description for f290bb7
  kangmingtay

  authored
  f290bb7

• rename ui mockup file

  kangmingtay

  committed
  758e072

• Merge pull request CS2113-AY1819S1-F09-2#35 from kangmingtay/master

  Show description for e60135f
  kangmingtay

  authored
  e60135f

• Refactor code

  px1099

  committed
  862d0ff

• Add comments for menu methods

  px1099

  committed
  d4344f8

• Merge pull request CS2113-AY1819S1-F09-2#36 from px1099/refactor-code

  Show description for ce14e3f
  px1099

  authored
  ce14e3f

Commits on Oct 11, 2018

• add OrderClearCommand class

  px1099

  committed
  2837d3a

• refactor code & add description comments for some methods

  px1099

  committed
  8bbb4e8

• HelpCommand.java: edit help message

  px1099

  committed
  2b63c65

• Logic.java: add comments

  px1099

  committed
  0816af0

• Logic.java: edit method recordResult() to record all last shown list of each type

  px1099

  committed
  c07441f

• Refactor and add comments

  px1099

  committed
  5b18926

• included the add menu command

  SalsabilTasnia

  committed
  fa340ba

• .gitignore: add RMS.txt

  px1099

  committed
  e1bc1a1

• Added AddEmployeeCommand

  kianhong95

  committed
  185b33d

• Add deleteorder command

  px1099

  committed
  8a64b63

• Parser.java: add cases for clearorder and deleteorder

  px1099

  committed
  bb4e1b1

• Merge pull request CS2113-AY1819S1-F09-2#38 from kianhong95/EmployeeAdd

  Show description for cb54dbd
  kianhong95

  authored
  cb54dbd

• UserGuide.adoc: update deleteorder and clearorder

  px1099

  committed
  c972787

• Merge branch 'master' into order-commands

  px1099

  authored
  6cfa7af

• Merge pull request CS2113-AY1819S1-F09-2#37 from px1099/order-commands

  Show description for 300aa1a
  px1099

  authored
  300aa1a

• Modified the Parser.Test file and added MenuListCommand_parsedCorrectly()

  Show description for 7b607be
  SalsabilTasnia

  committed
  7b607be

• Added comments to the relevant menu files

  SalsabilTasnia

  committed
  167479b

• Merge pull request CS2113-AY1819S1-F09-2#40 from SalsabilTasnia/version2

  Show description for a4165a8
  SalsabilTasnia

  authored
  a4165a8

Commits on Oct 12, 2018

• commit message

  SalsabilTasnia

  committed
  ab8017d

• merge successful

  SalsabilTasnia

  committed
  4a8ffea

• merge successful

  SalsabilTasnia

  committed
  02c59cc

• configure crlf

  SalsabilTasnia

  committed
  709f8a3

• modified the testutil file (imports)

  SalsabilTasnia

  committed
  04ffd70

• Merge branch 'master' of https://github.com/CS2113-AY1819S1-F09-2/main into version2

  SalsabilTasnia

  committed
  bf7d00f

• Create subfolders for commands & change, edit the order of imports

  px1099

  committed
  a18def0

• Update travis.yml to test coverage

  AngWM

  authored
  497d1e0

• Update .travis.yml

  AngWM

  authored
  f4e6d75

• Update build.gradle

  AngWM

  authored
  6fed691

• Merge pull request CS2113-AY1819S1-F09-2#49 from CS2113-AY1819S1-F09-2/topic-addCoverage

  Show description for d73cafd
  AngWM

  authored
  d73cafd

• Test travis config

  AngWM

  authored
  cea778b

• Update build.gradle

  AngWM

  authored
  56828d5

• Revert build.gradle

  AngWM

  authored
  d953f8a

• Revert travis.yml

  AngWM

  authored
  7472713

• Merge pull request CS2113-AY1819S1-F09-2#48 from px1099/create-command-subfolders

  Show description for 07e7227
  px1099

  authored
  07e7227

Commits on Oct 13, 2018

• Refactor: change RMS class name into Rms to follow the coding standard

  px1099

  committed
  aec4010

• Merge pull request CS2113-AY1819S1-F09-2#50 from px1099/change-rms-class-name

  Show description for 3f79da6
  px1099

  authored
  3f79da6

Commits on Oct 14, 2018

• Changed how the Employee class, listemp and addemp works

  kianhong95

  committed
  85aa45c

• Merge branch 'master' of https://github.com/CS2113-AY1819S1-F09-2/main

  kianhong95

  committed
  7bbca60

• Merge pull request CS2113-AY1819S1-F09-2#52 from kianhong95/master

  Show description for d98db43
  kianhong95

  authored
  d98db43

• added rms

  SalsabilTasnia

  committed
  10ad22c

• commit

  SalsabilTasnia

  committed
  20cf203

• testcommand

  SalsabilTasnia

  committed
  90daa25

• remove testcommand

  SalsabilTasnia

  committed
  759c125

• Added MenuDeleteMenu Command

  SalsabilTasnia

  committed
  9049908

• Added MenuFindCommand

  SalsabilTasnia

  committed
  0a58533

Commits on Oct 15, 2018

• added execite_list_showsAllMenuItems test in LogicTest.java file

  SalsabilTasnia

  committed
  89e2c18

• Added Employee Delete command

  kianhong95

  committed
  0c62cb9

• Merge pull request CS2113-AY1819S1-F09-2#53 from kianhong95/master

  Show description for 143f148
  kianhong95

  authored
  143f148

• Added Employee position detail

  kianhong95

  committed
  97693df

• Merge pull request CS2113-AY1819S1-F09-2#61 from kianhong95/master

  Show description for 55b3046
  kianhong95

  authored
  55b3046

• Merge pull request CS2113-AY1819S1-F09-2#63 from SalsabilTasnia/master

  Show description for 4b682b9
  SalsabilTasnia

  authored
  4b682b9

Commits on Oct 16, 2018

• trying to fix addmenuCommand_invalidArgs test case

  SalsabilTasnia

  committed
  efa3b27

• solve merge conflicts

  SalsabilTasnia

  committed
  6fd8b01

• readded menu delete in parser

  SalsabilTasnia

  committed
  419f6e8

• readded menu find in parser

  SalsabilTasnia

  committed
  28ecbaa

• commented off the add test in parser test file

  SalsabilTasnia

  committed
  1ff80ee

Commits on Oct 17, 2018

• Order.java: change class of customer member from Person to Member

  px1099

  committed
  847deb2

• Order.java: replace all Dish classes with Menu classes

  px1099

  committed
  921732d

• added a test comment in MenuAddCommand

  SalsabilTasnia

  committed
  5ec8927

• add Points field in member

  kangmingtay

  committed
  277ca1b

• add MemberAddCommand

  kangmingtay

  committed
  f63d66f

• Added Test Cases for current functions: listemp addemp delemp

  kianhong95

  committed
  2a0b6ff

• Add statistics function skeleton codes

  

  Wei Ming

  committed
  5970446

• Merged and added test cases for current functions: listmp, addemp and delemp

  kianhong95

  committed
  550bd91

• Update developer guide with product scope

  

  Wei Ming

  committed
  65467a2

• Merge pull request CS2113-AY1819S1-F09-2#68 from kianhong95/master

  Show description for 05746af
  AngWM

  authored
  05746af

• Merge pull request CS2113-AY1819S1-F09-2#66 from AngWM/topic-statsFunction

  Show description for ee536ef
  kianhong95

  authored
  ee536ef

• Merge pull request CS2113-AY1819S1-F09-2#67 from AngWM/topic-wmDeveloperGuideV1.2

  Show description for af7b1e6
  kianhong95

  authored
  af7b1e6

• Order.java: create defensive getters & setters

  px1099

  committed
  15cc067

• Merge pull request CS2113-AY1819S1-F09-2#69 from kangmingtay/master

  Show description for efbd387
  kangmingtay

  authored
  efbd387

• add Member tests

  kangmingtay

  committed
  053b62d

• Merge pull request CS2113-AY1819S1-F09-2#70 from kangmingtay/master

  Show description for aaf695b
  px1099

  authored
  aaf695b

• UniqueOrderList.java: add DuplicateOrderException

  px1099

  committed
  1b3da9e

Commits on Oct 18, 2018

• Rms.java: add member draftOrder

  px1099

  committed
  3a2c9f0

• Order.java: add constants and method to create psuedo empty customer for the constuctor of draftOrder.

  px1099

  committed
  61c5aa6

• Add OrderAddCommand.java to show the list of commands used for adding new order.

  px1099

  committed
  1cd7ebc

• OrderAddCommand.java: refactor a line

  px1099

  committed
  e098595

• Refactoring files

  px1099

  committed
  70833e5

• edited User Guide (Menu) and Dev Guide (Menu and User Stories)

  SalsabilTasnia

  committed
  2ebe923

• Add DraftOrderEditCustomerCommand.java

  px1099

  committed
  8ecabec

• edited the User Guide (Quick Start)

  SalsabilTasnia

  committed
  ed7cef3

• Order.java: add logger to hander exception for getNewEmptyCustomer()

  px1099

  committed
  aaba0d6

• Add DraftOrderEditDishCommand.java: implement command editdraftdish to add, delete and edit dishes in the draft order.

  px1099

  committed
  276a261

• Updated User Guide

  kianhong95

  committed
  79bd33a

• Add DraftOrderClearCommand.java: add command cleardraft to clear the draft order

  px1099

  committed
  abe06a9

• add description of member commands for user guide

  kangmingtay

  committed
  b7a4c70

• Merge pull request CS2113-AY1819S1-F09-2#73 from SalsabilTasnia/master

  Show description for 96ff282
  SalsabilTasnia

  authored
  96ff282

• Add DraftOrderConfirmCommand.java: add command confirmdraft to push the draft to the order list.

  px1099

  committed
  7222b85

• Merge pull request CS2113-AY1819S1-F09-2#74 from kangmingtay/UGDG

  Show description for 8cdbf90
  SalsabilTasnia

  authored
  8cdbf90

• Merge branch 'master' into complete-ordering-commands

  px1099

  authored
  16c0be0

• Order.java: change method getNewEmptyCustomer()

  px1099

  committed
  4c71475

• Merge pull request CS2113-AY1819S1-F09-2#75 from px1099/complete-ordering-commands

  Show description for 8d62b7a
  kangmingtay

  authored
  8d62b7a

• Update documents for ordering features

  px1099

  committed
  8dad70f

• Merge pull request CS2113-AY1819S1-F09-2#77 from px1099/edit-documents

  Show description for d29edec
  px1099

  authored
  d29edec

• UserGuide.adoc: edit mistakes

  px1099

  committed
  16da13a

• Merge pull request CS2113-AY1819S1-F09-2#78 from px1099/edit-documents

  Show description for da1df73
  px1099

  authored
  da1df73

• commit changes

  SalsabilTasnia

  committed
  857edb2

Commits on Oct 19, 2018

• added tests in LogicTest

  SalsabilTasnia

  committed
  d658f75

• commit message

  SalsabilTasnia

  committed
  abbf1e0

• Merge remote-tracking branch 'origin/master'

  SalsabilTasnia

  committed
  9e43ea5

• Merge remote-tracking branch 'upstream/master'

  kianhong95

  committed
  eb79ef5

• Update UserGuide.adoc

  kianhong95

  authored
  5b737f4

• Merge pull request CS2113-AY1819S1-F09-2#82 from kianhong95/master

  Show description for 664b65c
  AngWM

  authored
  664b65c

• made edits in import in LogicTest

  SalsabilTasnia

  committed
  44820cf

• fixed assertEquals bug

  SalsabilTasnia

  committed
  e07daa0

• Merge branch 'master' of https://github.com/CS2113-AY1819S1-F09-2/main

  SalsabilTasnia

  committed
  c8d876e

Commits on Oct 21, 2018

• commit

  SalsabilTasnia

  committed
  5471051

Commits on Oct 22, 2018

• added a new attribute Type to the Menu feature

  SalsabilTasnia

  committed
  12d57b8

• changed the regex of the Price attribute

  SalsabilTasnia

  committed
  83d8d59

• changed all the tests in Logic and Parser to match the new Type Attribute and the Price regex

  SalsabilTasnia

  committed
  284db7e

• added a clear command

  SalsabilTasnia

  committed
  284721b

• added a few test cases in Parser Test file

  SalsabilTasnia

  committed
  e0e8a89