Min Zeya Phyo 1ea9125f80 Merge branch 'master' of ssh://bitbucket.org/code2lab/sxrestaurant ...

# Conflicts:
#	Gemfile.lock
#	app/views/layouts/application.html.erb

2017-06-26 21:57:55 +06:30

..

api

mobile bill updated

2017-06-26 20:58:12 +06:30

concerns

user role scoped layout and controller

2017-04-20 22:29:39 +06:30

crm

Merge branch 'crm' of bitbucket.org:code2lab/sxrestaurant

2017-06-26 17:02:25 +06:30

oqs

oqs update

2017-06-26 18:45:20 +06:30

origami

Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant

2017-06-26 18:46:16 +06:30

reports

update authorize

2017-06-23 09:41:48 +06:30

settings

update authorize

2017-06-23 09:41:48 +06:30

transactions

update credit

2017-06-26 19:02:36 +06:30

application_controller.rb

Merge branch 'master' of ssh://bitbucket.org/code2lab/sxrestaurant

2017-06-26 21:57:55 +06:30

base_controller.rb

basic layout template

2017-04-05 08:24:21 +06:30

base_crm_controller.rb

update authorize

2017-06-23 09:41:48 +06:30

base_oqs_controller.rb

update authorize

2017-06-23 09:41:48 +06:30

base_origami_controller.rb

first cancan

2017-06-22 15:33:55 +06:30

base_report_controller.rb

update authorize

2017-06-23 09:41:48 +06:30

base_waiter_controller.rb

frontend view layout

2017-04-21 05:07:00 +06:30

home_controller.rb

Merge branch 'master' of ssh://bitbucket.org/code2lab/sxrestaurant

2017-06-26 21:57:55 +06:30

install_controller.rb

basic layout template

2017-04-05 08:24:21 +06:30

print_settings_controller.rb

update authorize

2017-06-23 09:41:48 +06:30