0 Fork 0

T

Christophe Vilayphiou d71d0f7e89 Merge branch 'ad_banner' of github.com:Rulingcom/orbit into ad_banner

Conflicts:
	app/views/admin/ad_images/_form.html.erb

2012-04-23 14:08:23 +08:00

app

fix js

2012-04-23 14:07:14 +08:00

config

add i18n vars

2012-04-23 14:07:14 +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 upload design and missing menu

2012-04-06 17:37:45 +08:00

log

add log folder

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

public

Add RSS event

2012-02-28 18:29:13 +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

Remove extra "]"

2012-04-12 18:13:26 +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

Trying nokogiri

2012-03-27 18:42:22 +08:00

Gemfile.lock

changes before Chirs and Ray's trip

2012-04-19 11:50:54 +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