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

..

_app_selector.html.erb

fix for both part and page part settings

2013-04-17 14:12:52 +08:00

_custom_frontend_setting.html.erb

style for front end

2013-04-17 11:05:57 +08:00

_data_count_field.html.erb

fix archive category

2013-03-04 14:40:29 +08:00

_edit.html.erb

Changes in I18n (except personal_conference and personal_journal)

2013-03-12 18:13:48 +08:00

_form.html.erb

fix for both part and page part settings

2013-04-17 14:12:52 +08:00

_frontend_fields.html.erb

fix for both part and page part settings

2013-04-17 14:12:52 +08:00

_frontend_setting.html.erb

page can use default widget

2013-01-21 16:56:37 +08:00

_new.html.erb

Changes in I18n (except personal_conference and personal_journal)

2013-03-12 18:13:48 +08:00

_show.html.erb

Fix these bugs:

2012-11-15 15:51:44 +08:00

_themes_ddl.html.erb

structure.css -> default.css

2011-09-05 15:18:36 +08:00

create.js.erb

Fix these bugs:

2012-11-15 15:51:44 +08:00

delete.html.erb

fix for both part and page part settings

2013-04-17 14:12:52 +08:00

delete.js.erb

Changes for structure

2012-05-22 14:45:49 +08:00

edit.html.erb

fix javascript disable checkbox failed after cate and tags being reloaded.

2013-02-27 10:49:51 +08:00

edit.js.erb

Fix missing modification for "panel_main" to "back_main"

2011-12-29 17:49:48 +08:00

new.html.erb

Items UI changes

2011-06-10 13:57:42 +08:00

new.js.erb

Fix missing modification for "panel_main" to "back_main"

2011-12-29 17:49:48 +08:00

reload_front_end_setting.js.erb

fix for both part and page part settings

2013-04-17 14:12:52 +08:00

reload_frontend_pages.js.erb

fix for both part and page part settings

2013-04-17 14:12:52 +08:00

reload_themes.js.erb

structure.css -> default.css

2011-09-05 15:18:36 +08:00

reload_widget_field.js.erb

fix widget field reload

2013-02-27 10:51:41 +08:00

show.html.erb

Fix for structure js and css

2012-04-25 18:41:38 +08:00

show.js.erb

Fix missing modification for "panel_main" to "back_main"

2011-12-29 17:49:48 +08:00

update.js.erb

Fix these bugs:

2012-11-15 15:51:44 +08:00