Fu Matthew 76296ab29b Merge branch 'sidebar_config' into ntu ... Conflicts: app/controllers/admin/object_auths_new_interface_controller.rb app/controllers/orbit_backend_controller.rb app/controllers/orbit_widget_controller.rb app/models/module_app.rb app/views/admin/page_parts/_module_widget.html.erb config/locales/zh_tw.yml lib/parsers/parser_common.rb lib/parsers/parser_front_end.rb		2013-01-08 14:17:21 +08:00
..
parser_back_end.rb	Add page counter	2012-12-28 10:36:18 +08:00
parser_common.rb	default widget link.	2013-01-07 17:20:37 +08:00
parser_front_end.rb	Merge branch 'sidebar_config' into ntu	2013-01-08 14:17:21 +08:00
parser_layout.rb	Do not create layout part if it already exists	2012-12-03 18:59:32 +08:00
parser_layout_widget.rb	Desktop Widgtes updates..	2012-11-06 10:36:34 +08:00