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
..
admin	Merge commit 'e429aa9425e9648a94a1dd7bb5cea15af7ba854a' into sidebar_config	2012-12-05 11:36:32 +08:00
default_widget	default widgets and sidebar.	2012-12-03 18:52:36 +08:00
desktop	can display relation between author	2012-12-04 00:31:46 +08:00
desktop_widgets	update for desktop widgets	2012-11-05 11:40:11 +08:00
devise	Fix some translations	2012-12-04 01:03:28 +08:00
js	Integrate Harry's modifications to reload pop-up content	2011-12-29 14:09:06 +08:00
kaminari	Fixed bugs for nccu	2012-05-22 20:00:07 +08:00
layouts	Merge commit 'e429aa9425e9648a94a1dd7bb5cea15af7ba854a' into sidebar_config	2012-12-05 11:36:32 +08:00
shared	Fix some translations	2012-12-04 01:03:28 +08:00