0 Fork 0

T

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

Conflicts:
	app/assets/javascripts/bulletin_form.js.erb
	vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/show.html.erb
	vendor/built_in_modules/announcement/config/routes.rb

2012-03-27 18:37:14 +08:00

app

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

2012-03-27 18:37:14 +08:00

config

Changes in Gemfile

2012-03-19 14:04:28 +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

Clean the parsers and introduce the metas

2012-03-21 18:30:12 +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

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

2012-03-27 18:37:14 +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

Changes in Gemfile

2012-03-19 14:04:28 +08:00

Gemfile.lock

Changes in Gemfile

2012-03-19 14:04:28 +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