Aung Myo ac47501e01 update conflic for pull master

2018-02-23 14:58:35 +06:30

..

api

upsate

2018-02-20 14:15:01 +06:30

concerns

license update for token

2018-02-21 16:30:14 +06:30

crm

Shop name in navbar,linke to shop info

2018-02-05 18:11:45 +06:30

inventory

update inventory hide and cancan update

2017-11-30 11:19:15 +06:30

oqs

check oqs edit in origami

2018-02-22 19:18:24 +06:30

origami

update conflic for pull master

2018-02-23 14:58:35 +06:30

reports

Shop name in navbar,linke to shop info

2018-02-05 18:11:45 +06:30

settings

add menu item taxable

2017-12-04 14:54:47 +06:30

transactions

change query for transactions/order and transactions/bookings, transactions/credit

2017-11-27 18:16:46 +06:30

application_controller.rb

update conflic for pull master

2018-02-23 14:58:35 +06:30

base_controller.rb

need to fix license

2017-12-19 11:49:03 +06:30

base_crm_controller.rb

license update, base controllers extends app controller

2018-02-21 16:42:19 +06:30

base_inventory_controller.rb

license update, base controllers extends app controller

2018-02-21 16:42:19 +06:30

base_oqs_controller.rb

license update, base controllers extends app controller

2018-02-21 16:42:19 +06:30

base_origami_controller.rb

update conflic for pull master

2018-02-23 14:58:35 +06:30

base_report_controller.rb

license update, base controllers extends app controller

2018-02-21 16:42:19 +06:30

base_waiter_controller.rb

license update, base controllers extends app controller

2018-02-21 16:42:19 +06:30

home_controller.rb

update conflic for pull master

2018-02-23 14:58:35 +06:30

install_controller.rb

add response in license

2018-01-23 14:40:32 +06:30

print_settings_controller.rb

UI change

2017-10-23 11:38:10 +06:30

sym_control_controller.rb

update license and sym_master

2018-02-13 15:12:09 +06:30