0 Fork 0

T

Christophe Vilayphiou f43646c9b6 Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team

Conflicts:
	app/assets/stylesheets/bootstrap.css.erb
	app/controllers/admin/pages_controller.rb

2012-02-20 08:52:36 +08:00

app

Ika's changes in modules

2012-02-20 08:48:27 +08:00

config

Changes for orbit bar, login

2012-02-19 16:33:22 +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

Changes for orbit bar, login

2012-02-19 16:33:22 +08:00

log

add log folder

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

public

Ika's changes in modules

2012-02-20 08:48:27 +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

Ika's changes in modules

2012-02-20 08:48:27 +08:00

.gitignore

Modifications for images in html code

2011-10-18 11:21:24 +08:00

.rspec

Merge with sub_roles

2011-12-23 18:34:21 +08:00

config.ru

Chris's first commit at Fri Jan 28 2011 10:14:32 GMT+0800 (CST)

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

Gemfile

Ika's changes in modules

2012-02-20 08:48:27 +08:00

Gemfile.lock

Ika's changes in modules

2012-02-20 08:48:27 +08:00

Rakefile

announcement path error

2012-02-13 17:09:37 +08:00

README.md

Update README

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

README.md

Ruling Orbit

RulingSite-s Version 4