Christophe Vilayphiou 03b5827392 Merge branch 'new_member' of github.com:Rulingcom/orbit into new_member ... Conflicts: app/controllers/application_controller.rb app/views/layouts/_side_bar.html.erb		2012-09-14 00:03:52 +08:00
..
admin	users new interface controller	2012-09-14 00:02:21 +08:00
application_controller.rb	Merge branch 'new_member' of github.com:Rulingcom/orbit into new_member	2012-09-14 00:03:52 +08:00
desktop_appstore_controller.rb	new page add and timeline changes	2012-06-28 17:31:48 +08:00
desktop_controller.rb	Gallery started.	2012-08-20 23:14:10 +08:00
desktop_orbit_controller.rb	design update	2012-09-12 01:58:23 +08:00
desktop_publications_controller.rb	design update	2012-09-12 01:58:23 +08:00
desktop_research_controller.rb	Page added for desktop	2012-08-20 23:17:31 +08:00
gridfs_controller.rb	Multi language and side bar update	2012-08-20 23:14:11 +08:00
orbit_backend_controller.rb	guest user	2012-09-12 16:20:15 +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	few experiments…	2012-05-16 11:18:54 +08:00
pages_controller.rb	first version for new member html	2012-09-14 00:02:21 +08:00
sessions_controller.rb	Fix .class to .class.to_s	2012-07-30 18:34:54 +08:00