developers/orbit-basic

0 Fork 0

T

unknown 9382ef6ae8 Merge branch 'dashboard' of https://github.com/Rulingcom/orbit into dashboard

Conflicts:
	vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletins_controller.rb
	vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form.html.erb
	vendor/built_in_modules/page_content/app/views/panel/page_content/back_end/page_contexts/_form.html.erb

2012-04-05 15:16:33 +08:00

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

2012-04-05 15:16:33 +08:00

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

init rails 2.3.2

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

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

2012-04-05 15:16:33 +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 https://github.com/Rulingcom/orbit into dashboard

2012-04-05 15:16:33 +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

Trying nokogiri

2012-03-27 18:42:22 +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