Go to file
Matthew K. Fu JuYuan ca290f3519 Merge commit 'e429aa9425e9648a94a1dd7bb5cea15af7ba854a' into sidebar_config
Conflicts:
	app/views/layouts/_side_bar_content.html.erb
	config/locales/zh_tw.yml
	config/mongoid.yml
	vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletin_categorys_controller.rb
	vendor/built_in_modules/announcement/init.rb
2012-12-05 11:36:32 +08:00
app Merge commit 'e429aa9425e9648a94a1dd7bb5cea15af7ba854a' into sidebar_config 2012-12-05 11:36:32 +08:00
config Merge commit 'e429aa9425e9648a94a1dd7bb5cea15af7ba854a' into sidebar_config 2012-12-05 11:36:32 +08:00
db can display relation between author 2012-12-04 00:31:46 +08:00
doc init rails 2.3.2 2009-05-08 00:53:18 +08:00
lib Merge commit 'e429aa9425e9648a94a1dd7bb5cea15af7ba854a' into sidebar_config 2012-12-05 11:36:32 +08:00
log merge 2012-10-01 21:09:09 +08:00
public Merge branch 'master' into various_bugs 2012-11-06 11:44:00 +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 can add relation between co-author 2012-12-04 00:31:06 +08:00
tmp Change to MongoDB 2010-01-04 15:52:30 +08:00
vendor Merge commit 'e429aa9425e9648a94a1dd7bb5cea15af7ba854a' into sidebar_config 2012-12-05 11:36:32 +08:00
.gitignore Merge branch 'various_bugs' into nccu_master 2012-10-29 16:10:07 +08:00
.rspec Merge with sub_roles 2011-12-23 18:34:21 +08:00
Gemfile make fake data 2012-11-22 21:06:31 +08:00
Guardfile Merge branch 'new_member' of github.com:Rulingcom/orbit into new_member 2012-10-30 10:11:51 +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