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
..
ad_banner	Add rake task for ad_banner. Will have ad_banner at dev:build	2012-02-04 09:37:23 +08:00
fraisier	fix announcement & add lang tab	2012-04-05 15:23:20 +08:00
noko	Add rake task for layout with nokogiri	2012-03-27 19:00:03 +08:00
parsers	Search sold edition,rake sunspot:solr:run. NewsBulletin.solr_search,NewsBulletin.solr_reindex. Not working	2012-06-20 14:50:51 +08:00
tasks	DM for archive bulletin categroy	2012-07-04 17:56:51 +08:00
template	Changes into page_part edition.	2012-02-16 13:09:09 +08:00
NewBlog.zip	update app package for previous commit	2012-01-24 12:28:32 +08:00
central_server_exchange_app.rb	Integration of module_app workflow	2011-11-19 14:33:26 +08:00
github_app.rb	Update source: pull from git	2011-08-23 15:01:22 +08:00
main_public_key.pem	Merge server and rails_3_1	2011-08-18 13:43:33 +08:00
orbit_basis.rb	Search sold edition,rake sunspot:solr:run. NewsBulletin.solr_search,NewsBulletin.solr_reindex. Not working	2012-06-20 14:50:51 +08:00
orbit_controller_lib.rb	category disable for backend	2012-07-06 18:11:55 +08:00
orbit_core_lib.rb	category disable for backend	2012-07-06 18:11:55 +08:00
orbit_search_lib.rb	Search sold edition,rake sunspot:solr:run. NewsBulletin.solr_search,NewsBulletin.solr_reindex. Not working	2012-06-20 14:50:51 +08:00
resque_ext.rb	Add this toolbar, and nccu calendar fix	2012-06-04 16:51:29 +08:00