saurabh
/
orbit-basic
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1,569 Commits 5 Branches 0 Tags 52 MiB
JavaScript 42.1%
HTML 27.4%
Ruby 18.6%
CSS 10.9%
SCSS 1%
Go to file
chris 7d5531bf01 Merge branch 'nccu_master' into demo_site 
Conflicts:
	Gemfile
	app/assets/javascripts/tinymce_orbit.js.erb
	app/assets/stylesheets/style.css.erb
	app/controllers/admin/assets_controller.rb
	app/controllers/admin/module_apps_new_interface_controller.rb
	app/controllers/admin/page_parts_controller.rb
	app/jobs/sync_db.rb
	app/models/page.rb
	app/models/page_part.rb
	app/models/user/user.rb
	app/uploaders/image_uploader.rb
	app/views/admin/assets/create.js.erb
	app/views/admin/module_apps/reload_frontend_pages.js.erb
	app/views/layouts/_orbit_bar.html.erb
	app/views/layouts/_side_bar.html.erb
	app/views/layouts/_users_checkbox_ary.html.erb
	app/views/shared/_privilege_user.html.erb
	config/mongoid.yml
	lib/parsers/parser_common.rb
	vendor/built_in_modules/announcement/announcement.json
	vendor/built_in_modules/announcement/app/controllers/panel/announcement/front_end/bulletins_controller.rb
	vendor/built_in_modules/announcement/app/controllers/panel/announcement/widget/bulletins_controller.rb
	vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form_bulletin_link.html.erb
	vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/fact_checks/_privilege_user.html.erb
	vendor/built_in_modules/announcement/app/views/panel/announcement/front_end/bulletins/index.html.erb
	vendor/built_in_modules/announcement/app/views/panel/announcement/widget/bulletins/_index.html.erb
 		2012-08-22 18:07:49 +08:00
app Merge branch 'nccu_master' into demo_site 2012-08-22 18:07:49 +08:00
config Merge branch 'nccu_master' into demo_site 2012-08-22 18:07:49 +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 'nccu_master' into demo_site 2012-08-22 18:07:49 +08:00
log tmp commit for search. start nccu0621 first 2012-06-22 11:34:10 +08:00
public Merge branch 'nccu_master' into demo_site 2012-08-22 18:07:49 +08:00
script remove useless script 2011-04-13 19:18:40 +08:00
solr/conf First version of Solr search. 2012-08-08 10:59:55 +08:00
spec fixing for app_auth 2012-01-05 16:20:51 +08:00
tmp New and Announcement search. Disabled impression. 2012-07-20 15:47:40 +08:00
vendor Merge branch 'nccu_master' into demo_site 2012-08-22 18:07:49 +08:00
.gitignore Merge branch 'nccu_master' into demo_site 2012-08-22 18:07:49 +08:00
.rspec Change role structure 2011-12-10 18:12:39 +08:00
Gemfile Merge branch 'nccu_master' into demo_site 2012-08-22 18:07:49 +08:00
Gemfile.lock Merge branch 'nccu_master' into demo_site 2012-08-22 18:07:49 +08:00
README.md Update README 2011-04-13 19:06:09 +08:00
Rakefile God , Resque, Resque-schedule, is working,but buggy. Need to combine with LDAP and also implement XML calendar sync. 2012-05-08 11:41:58 +08:00
config.ru Replace PrototypeR4 by Orbit. 2012-03-16 14:58:32 +08:00
dump.rdb New and Announcement search. Disabled impression. 2012-07-20 15:47:40 +08:00

README.md

Ruling Orbit

RulingSite-s Version 4