Christophe Vilayphiou 3bd3820519 Merge branch 'nccu0501_cust' of github.com:Rulingcom/orbit into nccu0501_cust ... Conflicts: app/controllers/application_controller.rb app/helpers/application_helper.rb lib/parsers/parser_front_end.rb vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_sort_headers.html.erb vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/index.html.erb vendor/built_in_modules/announcement/config/locales/en.yml vendor/built_in_modules/announcement/config/locales/zh_tw.yml		2012-05-04 15:59:26 +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	Merge branch 'nccu0501_cust' of github.com:Rulingcom/orbit into nccu0501_cust	2012-05-04 15:59:26 +08:00
tasks	Add rake task for layout with nokogiri	2012-03-27 19:00:03 +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_core_lib.rb	Integrate App & Object Auth to announcement with i18n variables. Also changed Role and SubRole i18n var. Checked with Allen	2012-04-30 00:24:11 +08:00