Matthew K. Fu JuYuan 49e6c33b57 Merge branch 'sidebar_config' of github.com:Rulingcom/orbit into sidebar_config ... Conflicts: app/controllers/admin/object_auths_new_interface_controller.rb app/views/layouts/_side_bar_content.html.erb config/locales/zh_tw.yml config/routes.rb vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletin_categorys_controller.rb vendor/built_in_modules/announcement/init.rb vendor/built_in_modules/archive/init.rb vendor/built_in_modules/miss_module/config/locales/zh_tw.yml		2012-12-25 11:01:36 +08:00
..
admin	default widgets and sidebar.	2012-12-24 16:38:35 +08:00
default_widget	default widgets and sidebar.	2012-12-24 16:38:35 +08:00
desktop	all sections and sections megerd	2012-12-07 12:38:23 +08:00
desktop_widgets	update for desktop widgets	2012-11-05 11:40:11 +08:00
devise	view update	2012-12-06 07:59:43 +08:00
front	Fix submenu error	2012-12-21 14:56:12 +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 branch 'sidebar_config' of github.com:Rulingcom/orbit into sidebar_config	2012-12-25 11:01:36 +08:00
shared	add info field	2012-12-06 07:58:39 +08:00