0 Fork 0

T

Christophe Vilayphiou ec8afc1341 Merge branch 'nccu_0509' of github.com:Rulingcom/orbit into nccu_0509

Conflicts:
	app/views/layouts/_side_bar.html.erb

2012-05-09 14:20:38 +08:00

app

Fix i18 variable

2012-05-09 14:18:52 +08:00

config

Hide some links in side_bar for site_settings

2012-05-09 12:53:42 +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

Fix bugs in sub_menu

2012-05-09 04:31:04 +08:00

log

add log folder

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

public

Ray's changes

2012-05-09 04:15:02 +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

Ray's changes

2012-05-09 04:15:02 +08:00

.gitignore

Fix assets bug: when having a '.' in the name, the extension must be specified

2012-04-25 15:10:28 +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

Patch from ldap: Test version for DB sync schedule job

2012-05-08 21:14:57 +08:00

Gemfile

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

2012-05-08 20:26:36 +08:00

Gemfile.lock

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

2012-05-08 20:26:36 +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