0 Fork 0

T

Christophe Vilayphiou a1e74987dc Merge branch 'desktop_harry' of github.com:Rulingcom/orbit into desktop_harry

Conflicts:
	Gemfile.lock
	app/assets/javascripts/.DS_Store
	app/assets/stylesheets/style.css.erb
	app/views/layouts/_orbit_bar.html.erb

2012-06-29 16:10:29 +08:00

app

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

2012-06-29 16:10:29 +08:00

config

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

2012-06-29 16:10:29 +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

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

2012-06-29 16:10:29 +08:00

log

add log folder

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

public

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

2012-06-29 16:10:29 +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

Clean up code , cache other auths. Fix sidebar

2012-05-29 17:17:26 +08:00

.gitignore

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

2012-06-29 16:10:29 +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

dump.rdb

Appauth new interface for setting managers. Fix showing sidebar for News and Announcement when setting managers at module app page.

2012-05-10 14:16:37 +08:00

Gemfile

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

2012-06-29 16:10:29 +08:00

Gemfile.lock

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

2012-06-29 16:10:29 +08:00

Rakefile

God , Resque, Resque-schedule, is working,but buggy. Need to combine with LDAP and also implement XML calendar sync.

2012-05-08 20:21:28 +08:00

README.md

Update README

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

README.md

Ruling Orbit

RulingSite-s Version 4