Christophe Vilayphiou e88b09cf72 Merge branch 'gallery_orbit' of github.com:Rulingcom/orbit into gallery_orbit ... Conflicts: app/controllers/pages_controller.rb app/views/layouts/_side_bar.html.erb lib/parsers/parser_common.rb vendor/built_in_modules/gallery/app/assets/stylesheets/gallery.css vendor/built_in_modules/gallery/config/locales/en.yml vendor/built_in_modules/gallery/config/locales/zh_tw.yml		2012-09-12 02:21:18 +08:00
..
admin	frontend commits	2012-09-12 02:12:15 +08:00
application_controller.rb	RSS first page	2012-08-08 17:41:48 +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	Fix bug for sorting when there's only one category with elements	2012-08-11 16:56:28 +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	Merge branch 'gallery_orbit' of github.com:Rulingcom/orbit into gallery_orbit	2012-09-12 02:21:18 +08:00
sessions_controller.rb	Fix .class to .class.to_s	2012-07-30 18:34:54 +08:00