Commit Graph

1926 Commits

Author SHA1 Message Date
Yan
47efe20e8e Merge branch 'adminbsb_material_ui' of bitbucket.org:code2lab/sxrestaurant into adminbsb_material_ui 2017-10-23 16:17:29 +06:30
Aung Myo
2e41037d5f Merge branch 'adminbsb_ui_changes' of bitbucket.org:code2lab/sxrestaurant into adminbsb_material_ui 2017-10-23 16:15:35 +06:30
Aung Myo
14fc9b1a45 update oqs 2017-10-23 16:14:29 +06:30
Yan
4441944a37 comment oqs js 2017-10-23 16:07:52 +06:30
Yan
5c8adbe618 remove no need crm js 2017-10-23 15:49:55 +06:30
Yan
4cda67b967 update asset 2017-10-23 15:20:35 +06:30
Yan
a08d0f8fc7 fix asset 2017-10-23 15:11:11 +06:30
Yan
d63d309481 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2017-10-23 14:45:28 +06:30
Yan
52b29e251f update seed 2017-10-23 14:45:04 +06:30
Aung Myo
b7db48d6d7 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2017-10-23 14:44:29 +06:30
Yan
1aa3358013 update seed 2017-10-23 14:44:16 +06:30
Aung Myo
2539352e2d update admin bsb for add order design 2017-10-23 14:43:48 +06:30
Yan
67a6effc83 update chart for group hour 2017-10-23 14:18:31 +06:30
Aung Myo
735dc228db update admin bsb for add order design 2017-10-23 13:58:54 +06:30
yamin
d3dfabd66a delte ui change 2017-10-23 13:38:36 +06:30
Yan
4adfa48d75 seed fix 2017-10-23 13:31:02 +06:30
Yan
dfa3a4c08f seed fix 2017-10-23 13:30:29 +06:30
Yan
6f95d36dc9 update oqs 2017-10-23 13:27:59 +06:30
Yan
7e7a77660d Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2017-10-23 13:21:03 +06:30
Yan
ac42c4a78e ui edited 2017-10-23 13:20:41 +06:30
Aung Myo
e428a1bc87 update origin themem change sidebar 2017-10-23 13:19:59 +06:30
Aung Myo
c4b810dcd4 update origin themem change sidebar 2017-10-23 12:58:44 +06:30
Yan
aa9a84f09e change mm 2017-10-23 12:07:39 +06:30
Yan
ba44495663 shift open fix 2017-10-23 12:05:56 +06:30
Yan
58b180adc4 Merge branch 'adminbsb_material_ui' of bitbucket.org:code2lab/sxrestaurant into adminbsb_material_ui 2017-10-23 11:50:09 +06:30
Aung Myo
1147b81a8a Merge branch 'adminbsb_material_ui' of bitbucket.org:code2lab/sxrestaurant into adminbsb_material_ui 2017-10-23 11:48:01 +06:30
Aung Myo
973e6dc11e update admin bsb for layout nav bar 2017-10-23 11:47:35 +06:30
Yan
b989b78442 Merge branch 'adminbsb_material_ui' of bitbucket.org:code2lab/sxrestaurant into adminbsb_material_ui 2017-10-23 11:41:29 +06:30
yamin
382e9fd4fa inventory definition.coffee 2017-10-23 11:40:37 +06:30
Yan
44010e1762 add cashier zone terminal 2017-10-23 11:39:41 +06:30
yamin
1aea52619a UI change 2017-10-23 11:38:10 +06:30
Aung Myo
e44a512e80 Merge branch 'adminbsb_material_ui' of bitbucket.org:code2lab/sxrestaurant into adminbsb_material_ui 2017-10-23 10:54:51 +06:30
Aung Myo
f8279084ea update admin bsb for layout inventory 2017-10-23 10:54:34 +06:30
Yan
95ef534b04 add cashier zone in ui 2017-10-23 10:53:22 +06:30
Yan
649f50bd5e Merge branch 'adminbsb_material_ui' of bitbucket.org:code2lab/sxrestaurant into adminbsb_material_ui 2017-10-23 10:00:46 +06:30
Aung Myo
800143f66f Merge branch 'adminbsb_material_ui' of bitbucket.org:code2lab/sxrestaurant into adminbsb_material_ui 2017-10-23 09:59:46 +06:30
Yan
bcd86714e2 add cashier zones 2017-10-23 09:57:26 +06:30
Aung Myo
ccab11acb2 update admin bsb for layout 2017-10-23 09:38:11 +06:30
Yan
ce5e3b69ed Merge branch 'adminbsb_material_ui' of bitbucket.org:code2lab/sxrestaurant into adminbsb_material_ui 2017-10-20 19:15:46 +06:30
Yan
52067dbd51 race modified 2017-10-20 19:15:17 +06:30
Yan
8f3b30f2fa race 2017-10-20 19:09:17 +06:30
Aung Myo
ed6d3d8757 Merge branch 'adminbsb_material_ui' of bitbucket.org:code2lab/sxrestaurant into adminbsb_material_ui 2017-10-20 18:52:06 +06:30
Aung Myo
80f1170d8a update admin bsb crm layou 2017-10-20 18:50:30 +06:30
Yan
4874bb135c Merge branch 'adminbsb_material_ui' of bitbucket.org:code2lab/sxrestaurant into adminbsb_material_ui 2017-10-20 17:06:50 +06:30
Yan
8ceaf8be05 edited order 2017-10-20 17:06:34 +06:30
Aung Myo
66df689f4e update admin bsb 2017-10-20 17:04:10 +06:30
Aung Myo
f0494307f6 update admin bsb 2017-10-20 17:02:49 +06:30
Yan
ba39284f93 merge with origin 2017-10-20 14:31:01 +06:30
Yan
25bc6f1c26 parallel incoming req 2017-10-20 13:25:24 +06:30
Aung Myo
9dac7198e9 update tab and select 2017-10-20 12:23:27 +06:30