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
..
ad_banners	Translation typo	2013-01-09 21:17:50 +08:00
ad_images	Fix the tooltips	2013-01-11 12:13:16 +08:00
app_auths	Translation changes	2012-12-03 23:00:04 +08:00
asset_categories	Translation changes	2012-12-03 23:00:04 +08:00
assets	Changes in I18n (except personal_conference and personal_journal)	2013-03-12 18:13:48 +08:00
attributes	member list edit	2013-02-20 11:12:08 +08:00
components	Translation changes	2012-12-03 23:00:04 +08:00
dashboards	Change icons	2013-01-09 21:17:50 +08:00
designs	Changes in I18n (except personal_conference and personal_journal)	2013-03-12 18:13:48 +08:00
items	soft structure order	2012-12-27 14:37:29 +08:00
links	Translation changes	2012-12-03 23:00:04 +08:00
member_selects	member selects	2012-11-26 10:25:34 +08:00
module_apps	first version of app config and modified inits.	2013-01-29 20:33:40 +08:00
module_apps_new_interface	Translation changes	2012-12-03 23:00:04 +08:00
module_store	Redirect to designs after buying template	2012-12-07 09:07:49 +08:00
object_auths	Translation changes	2012-12-03 23:00:04 +08:00
object_auths_new_interface	Translation changes	2012-12-03 23:00:04 +08:00
page_parts	fix for both part and page part settings	2013-04-17 14:12:52 +08:00
pages	fix for both part and page part settings	2013-04-17 14:12:52 +08:00
plugins	archive edit & plugins edit	2013-03-07 21:12:31 +08:00
purchases	put add admin pages using orbit back end controller	2013-04-17 10:54:38 +08:00
roles	member list edit	2013-02-20 11:12:08 +08:00
sites	Changes in I18n (except personal_conference and personal_journal)	2013-03-12 18:13:48 +08:00
tags	Translation changes	2012-12-03 23:00:04 +08:00
template_store	Redirect to designs after buying template	2012-12-07 09:07:49 +08:00
users_new_interface	Changes in I18n (except personal_conference and personal_journal)	2013-03-12 18:13:48 +08:00