Christophe Vilayphiou a1e74987dc Merge branch 'desktop_harry' of github.com:Rulingcom/orbit into desktop_harry ... Conflicts: Gemfile.lock app/assets/javascripts/.DS_Store app/assets/stylesheets/style.css.erb app/views/layouts/_orbit_bar.html.erb		2012-06-29 16:10:29 +08:00
..
admin	Clean up code , cache other auths. Fix sidebar	2012-05-29 17:17:26 +08:00
application_controller.rb	Changes for structure	2012-05-22 14:45:49 +08:00
desktop_appstore_controller.rb	new page add and timeline changes	2012-06-28 17:31:48 +08:00
desktop_controller.rb	controller change, views working and db for paper and journals	2012-05-03 21:30:12 +08:00
desktop_orbit_controller.rb	timeline updates major ones..	2012-06-26 21:09:33 +08:00
desktop_publications_controller.rb	new page add and timeline changes	2012-06-28 17:31:48 +08:00
gridfs_controller.rb	The new AdBanner.	2012-04-02 03:04:38 +08:00
orbit_backend_controller.rb	Order list by created_at desc	2012-05-23 11:46:19 +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	Add impressionist	2012-05-15 21:26:09 +08:00