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

desktop

can display relation between author

2012-12-04 00:31:46 +08:00

application_controller.rb

address field and text field convert

2012-11-20 09:53:37 +08:00

default_widget_controller.rb

default widgets and sidebar.

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

desktop_appstore_controller.rb

new page add and timeline changes

2012-06-28 17:31:48 +08:00

desktop_controller.rb

desktop api update..

2012-11-12 15:11:36 +08:00

desktop_orbit_controller.rb

design update

2012-09-12 01:58:23 +08:00

desktop_publications_controller.000.rb

member selects

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

desktop_publications_controller.rb

add edit function

2012-11-21 07:37:43 +08:00

desktop_research_controller.rb

Page added for desktop

2012-08-20 23:17:31 +08:00

desktop_widgets_controller.rb

Desktop Widgtes updates..

2012-11-06 10:36:34 +08:00

gridfs_controller.rb

Multi language and side bar update

2012-08-20 23:14:11 +08:00

orbit_backend_controller.rb

default widgets and sidebar.

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

orbit_frontend_component_controller.rb

Changes for widgets

2012-05-13 21:55:39 +08:00

orbit_frontend_controller.rb

default widgets and sidebar.

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

orbit_widget_controller.rb

default widgets and sidebar.

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

otheraccounts_controller.rb

update for desktop widgets

2012-11-05 11:40:11 +08:00

pages_controller.rb

Translation changes

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