chris ca946fc881 Merge branch 'development' of github.com:Rulingcom/orbit into development ... Conflicts: lib/tasks/migrate.rake		2013-02-27 11:03:52 +08:00
..
admin	fix widget field reload	2013-02-27 10:51:41 +08:00
desktop	move journal code to persional_journal modulaar	2013-01-14 17:53:59 +08:00
application_controller.rb	Fix bug for mobile app routes	2013-02-04 18:01:03 +08:00
default_widget_controller.rb	first version of multi categories and tags	2013-02-27 10:49:48 +08:00
desktop_appstore_controller.rb	…
desktop_controller.rb	gridster, url code fixed, views removed.	2013-02-25 11:08:56 +08:00
desktop_orbit_controller.rb	…
desktop_publications_controller.rb	modularize conference	2013-02-04 18:01:42 +08:00
desktop_research_controller.rb	…
desktop_widgets_controller.rb	…
front_controller.rb	Remove breadcrumb when home	2013-02-19 17:49:22 +08:00
gridfs_controller.rb	…
mobile_controller.rb	Fix bug for mobile app routes	2013-02-04 18:01:03 +08:00
orbit_backend_controller.rb	Merge branch 'sidebar_config' into ntu	2013-01-08 14:17:21 +08:00
orbit_frontend_component_controller.rb	…
orbit_frontend_controller.rb	default widgets and sidebar.	2012-12-24 16:38:35 +08:00
orbit_widget_controller.rb	Fix album widget options	2013-01-07 00:40:43 +08:00
otheraccounts_controller.rb	…
pages_controller.rb	Fix links in default widget	2013-02-19 18:09:50 +08:00