saurabh/orbit-basic

0 Fork 0

T

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

Conflicts:
	app/views/layouts/_side_bar.html.erb
	vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletin_categorys/_bulletin_category.html.erb
	vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form.html.erb

2012-03-16 14:55:21 +08:00

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

2012-03-16 14:55:21 +08:00

fix bugs with token

2012-02-29 18:56:42 +08:00

upgrade to rails3, but grip is broken

2010-03-08 16:04:05 +08:00

init rails 2.3.2

2009-05-08 00:53:18 +08:00

code for new fact check

2012-03-16 11:09:44 +08:00

add log folder

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

Add RSS event

2012-02-28 18:29:13 +08:00

remove useless script

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

fixing for app_auth

2012-01-05 16:20:51 +08:00

Change to MongoDB

2010-01-04 15:52:30 +08:00

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

2012-03-16 14:55:21 +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

Changes for nccu

2012-02-29 16:01:50 +08:00

Gemfile.lock

Changes for nccu

2012-02-29 16:01:50 +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