saurabh
/
orbit-basic
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
619 Commits 5 Branches 0 Tags 52 MiB
JavaScript 42.1%
HTML 27.4%
Ruby 18.6%
CSS 10.9%
SCSS 1%
Go to file
Matthew K. Fu JuYuan f55b3a4374 Merge branch 'master' of https://github.com/Rulingcom/orbit into ldap 
Conflicts:
	Gemfile
	Gemfile.lock
	app/views/admin/attributes/_app_selector.html.erb
	app/views/admin/module_apps/_app_selector.html.erb
	app/views/admin/pages/_app_selector.html.erb
	config/application.rb
	vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletin_categorys_controller.rb
	vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletins_controller.rb
	vendor/built_in_modules/new_blog/app/controllers/panel/new_blog/widget/posts_controller.rb
	vendor/built_in_modules/page_content/app/controllers/panel/page_content/front_end/page_contexts_controller.rb
	vendor/built_in_modules/web_resource/app/controllers/panel/web_resource/front_end/web_links_controller.rb
	vendor/built_in_modules/web_resource/app/controllers/panel/web_resource/widget/web_links_controller.rb
 		2012-04-19 14:06:00 +08:00
app Merge branch 'master' of https://github.com/Rulingcom/orbit into ldap 2012-04-19 14:06:00 +08:00
config Merge branch 'master' of https://github.com/Rulingcom/orbit into ldap 2012-04-19 14:06:00 +08:00
db 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 Merge branch 'master' of https://github.com/Rulingcom/orbit into ldap 2012-04-19 14:06:00 +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 'master' of https://github.com/Rulingcom/orbit into ldap 2012-04-19 14:06:00 +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
Gemfile Merge branch 'master' of https://github.com/Rulingcom/orbit into ldap 2012-04-19 14:06:00 +08:00
Gemfile.lock Merge branch 'master' of https://github.com/Rulingcom/orbit into ldap 2012-04-19 14:06:00 +08:00
README.md Update README 2011-04-13 19:06:09 +08:00
Rakefile Replace PrototypeR4 by Orbit. 2012-03-16 14:58:32 +08:00
config.ru Replace PrototypeR4 by Orbit. 2012-03-16 14:58:32 +08:00

README.md

Ruling Orbit

RulingSite-s Version 4