Matthew K. Fu JuYuan 09d46f2f75 NCCU 上傳版本 0709 ...

Merge branch 'nccu0621'

Conflicts:
	Gemfile
	config/resque.god
	vendor/built_in_modules/page_content/app/views/panel/page_content/back_end/page_contexts/_page_context.html.erb

2012-07-09 16:02:59 +08:00

..

environments

Changes on nccu

2012-05-18 15:20:45 +08:00

initializers

fix mid site connection

2012-07-06 18:24:25 +08:00

locales

orbit disable object for categories

2012-07-05 16:00:45 +08:00

application.rb

God , Resque, Resque-schedule, is working,but buggy. Need to combine with LDAP and also implement XML calendar sync.

2012-05-08 20:21:28 +08:00

boot.rb

rails 3.1 and designs (with bug)

2011-07-12 16:00:57 +08:00

config.yml

close alpha on nccu

2012-03-20 14:38:01 +08:00

database.yml.example

Add admin/pages scaffold and basic page render

2009-05-08 01:18:16 +08:00

environment.rb

Replace PrototypeR4 by Orbit.

2012-03-16 14:58:32 +08:00

ldap.yml

put ldap setting into config file. should load be rails env. Also make god config more friendly.

2012-06-22 14:32:28 +08:00

list.yml

Add sub_menu in r_tags

2012-04-24 02:30:40 +08:00

mongoid.yml

Add this toolbar, and nccu calendar fix

2012-06-04 16:51:29 +08:00

resque_schedule.god

add rescue job . can work with init script

2012-06-29 17:42:36 +08:00

resque_schedule.yml

fix over queue at resque

2012-07-03 10:51:26 +08:00

resque.god

NCCU 上傳版本 0709

2012-07-09 16:02:59 +08:00

routes.rb

fix for 新聞與公告QA

2012-06-26 17:46:02 +08:00

sunspot.yml

Search sold edition,rake sunspot:solr:run. NewsBulletin.solr_search,NewsBulletin.solr_reindex. Not working

2012-06-20 14:50:51 +08:00