Joshua Milton 6b9926539d Merge branch 'desktop_joshua' of https://github.com/Rulingcom/orbit into desktop_joshua ...

Conflicts:
	app/assets/javascripts/orbitdesktop.js
	app/controllers/desktop_publications_controller.rb
	config/routes.rb

2012-07-04 18:31:00 +08:00

..

admin

The new AdBanner.

2012-04-02 03:04:38 +08:00

application_controller.rb

Trying nokogiri

2012-03-27 18:42:22 +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

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

2012-07-04 18:31:00 +08:00

gridfs_controller.rb

The new AdBanner.

2012-04-02 03:04:38 +08:00

orbit_backend_controller.rb

Changed inherited controller in module_apps to OrbitBackendController

2012-03-27 18:58:04 +08:00

orbit_frontend_component_controller.rb

Fix extra loaded js: the widgets only need to render layout when they need js.

2012-03-07 18:16:59 +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

Trying nokogiri

2012-03-27 18:42:22 +08:00