Commit Graph

1110 Commits

Author SHA1 Message Date
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
8f457ac937 change header 2017-10-12 16:28:45 +06:30
Yan
5df78b10ed change login ui from ko kyawS 2017-10-12 16:17:20 +06:30
Aung Myo
1fa23c01d7 update logout 3 times 2017-10-12 16:04:45 +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
990ecddded merge with staging 2017-10-12 15:19:15 +06:30
Yan
6e47e4c41c change header 2017-10-12 15:13:25 +06:30
Yan
31a7b6750f change header 2017-10-12 14:56:32 +06:30
Yan
b7955b04fa merge with staging 2017-10-12 14:49:28 +06:30
Yan
150bb1a751 add mm 2017-10-12 14:44:30 +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
57ecddd209 merge with staging for localization and layout change and print custom font 2017-10-12 10:03:46 +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
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
Aung Myo
33f03b2e05 update adminbsb theme all theme setting 2017-10-10 14:11:38 +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
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
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
96af0fcd17 update ui for oqs and crm 2017-09-28 14:18:04 +06:30
Aung Myo
c4f3b9e999 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into ui_design 2017-09-28 09:59:07 +06:30
Aung Myo
d4484ce849 update addorder 2017-09-27 15:29:08 +06:30