saurabh/orbit-basic

0 Fork 0

T

Matthew K. Fu JuYuan 49e6c33b57 Merge branch 'sidebar_config' of github.com:Rulingcom/orbit into sidebar_config

Conflicts:
	app/controllers/admin/object_auths_new_interface_controller.rb
	app/views/layouts/_side_bar_content.html.erb
	config/locales/zh_tw.yml
	config/routes.rb
	vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletin_categorys_controller.rb
	vendor/built_in_modules/announcement/init.rb
	vendor/built_in_modules/archive/init.rb
	vendor/built_in_modules/miss_module/config/locales/zh_tw.yml

2012-12-25 11:01:36 +08:00

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

2012-12-25 11:01:36 +08:00

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

2012-12-25 11:01:36 +08:00

fixed empty db bug

2012-12-07 04:21:27 +08:00

init rails 2.3.2

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

fix widget.

2012-12-25 10:45:08 +08:00

merge

2012-10-01 21:09:09 +08:00

fix widget from post method

2012-12-24 15:22:26 +08:00

remove useless script

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

First version of Solr search.

2012-08-08 10:59:55 +08:00

fixed empty db bug

2012-12-07 04:21:27 +08:00

New and Announcement search. Disabled impression.

2012-07-20 15:47:40 +08:00

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

2012-12-25 11:01:36 +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

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

Gemfile

Update Gemfile for rails 3.2

2012-12-20 20:18:33 +08:00

Guardfile

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

2012-10-30 10:11:51 +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

README.md

Update README

2011-04-13 19:06:09 +08:00

README.md

Ruling Orbit

RulingSite-s Version 4