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_controller.rb

Restore "force_order_for_user" for ad_banner

2012-11-20 12:38:35 +08:00

ad_images_controller.rb

Fix for ad_image

2012-11-20 15:47:07 +08:00

app_auths_controller.rb

put add admin pages using orbit back end controller

2013-04-17 10:54:38 +08:00

asset_categories_controller.rb

Changes for i18n yml

2012-09-24 09:02:45 +08:00

asset_tags_controller.rb

Add tags to assets

2012-05-16 18:19:41 +08:00

assets_controller.rb

Change delete_all to destroy_all

2013-02-19 17:39:42 +08:00

dashboards_controller.rb

Remove news and fix default_url in ImageUploader

2012-11-22 09:30:25 +08:00

designs_controller.rb

Change delete_all to destroy_all

2013-02-19 17:39:42 +08:00

infos_controller.rb

put add admin pages using orbit back end controller

2013-04-17 10:54:38 +08:00

items_controller.rb

put add admin pages using orbit back end controller

2013-04-17 10:54:38 +08:00

links_controller.rb

Fix these bugs:

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

member_selects_controller.rb

put add admin pages using orbit back end controller

2013-04-17 10:54:38 +08:00

module_apps_controller.rb

put add admin pages using orbit back end controller

2013-04-17 10:54:38 +08:00

module_apps_new_interface_controller.rb

1.make module app forbid unearthed access except from admin

2013-04-17 10:56:15 +08:00

module_store_controller.rb

Module store

2012-11-29 02:02:37 +08:00

object_auths_controller.rb

put add admin pages using orbit back end controller

2013-04-17 10:54:38 +08:00

object_auths_new_interface_controller.rb

Merge branch 'sidebar_config' into ntu

2013-01-08 14:17:21 +08:00

page_parts_controller.rb

fix for both part and page part settings

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

pages_controller.rb

fix for both part and page part settings

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

plugins_controller.rb

archive edit & plugins edit

2013-03-07 21:12:31 +08:00

purchases_controller.rb

put add admin pages using orbit back end controller

2013-04-17 10:54:38 +08:00

roles_controller.rb

put add admin pages using orbit back end controller

2013-04-17 10:54:38 +08:00

sessions_controller.rb

Replace PrototypeR4 by Orbit.

2012-03-16 14:58:32 +08:00

sites_controller.rb

put add admin pages using orbit back end controller

2013-04-17 10:54:38 +08:00

sub_roles_controller.rb

Fix sitemap nil

2013-02-19 17:39:43 +08:00

tags_controller.rb

Fix old tags

2013-01-03 19:15:08 +08:00

template_store_controller.rb

Add images to store

2012-12-07 02:37:05 +08:00

users_new_interface_controller.rb

Merge branch 'sidebar_config' into ntu

2013-01-08 14:17:21 +08:00