0 Fork 0

T

Christophe Vilayphiou ebc8dd33ec Merge branch 'design_team' into ldap

Conflicts:
	Gemfile.lock
	app/controllers/admin/module_apps_controller.rb
	app/controllers/application_controller.rb
	vendor/built_in_modules/web_resource/web_resource.json

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

app

Merge branch 'design_team' into ldap

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

config

Merge branch 'design_team' into ldap

2012-05-14 00:57:17 +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 'design_team' into ldap

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

log

add log folder

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

public

Merge branch 'design_team' into ldap

2012-05-09 13:51:00 +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

close alpha on nccu

2012-03-20 14:38:01 +08:00

vendor

Merge branch 'design_team' into ldap

2012-05-14 00:57:17 +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

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 'design_team' into ldap

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

Gemfile.lock

Merge branch 'design_team' into ldap

2012-05-14 00:57:17 +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