Commit Graph

198 Commits

Author SHA1 Message Date
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
034685e1e9 update adminbsb for confirms 2017-10-17 18:09:17 +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
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
Aung Myo
6e47fbfe41 update slim scroll 2017-10-11 17:53:29 +06:30
Aung Myo
12bf1dfc19 update admin bsb 2017-10-11 14:15:00 +06:30
Yan
e1204d84d9 update header 2017-10-11 10:02:47 +06:30
Aung Myo
79c7b46ab7 update adminbsb design 2017-10-09 18:17:45 +06:30
Aung Myo
92e8885886 update admin theme 2017-10-09 15:22:58 +06:30
Yan
1916d33533 provision setup 2017-10-09 14:46:58 +06:30
Yan
7ebd874c56 merge with chart 2017-10-09 10:51:17 +06:30
Yan
add2c26722 updating 2017-10-03 18:44:27 +06:30
Yan
c28751a8e0 login ui modified 2017-10-03 14:11:12 +06:30
Yan
f9ec0da867 add favicon and edit 2017-10-03 09:58:45 +06:30
Yan
f7d3e4c0e3 google font 2017-09-29 15:15:32 +06:30
Aung Myo
444b270dd1 update ui design 2017-09-29 13:42:41 +06:30
Yan
9454df17a0 updating 2017-09-29 13:32:56 +06:30
Yan
343a61a7e3 Merge branch 'master' into adminbsb_material_ui_test 2017-09-28 18:25:44 +06:30
Yan
8d48a73cfc compatible test 2017-09-28 18:25:31 +06:30
Aung Myo
e7c2e3c007 update addorder 2017-09-27 17:54:54 +06:30
Aung Myo
35b9a9e02a Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into oqs 2017-09-27 11:26:27 +06:30
Aung Myo
ddf466d3fe update addorder available and max qty 2017-09-27 11:26:13 +06:30
Yan
15a2df5922 not compitable with our tech 2017-09-21 17:52:30 +06:30
Yan
3e4fc7d45d not compitable with our tech 2017-09-21 17:51:59 +06:30
Yan
1a4ca5238f update dashboard layout 2017-09-21 13:50:14 +06:30
Yan
91ad6e3ef0 BSBMaterial added 2017-09-20 19:25:19 +06:30
Yan
bcfd088d5d changing dashboard 2017-09-20 16:29:27 +06:30
Yan
6db3e96c1c Merge branch 'qr_code' of bitbucket.org:code2lab/sxrestaurant 2017-09-11 17:04:22 +06:30
Aung Myo
361e439664 update qr code 2017-09-11 15:44:45 +06:30
Yan
a50becb365 merge with august_spring 2017-09-06 18:32:45 +06:30
Aung Myo
a9d31935a1 update addorder bugs 2017-09-06 13:22:46 +06:30
Zin Lin Phyo
31021813b0 inventory list and stock check 2017-09-05 16:47:50 +06:30
Aung Myo
4a85039170 update oqs action cable for order cahnnel and oqs channel 2017-09-05 14:07:20 +06:30