Commit Graph

363 Commits

Author SHA1 Message Date
Aung Myo
c3f21445d8 update conflicx reset.css 2017-10-25 14:05:15 +06:30
Aung Myo
da6d85eaf5 update report and inventory layout design 2017-10-25 14:03:15 +06:30
Yan
bbae5cd5cc update promotion form 2017-10-25 13:03:12 +06:30
Aung Myo
34a4e485af update setting admin pages 2017-10-24 18:16:03 +06:30
Aung Myo
0d6167eca9 update setting admin pages 2017-10-24 15:22:34 +06:30
Yan
bb96cf6db5 Merge branch 'adminbsb_material_ui' of bitbucket.org:code2lab/sxrestaurant into adminbsb_material_ui 2017-10-23 18:40:13 +06:30
Aung Myo
e1dc1d4a8a update orgamidesign etcc.. 2017-10-23 18:11:43 +06:30
Aung Myo
17926742d5 update twice scroll etcc.. 2017-10-23 17:40:02 +06:30
Aung Myo
dd08fd4298 update addorder button and plus icon etcc.. 2017-10-23 17:28:48 +06:30
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
14fc9b1a45 update oqs 2017-10-23 16:14:29 +06:30
Aung Myo
735dc228db update admin bsb for add order design 2017-10-23 13:58:54 +06:30
Yan
ac42c4a78e ui edited 2017-10-23 13:20:41 +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
yamin
382e9fd4fa inventory definition.coffee 2017-10-23 11:40:37 +06:30
yamin
1aea52619a UI change 2017-10-23 11:38:10 +06:30
Aung Myo
f8279084ea update admin bsb for layout inventory 2017-10-23 10:54:34 +06:30
Aung Myo
ccab11acb2 update admin bsb for layout 2017-10-23 09:38:11 +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
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
6066eb2a4f update tab and select 2017-10-20 12:22:05 +06:30
Aung Myo
990e32a332 update logout an d remove botstrap select 2017-10-20 11:18:47 +06:30
Aung Myo
1958d9de67 update delete click 2017-10-19 18:25:39 +06:30
Aung Myo
575d1b0638 Merge branch 'adminbsb_material_ui' of bitbucket.org:code2lab/sxrestaurant into adminbsb_material_ui 2017-10-19 18:21:45 +06:30
Aung Myo
0809965edf update loguou 2017-10-19 18:20:48 +06:30
Aung Myo
78c6304748 update confirm box 2017-10-19 18:17:56 +06:30
Aung Myo
034685e1e9 update adminbsb for confirms 2017-10-17 18:09:17 +06:30
Yan
264318966e Merge branch 'adminbsb_material_ui' of bitbucket.org:code2lab/sxrestaurant into adminbsb_material_ui 2017-10-17 10:24:15 +06:30
Aung Myo
46e7431d1e update admin confirm box 2017-10-17 10:06:17 +06:30
Yan
ade48433bc temp edit for 16 demo 2017-10-16 19:23:25 +06:30
Aung Myo
98bc14c83d update adminbsb for settins 2017-10-16 18:27:57 +06:30
Aung Myo
8cecb9a524 update admin bsb 2017-10-16 15:29:41 +06:30
Aung Myo
e3cf15c096 update admin bsb design 2017-10-16 11:41:53 +06:30
Aung Myo
37d84c5361 fixed conflic app.css 2017-10-13 15:58:06 +06:30
Aung Myo
ae482b91f9 update setting menu design 2017-10-13 15:53:50 +06:30
Yan
ee0463508e add mm and ui reset 2017-10-13 14:56:04 +06:30
Yan
7f5c2d7277 merge with origin 2017-10-12 18:11:03 +06:30
Yan
5df78b10ed change login ui from ko kyawS 2017-10-12 16:17:20 +06:30
Yan
cd5f2eb748 remove _sidebar and add mm 2017-10-12 15:42:06 +06:30
Aung Myo
dafead3f9e Merge branch 'adminbsb_material_ui' of bitbucket.org:code2lab/sxrestaurant into adminbsb_material_ui 2017-10-12 15:21:57 +06:30
Aung Myo
535fe17d81 update Setting all layout 2017-10-12 15:20:48 +06:30
Yan
9074c6dacc add file input min 2017-10-12 10:44:26 +06:30
Yan
59b47518a1 merge with origin 2017-10-12 10:23:51 +06:30
Yan
de1469bd5e Merge branch 'oqs' of bitbucket.org:code2lab/sxrestaurant into adminbsb_material_ui 2017-10-12 10:16:00 +06:30
Yan
bc2101bf42 merge with staging 2017-10-12 09:59:24 +06:30