0 Fork 0

T

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

app

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

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

config

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

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

upgrade to rails3, but grip is broken

2010-03-08 16:04:05 +08:00

doc

init rails 2.3.2

2009-05-08 00:53:18 +08:00

lib

test

2012-06-26 16:59:29 +08:00

log

add log folder

2011-04-13 18:22:49 +08:00

public

Timeline commit

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

script

remove useless script

2011-04-13 19:18:40 +08:00

spec

fixing for app_auth

2012-01-05 16:20:51 +08:00

tmp

Change to MongoDB

2010-01-04 15:52:30 +08:00

vendor

Remove extra "]"

2012-04-12 18:13:26 +08:00

.gitignore

Desktop Commit

2012-04-06 17:47:02 +08:00

.rspec

Change role structure

2011-12-10 18:12:39 +08:00

config.ru

Replace PrototypeR4 by Orbit.

2012-03-16 14:58:32 +08:00

Gemfile

Books section added

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

Gemfile.lock

Books section added

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

Rakefile

Replace PrototypeR4 by Orbit.

2012-03-16 14:58:32 +08:00

README.md

Update README

2011-04-13 19:06:09 +08:00

README.md

Ruling Orbit

RulingSite-s Version 4