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
..
admin	default widget link.	2013-01-07 17:20:37 +08:00
desktop	fixed co-author relation bug....	2012-12-06 07:59:42 +08:00
admin_helper.rb	default widgets and sidebar.	2012-12-24 16:38:35 +08:00
application_helper.rb	Fix link for ad_banner	2013-01-07 00:36:48 +08:00
attribute_fields_helper.rb	Translation changes	2012-12-03 23:00:04 +08:00
attribute_values_helper.rb	Translation changes	2012-12-03 23:00:04 +08:00
default_widget_helper.rb	clean default widget	2013-01-07 17:20:37 +08:00
orbit_backend_helper.rb	Merge branch 'various_bugs' into nccu_master	2012-10-29 16:10:07 +08:00