Fu Matthew 9fec7beb47 Merge branch 'development' of github.com:Rulingcom/orbit into development ...

Conflicts:
	app/controllers/default_widget_controller.rb
	lib/tasks/migrate.rake

2013-02-22 17:53:49 +08:00

..

admin

Merge branch 'development' of github.com:Rulingcom/orbit into development

2013-02-22 17:53:49 +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

Merge branch 'development' of github.com:Rulingcom/orbit into development

2013-02-22 17:53:49 +08:00

desktop_appstore_controller.rb

new page add and timeline changes

2012-06-28 17:31:48 +08:00

desktop_controller.rb

amend file value to correct format

2013-01-14 17:53:59 +08:00

desktop_orbit_controller.rb

design update

2012-09-12 01:58:23 +08:00

desktop_publications_controller.rb

modularize conference

2013-02-04 18:01:42 +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

front_controller.rb

Remove breadcrumb when home

2013-02-19 17:49:22 +08:00

gridfs_controller.rb

Multi language and side bar update

2012-08-20 23:14:11 +08:00

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

Changes for widgets

2012-05-13 21:55:39 +08:00

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

update for desktop widgets

2012-11-05 11:40:11 +08:00

pages_controller.rb

Fix links in default widget

2013-02-19 18:09:50 +08:00