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
..
_edit.html.erb	Add page counter	2012-12-28 10:36:18 +08:00
_language_bar.html.erb	Edition of page part for multiple languages.	2011-05-27 11:27:54 +08:00
_module_widget.html.erb	Merge branch 'sidebar_config' into ntu	2013-01-08 14:17:21 +08:00
_public_r_tag.html.erb	Sitemap done for backend and fronted	2012-07-27 19:13:40 +08:00
_text.html.erb	Remove i18n_variable for views	2012-07-27 19:13:39 +08:00
_widget_categories.html.erb	Remove i18n_variable for views	2012-07-27 19:13:39 +08:00
_widget_fields.html.erb	default widget link.	2013-01-07 17:20:37 +08:00
_widget_options.html.erb	Fix album widget options	2013-01-07 00:40:43 +08:00
_widget_tags.html.erb	Remove i18n_variable for views	2012-07-27 19:13:39 +08:00
edit.html.erb	Changes into page_part edition.	2012-02-16 13:09:09 +08:00
edit.js.erb	tinymce loading fixed…	2012-05-16 18:51:37 +08:00
reload_r_tag_options.js.erb	Add sub_menu to children	2012-05-09 04:15:45 +08:00
reload_widget_styles.js.erb	default widgets and sidebar.	2012-12-24 16:38:35 +08:00
reload_widgets.js.erb	Merge branch 'sidebar_config' into ntu	2013-01-08 14:17:21 +08:00
update.js.erb	Fix missing modification for "panel_main" to "back_main"	2011-12-29 17:49:48 +08:00