Matt K. Fu 0f6f5aafce fix for both part and page part settings ... Conflicts: app/helpers/admin/page_parts_helper.rb app/views/admin/pages/reload_front_end_setting.js.erb app/views/admin/pages/reload_frontend_pages.js.erb		2013-04-17 14:12:52 +08:00
..
admin	fix for both part and page part settings	2013-04-17 14:12:52 +08:00
admin_helper.rb	default widgets and sidebar.	2012-12-24 16:38:35 +08:00
application_helper.rb	Remove isotope	2013-02-04 18:01:42 +08:00
attribute_fields_helper.rb	Change translation	2013-01-14 17:02:51 +08:00
attribute_values_helper.rb	Translation changes	2012-12-03 23:00:04 +08:00
default_widget_helper.rb	Fix link for default widget	2013-03-19 17:14:01 +08:00
front_helper.rb	Fix for link in ad banner	2013-01-11 11:28:13 +08:00
orbit_backend_helper.rb	Merge branch 'various_bugs' into nccu_master	2012-10-29 16:10:07 +08:00
orbit_form_helper.rb	Update disable time when separated picker new or reset date	2013-01-09 21:17:50 +08:00