chris b40d4702d5 Merge branch 'master' into various_bugs ...

Conflicts:
	config/locales/en.yml
	config/locales/zh_tw.yml
	vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin.html.erb
	vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patents/_form.html.erb
	vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/plugin/writing_patents/_form.html.erb

2012-11-06 11:44:00 +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

desktopapp

test

2012-06-26 16:59:29 +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

orbit_app

first version app config for Spen durning Chris's leave.

2012-09-24 11:43:48 +08:00

parsers

Desktop Widgtes updates..

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

tasks

Merge branch 'various_bugs' into nccu_master

2012-10-29 16:10:07 +08:00

template

Changes into page_part edition.

2012-02-16 13:09:09 +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

NewBlog.zip

update app package for previous commit

2012-01-24 12:28:32 +08:00

orbit_app.rb

first version app config for Spen durning Chris's leave.

2012-09-24 11:43:48 +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

Merge branch 'various_bugs' into nccu_master

2012-10-29 16:10:07 +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