Commit Graph

1645 Commits

Author SHA1 Message Date
Yan
c85ebcff14 Merge branch 'adminbsb_material_ui' of bitbucket.org:code2lab/sxrestaurant into adminbsb_material_ui 2017-10-16 15:30:36 +06:30
Aung Myo
8cecb9a524 update admin bsb 2017-10-16 15:29:41 +06:30
Yan
cbefe0f7d8 check oqs print 2017-10-16 15:28:56 +06:30
Yan
70c56b245e instance in sale item report 2017-10-16 13:41:37 +06:30
Yan
42fce6fe86 change mm 2017-10-16 13:14:13 +06:30
Yan
4fa52fac3a Merge branch 'adminbsb_material_ui' of bitbucket.org:code2lab/sxrestaurant into adminbsb_material_ui 2017-10-16 11:44:01 +06:30
Yan
8bf423146a add order in room 2017-10-16 11:43:41 +06:30
Aung Myo
e3cf15c096 update admin bsb design 2017-10-16 11:41:53 +06:30
Aung Myo
e2d802da67 update adminbsb setting 2017-10-13 18:01:31 +06:30
Aung Myo
c64eac3f15 update admin bsb 2017-10-13 17:09:18 +06:30
Yan
bfe3727e7d merge with origin and add localize 2017-10-13 17:07:17 +06:30
Yan
1ba68cd152 origin 2017-10-13 16:27:13 +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
746f5ad471 add mm 2017-10-13 15:53:34 +06:30
Yan
9a761e5402 Merge branch 'adminbsb_material_ui' of bitbucket.org:code2lab/sxrestaurant into adminbsb_material_ui 2017-10-13 14:56:46 +06:30
Yan
ee0463508e add mm and ui reset 2017-10-13 14:56:04 +06:30
Aung Myo
17fe2ba4a2 Merge branch 'adminbsb_material_ui' of bitbucket.org:code2lab/sxrestaurant into adminbsb_material_ui 2017-10-12 18:17:29 +06:30
Aung Myo
e9ff6481d4 update adminbsb for setting pages 2017-10-12 18:17:05 +06:30
Yan
7f5c2d7277 merge with origin 2017-10-12 18:11:03 +06:30
Yan
2379079b03 add mm 2017-10-12 18:08:49 +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
Yan
a6b8389fd0 add mm 2017-10-12 15:34:16 +06:30
Aung Myo
049d3c5958 update settings item set 2017-10-12 15:27:50 +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
b7955b04fa merge with staging 2017-10-12 14:49:28 +06:30
Yan
429842ad9c add mm menu 2017-10-12 14:46:04 +06:30
Yan
150bb1a751 add mm 2017-10-12 14:44:30 +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
5057b8e224 add UI standard 2017-10-12 10:15:43 +06:30
Yan
bc2101bf42 merge with staging 2017-10-12 09:59:24 +06:30
Aung Myo
9365e64066 update slim scroll 2017-10-11 17:58:27 +06:30
Aung Myo
6e47fbfe41 update slim scroll 2017-10-11 17:53:29 +06:30
Yan
1f6c05b314 merge with chart 2017-10-11 17:51:29 +06:30
Yan
476aafa791 add localization 2017-10-11 17:29:28 +06:30
Yan
4ab89efaf2 add font for print setting 2017-10-11 15:16:40 +06:30
Aung Myo
12bf1dfc19 update admin bsb 2017-10-11 14:15:00 +06:30
Yan
2a9b44366a check login key 2017-10-11 10:21:44 +06:30
Aung Myo
60b5a17388 update product in product rb 2017-10-11 10:15:10 +06:30
Yan
5ba3a69c3f Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into staging 2017-10-11 10:03:30 +06:30
Yan
e1204d84d9 update header 2017-10-11 10:02:47 +06:30
Aung Myo
50756656a7 updat e addorder for product add 2017-10-10 18:05:09 +06:30
Yan
7df01dd0a2 Merge branch 'adminbsb_material_ui' of bitbucket.org:code2lab/sxrestaurant into adminbsb_material_ui 2017-10-10 17:19:17 +06:30
Yan
c7632a4c76 add default db connect if fail 2017-10-10 17:18:48 +06:30
Yan
8933dde41d add promotion activation in cashier req bill 2017-10-10 15:53:08 +06:30
Yan
a0ddef16c3 change api key 2017-10-10 14:28:33 +06:30