Yan 62ce53c978 Merge branch 'adminbsb_ui_changes' of bitbucket.org:code2lab/sxrestaurant into adminbsb_material_ui

2017-10-27 11:40:39 +06:30

..

accounts

update conflic from adminbsb_uidesign branch

2017-10-26 17:52:21 +06:30

cashier_terminals

update conflic from adminbsb_uidesign branch

2017-10-26 17:52:21 +06:30

commissioners

add right panel text for settings and CRM/queue

2017-10-26 16:19:23 +06:30

commissions

update conflic from adminbsb_uidesign branch

2017-10-26 17:52:21 +06:30

dining_charges

merge with origin

2017-10-26 17:58:43 +06:30

employees

update conflic from adminbsb_uidesign branch

2017-10-26 17:52:21 +06:30

item_sets

update breadcrumb

2017-10-26 17:45:37 +06:30

lookups

…

membership_actions

…

membership_settings

update breadcrumb

2017-10-26 17:45:37 +06:30

menu_categories

update conflic from adminbsb_uidesign branch

2017-10-26 17:52:21 +06:30

menu_item_attributes

update right panel text for menu

2017-10-26 17:01:03 +06:30

menu_item_instances

…

menu_item_options

update conflic from adminbsb_uidesign branch

2017-10-26 17:52:21 +06:30

menu_item_sets

…

menus

update material ui

2017-10-26 17:02:26 +06:30

order_queue_stations

update right panel text for menu

2017-10-26 17:01:03 +06:30

payment_method_settings

ui updated

2017-10-27 11:37:47 +06:30

processing_items

…

products

add right panel text for settings and CRM/queue

2017-10-26 16:19:23 +06:30

promotion_products

…

promotions

change right panel text for promotion

2017-10-27 11:13:36 +06:30

rooms

Merge branch 'adminbsb_material_ui' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes

2017-10-26 16:20:35 +06:30

set_menu_items

update material ui

2017-10-26 17:02:26 +06:30

simple_menu_items

update material ui

2017-10-26 17:02:26 +06:30

tables

Merge branch 'adminbsb_material_ui' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes

2017-10-26 16:20:35 +06:30

tax_profiles

add right panel text for settings and CRM/queue

2017-10-26 16:19:23 +06:30

zones

merge with origin

2017-10-26 17:58:43 +06:30