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

..

admin

hide category at front end

2012-07-09 12:05:21 +08:00

application_controller.rb

Changes for structure

2012-05-22 14:45:49 +08:00

gridfs_controller.rb

fix for 新聞與公告QA

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

orbit_backend_controller.rb

category disable for backend

2012-07-06 18:11:55 +08:00

orbit_frontend_component_controller.rb

Changes for widgets

2012-05-13 21:55:39 +08:00

orbit_frontend_controller.rb

First version for App and Object auth.Taking Announcement as experiment

2012-02-29 18:55:55 +08:00

orbit_widget_controller.rb

Change Obit to Orbit

2012-03-16 11:54:31 +08:00

pages_controller.rb

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

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

sessions_controller.rb

orbit disable object for categories

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