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

..

appstore

new page add and timeline changes

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

books

Books section added

2012-07-04 17:55:30 +08:00

journal_pages

some update

2012-05-10 10:54:43 +08:00

settings

Merge branch 'desktop_harry' into desktop_devin

2012-05-11 15:28:05 +08:00

app_manager.html.erb

the group more structured and also demo connecting with gmail account..

2012-04-30 21:17:20 +08:00

app_view1.html.erb

app update

2012-05-21 15:25:18 +08:00

appstore.html.erb

new page add and timeline changes

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

books.html.erb

Books section added

2012-07-04 17:55:30 +08:00

desktop.html.erb

journal start

2012-04-27 14:04:11 +08:00

index.html.erb

Timeline commit

2012-06-26 15:59:28 +08:00

journal_p.html.erb

app store page added… and few other changes..

2012-05-04 20:28:12 +08:00

orbit.html.erb

timeline updates major ones..

2012-06-26 21:09:33 +08:00

sections.html.erb

added divs with id

2012-04-12 16:52:32 +08:00

settings.html.erb

with connection and some save settings…

2012-04-26 21:30:13 +08:00