Yan
|
42a29296c7
|
update gem
|
2017-06-08 19:07:20 +06:30 |
|
Yan
|
43debf4b7e
|
merged with crm
|
2017-06-08 19:04:48 +06:30 |
|
Yan
|
5c5c0dba33
|
update gem
|
2017-06-08 18:08:34 +06:30 |
|
Yan
|
fbc00bc3e4
|
merged loyalty
|
2017-06-08 15:28:09 +06:30 |
|
Moe Su
|
664fe2f6e1
|
Adding Redeem at payment
|
2017-06-08 15:17:26 +06:30 |
|
Aung Myo
|
8388192a81
|
delete view origami file
|
2017-06-08 14:46:35 +06:30 |
|
Yan
|
c7aac7c2b8
|
update gem
|
2017-06-08 10:51:30 +06:30 |
|
Yan
|
612f037fe8
|
index ui for discount
|
2017-06-08 10:40:06 +06:30 |
|
Moe Su
|
26f2dce142
|
For Pull
|
2017-06-08 09:53:04 +06:30 |
|
Aung Myo
|
44382d284f
|
fixed conflict
|
2017-06-07 22:29:43 +06:30 |
|
Aung Myo
|
f9c8dbc03e
|
fixed conflict route and request bill
|
2017-06-07 22:21:42 +06:30 |
|
Aung Myo
|
234ef9bc15
|
change crm booking
|
2017-06-07 22:17:12 +06:30 |
|
Moe Su
|
6cc2e29e30
|
For pull
|
2017-06-07 18:13:12 +06:30 |
|
Moe Su
|
e2ecfaeaad
|
For pull
|
2017-06-07 18:11:03 +06:30 |
|
Yan
|
be7d448c30
|
update gem file
|
2017-06-07 18:09:56 +06:30 |
|
Aung Myo
|
bd345dbc3f
|
fixed conflict
|
2017-06-07 17:15:51 +06:30 |
|
Moe Su
|
5264f9cf14
|
Paypar payment
|
2017-06-07 17:14:22 +06:30 |
|
Yan
|
c482318b1a
|
req bill bugs fixing
|
2017-06-06 16:37:42 +06:30 |
|
Aung Myo
|
8fd23bfd87
|
conflict file
|
2017-06-06 14:49:25 +06:30 |
|
Aung Myo
|
d2ce74f648
|
bootstrap datepicker and customer save
|
2017-06-06 14:16:40 +06:30 |
|
Nweni
|
c2952c4600
|
Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant
|
2017-06-06 11:08:51 +06:30 |
|
Nweni
|
c461cb94f2
|
fixed
|
2017-06-06 11:08:43 +06:30 |
|
Aung Myo
|
792001a5f3
|
fixed conflict gem and gemfile lock
|
2017-06-06 10:01:21 +06:30 |
|
Aung Myo
|
6ecf791673
|
update coutomer controller
|
2017-06-06 09:47:24 +06:30 |
|
Yan
|
9b90e3bd7e
|
pulled master at 4
|
2017-06-04 18:29:58 +06:30 |
|
Nweni
|
9bb7eb7f17
|
fixed
|
2017-06-04 15:36:38 +06:30 |
|
Nweni
|
dd2b0dc8b3
|
updated
|
2017-06-04 15:35:46 +06:30 |
|
Nweni
|
17c687b6f8
|
gemfile
|
2017-06-04 15:33:35 +06:30 |
|
Nweni
|
aa295c3a12
|
fixed conflict
|
2017-06-04 13:12:02 +06:30 |
|
Yan
|
869c574107
|
comment pg in gem
|
2017-06-04 11:34:59 +06:30 |
|
Nweni
|
89cbb59e7c
|
fixed conflcit
|
2017-06-04 10:33:24 +06:30 |
|
Nweni
|
e5e14aaa62
|
fixed conflict
|
2017-06-04 10:19:35 +06:30 |
|
Nweni
|
3ab3fa71a8
|
fixed conflict
|
2017-06-04 10:16:23 +06:30 |
|
Nweni
|
e3e41bd64e
|
Update
|
2017-06-04 10:12:33 +06:30 |
|
Aung Myo
|
138850fb24
|
origin pull master
|
2017-06-03 13:44:10 +06:30 |
|
Yan
|
622ca05c9e
|
Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant
|
2017-06-03 13:27:11 +06:30 |
|
Min Zeya Phyo
|
4dbf52d5a4
|
remove ignore for gemfile and gemfile.lock, re-add mysql2
|
2017-06-03 12:48:05 +06:30 |
|
Aung Myo
|
bd1414e07f
|
Gemfile and gem lock
|
2017-06-03 10:59:46 +06:30 |
|
Nweni
|
59e4c72e2f
|
get udpate
|
2017-06-02 13:22:04 +06:30 |
|
Yan
|
f28f0bf292
|
UI updated
|
2017-06-01 18:37:15 +06:30 |
|
Nweni
|
ad38a0a708
|
gem lock
|
2017-06-01 17:13:30 +06:30 |
|
Yan
|
356923a9d8
|
pull master
|
2017-06-01 12:11:23 +06:30 |
|
Yan
|
2a323c8d0d
|
deleted order queue item
|
2017-06-01 12:07:27 +06:30 |
|
Yan
|
82d7d7ffcc
|
merge crm
|
2017-06-01 09:59:43 +06:30 |
|
Min Zeya Phyo
|
4271681638
|
Support both mysql and pg
|
2017-06-01 10:49:20 +08:00 |
|
Yan
|
44c4dd0d78
|
nothing change
|
2017-05-31 22:16:55 +06:30 |
|
Yan
|
5a564abca9
|
oqs sample
|
2017-05-31 22:14:46 +06:30 |
|
Aung Myo
|
f036274f5e
|
finished order tab view and customer tab
|
2017-05-31 18:19:51 +06:30 |
|
Yan
|
1ed15e2e0d
|
pull master
|
2017-05-31 13:54:01 +06:30 |
|
Yan
|
a86ab147c8
|
ignore gems
|
2017-05-31 13:47:55 +06:30 |
|