developers/orbit-basic

0 Fork 0

T

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

Conflicts:
	app/assets/javascripts/bulletin_form.js.erb
	app/views/layouts/_side_bar.html.erb
	vendor/built_in_modules/archive/app/models/archive_file.rb
	vendor/built_in_modules/archive/app/views/panel/archive/back_end/archive_files/_form.html.erb
	vendor/built_in_modules/page_content/app/controllers/panel/page_content/back_end/page_contexts_controller.rb
	vendor/built_in_modules/web_resource/app/controllers/panel/web_resource/back_end/web_links_controller.rb

2012-08-31 14:31:54 +08:00

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

2012-08-31 14:31:54 +08:00

Merge branch 'nccu_master' into demo_site

2012-08-22 18:07:49 +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 'nccu_master' into demo_site

2012-08-22 18:07:49 +08:00

tmp commit for search. start nccu0621 first

2012-06-22 11:34:10 +08:00

Merge branch 'nccu_master' into demo_site

2012-08-22 18:07:49 +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

fixing for app_auth

2012-01-05 16:20:51 +08:00

New and Announcement search. Disabled impression.

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

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

2012-08-31 14:31:54 +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

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

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

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