Matthew K. Fu JuYuan 3d573680b2 Merge commit '6b248a949b44b6e4dc908f29f4f08c3a821210cd' into sidebar_config ... Conflicts: app/models/user/attribute_value.rb app/views/layouts/_side_bar_content.html.erb vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletin_categorys_controller.rb		2012-11-26 17:55:53 +08:00
..
admin	Merge commit '6b248a949b44b6e4dc908f29f4f08c3a821210cd' into sidebar_config	2012-11-26 17:55:53 +08:00
desktop	add paper status textfield	2012-11-26 10:23:50 +08:00
application_controller.rb	address field and text field convert	2012-11-20 09:53:37 +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	Fix for ad_image	2012-11-20 15:47:07 +08:00
orbit_frontend_component_controller.rb	Changes for widgets	2012-05-13 21:55:39 +08:00
orbit_frontend_controller.rb	First version for App and Object auth.Taking Announcement as experiment	2012-02-29 18:55:55 +08:00
orbit_widget_controller.rb	Change Obit to Orbit	2012-03-16 11:54:31 +08:00
otheraccounts_controller.rb	update for desktop widgets	2012-11-05 11:40:11 +08:00
pages_controller.rb	first version for new member html	2012-09-14 00:02:21 +08:00