0 Fork 0

T

Christophe Vilayphiou a2d2e7cc3f Merge branch 'dashboard' of github.com:Rulingcom/orbit into dashboard

Conflicts:
	app/assets/javascripts/orbit-1.0.js
	config/locales/en.yml
	vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/index.html.erb

2012-02-15 00:42:29 +08:00

app

Announcement modifications and tags

2012-02-15 00:34:22 +08:00

config

Announcement modifications and tags

2012-02-15 00:34: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

include ad_banner query code. cleaned up parser

2012-02-15 00:34:21 +08:00

log

add log folder

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

public

Orbit-bar in front-end and back-end, side-bar and drop-down menu

2012-02-15 00:34:22 +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

Announcement modifications and tags

2012-02-15 00:34:22 +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

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

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

Gemfile

Put back therubyracer

2012-02-13 17:22:13 +08:00

Gemfile.lock

Gemfile and bugs in js for orbit-bar

2012-02-15 00:34:22 +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