Matthew K. Fu JuYuan ca290f3519 Merge commit 'e429aa9425e9648a94a1dd7bb5cea15af7ba854a' into sidebar_config ...

Conflicts:
	app/views/layouts/_side_bar_content.html.erb
	config/locales/zh_tw.yml
	config/mongoid.yml
	vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletin_categorys_controller.rb
	vendor/built_in_modules/announcement/init.rb

2012-12-05 11:36:32 +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

add "all_user" for app&object auth

2012-02-29 18:56:42 +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

Changes for i18n yml

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

dashboards_controller.rb

Remove news and fix default_url in ImageUploader

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

designs_controller.rb

Translation changes

2012-12-03 23:00:04 +08:00

infos_controller.rb

fix for showing subroles

2012-11-26 10:22:36 +08:00

items_controller.rb

Changes for i18n yml

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

links_controller.rb

Fix these bugs:

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

member_selects_controller.rb

member selects

2012-11-26 10:25:34 +08:00

module_apps_controller.rb

Merge branch 'various_bugs' into nccu_master

2012-10-29 16:10:07 +08:00

module_apps_new_interface_controller.rb

Merge branch 'various_bugs' into nccu_master

2012-10-29 16:10:07 +08:00

module_store_controller.rb

Module store

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

object_auths_controller.rb

default widgets and sidebar.

2012-12-03 18:52:36 +08:00

object_auths_new_interface_controller.rb

default widgets and sidebar.

2012-12-03 18:52:36 +08:00

page_parts_controller.rb

default widgets and sidebar.

2012-12-03 18:52:36 +08:00

pages_controller.rb

Fix these bugs:

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

plugins_controller.rb

Changes for side_bar

2012-10-15 15:30:48 +08:00

purchases_controller.rb

Translation changes

2012-12-03 23:00:04 +08:00

roles_controller.rb

fix for showing subroles

2012-11-26 10:22:36 +08:00

sessions_controller.rb

Replace PrototypeR4 by Orbit.

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

sites_controller.rb

Sitemap done for backend and fronted

2012-07-27 19:13:40 +08:00

tags_controller.rb

guest user

2012-09-12 16:20:15 +08:00

template_store_controller.rb

Module store

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

users_new_interface_controller.rb

Merge commit '6b248a949b44b6e4dc908f29f4f08c3a821210cd' into sidebar_config

2012-11-26 17:55:53 +08:00