Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Photo Update and Delete Extra files #164

Open
wants to merge 223 commits into
base: master
Choose a base branch
from
Open

Photo Update and Delete Extra files #164

wants to merge 223 commits into from

Conversation

SalsabilTasnia
Copy link

Updated the Photo, Deleted the extra files for Menu feature and modified the welcome message

kangmingtay and others added 30 commits September 25, 2018 21:47
@kangmingtay
added About Us
ac4930c
@kangmingtay
Merge pull request CS2113-AY1819S1-F09-2#1 from kangmingtay/master
6846cfd 
added About Us
@kangmingtay
updated link to 'build status' badge
0ea373e
@kangmingtay
Merge pull request CS2113-AY1819S1-F09-2#2 from kangmingtay/master
346ec97 
updated link to 'build status' badge
@kangmingtay
updated the layout
2594b66
@kangmingtay
added coveralls badge
5ccdc7b
@kangmingtay
fixed some minor layout issues
b3a84d0
@kangmingtay
added UI image
45f037d
@kangmingtay
Merge pull request CS2113-AY1819S1-F09-2#3 from kangmingtay/master
c3a6f21 
Added modifications to the layout of the homepage (README.adoc)
@kangmingtay
Add the "About Us" documentation
e23125d
@px1099
Add px1099.png (Pham's picture)
019bf83
@kangmingtay
Merge pull request CS2113-AY1819S1-F09-2#4 from kangmingtay/master
d2eac69 
Add the "About Us" documentation
@px1099
Merge branch 'Update_Pham_docs'
5fd6f92
@kangmingtay
move the "About Us" file to docs
d5e00a5
@kangmingtay
Merge pull request CS2113-AY1819S1-F09-2#6 from kangmingtay/master
f5d2d98 
move the "About Us" file to docs
@px1099
Merge branch 'master' of https://github.com/CS2113-AY1819S1-F09-2/main
a2b235b
@px1099
Merge pull request CS2113-AY1819S1-F09-2#5 from px1099/master
c2e19fc 
Add Pham's picture in .png
@px1099
AboutUs.adoc: Change Pham's detail
1779bea
@px1099
Remove pham.jpg (already replaced by px1099.png)
c64a483
@px1099
Merge pull request CS2113-AY1819S1-F09-2#7 from px1099/master
a458b2f 
Change Pham's details in AboutUs
Add first few use cases as templates to be used in the future
cacb262
Add non functional requirements
db4c727
@AngWM
Merge pull request CS2113-AY1819S1-F09-2#8 from AngWM/topic-updateDev…
0dc29a2 
…eloperGuide

Update developer guide
@kianhong95
Change User Guide
df5c72b
@kianhong95
Merge pull request CS2113-AY1819S1-F09-2#9 from kianhong95/master
ef2de84 
Change User Guide
@SalsabilTasnia
updated the readme.adoc
c2be251 
created contact us
updates the UI mockup
@SalsabilTasnia
Update README.adoc
c686209
@SalsabilTasnia
Update README.adoc
bef607a
@SalsabilTasnia
Update README.adoc
3f72628
@kangmingtay
Merge pull request CS2113-AY1819S1-F09-2#14 from SalsabilTasnia/master
adc5826 
Update readme.adoc file
px1099 and others added 30 commits October 18, 2018 17:52
@px1099
Add DraftOrderEditDishCommand.java: implement command editdraftdish…
276a261 
… to add, delete and edit dishes in the draft order.
@kianhong95
Updated User Guide
79bd33a
@px1099
Add DraftOrderClearCommand.java: add command cleardraft to clear th…
abe06a9 
…e draft order
@kangmingtay
add description of member commands for user guide
b7a4c70
@SalsabilTasnia
Merge pull request CS2113-AY1819S1-F09-2#73 from SalsabilTasnia/master
96ff282 
Made changes based on PR review
@px1099
Add DraftOrderConfirmCommand.java: add command confirmdraft to push…
7222b85 
… the draft to the order list.
@SalsabilTasnia
Merge pull request CS2113-AY1819S1-F09-2#74 from kangmingtay/UGDG
8cdbf90 
add description of member commands for user guide
@px1099
Merge branch 'master' into complete-ordering-commands
16c0be0
@px1099
Order.java: change method getNewEmptyCustomer()
4c71475
@kangmingtay
Merge pull request CS2113-AY1819S1-F09-2#75 from px1099/complete-orde…
8d62b7a 
…ring-commands

Add Order feature implementation
@px1099
Update documents for ordering features
8dad70f
@px1099
Merge pull request CS2113-AY1819S1-F09-2#77 from px1099/edit-documents
d29edec 
Update documents for ordering features
@px1099
UserGuide.adoc: edit mistakes
16da13a
@px1099
Merge pull request CS2113-AY1819S1-F09-2#78 from px1099/edit-documents
da1df73 
Fix typos in User Guide
@SalsabilTasnia
commit changes
857edb2
@SalsabilTasnia
added tests in LogicTest
d658f75
@SalsabilTasnia
commit message
abbf1e0
@SalsabilTasnia
Merge remote-tracking branch 'origin/master'
9e43ea5
@kianhong95
Merge remote-tracking branch 'upstream/master'
eb79ef5
@kianhong95
Update UserGuide.adoc
5b737f4
@AngWM
Merge pull request CS2113-AY1819S1-F09-2#82 from kianhong95/master
664b65c 
Updated Employee Commands in User Doc
@SalsabilTasnia
made edits in import in LogicTest
44820cf
@SalsabilTasnia
fixed assertEquals bug
e07daa0
@SalsabilTasnia
Merge branch 'master' of https://github.com/CS2113-AY1819S1-F09-2/main
c8d876e
@SalsabilTasnia
commit
5471051
@SalsabilTasnia
added a new attribute Type to the Menu feature
12d57b8
@SalsabilTasnia
changed the regex of the Price attribute
83d8d59
@SalsabilTasnia
changed all the tests in Logic and Parser to match the new Type Attri…
284db7e 
…bute and the Price regex
@SalsabilTasnia
added a clear command
284721b
@SalsabilTasnia
added a few test cases in Parser Test file
e0e8a89
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
FormatCheckRequested
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@SalsabilTasnia @nus-se-pr-bot @kangmingtay @px1099 @AngWM @kianhong95