0 Fork 0

T

Christophe Vilayphiou 5a423178e3 Merge branch 'design_team' into ldap

Conflicts:
	app/assets/stylesheets/new_admin.css.erb
	app/assets/stylesheets/widget.css

2012-04-23 15:16:50 +08:00

app

Merge branch 'design_team' into ldap

2012-04-23 15:16:50 +08:00

config

Merge branch 'master' into ldap

2012-04-23 14:13:37 +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

NCCU ldap debug

2012-04-23 10:13:44 +08:00

log

add log folder

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

public

close alpha on nccu

2012-03-20 14:38:01 +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-04-23 15:16:50 +08:00

.gitignore

Modifications for images in html code

2011-10-18 11:21:24 +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

NCCU ldap debug

2012-04-23 10:13:44 +08:00

Gemfile.lock

Merge branch 'master' into ldap

2012-04-23 14:13:37 +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