Commit Graph

4 Commits

Author SHA1 Message Date
Matt K. Fu 0781779ac0 solved conflicts 2013-04-17 14:14:24 +08:00
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
chris 1d80b39dcb Fix no responding when trying to access front end page 2013-01-09 11:23:18 +08:00
unknown d5c55c9697 widget & frontend field 2012-08-09 15:25:30 +08:00