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

..

parser_back_end.rb

Fix several bus when there is no design

2012-04-02 02:41:42 +08:00

parser_common.rb

Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team

2012-04-27 11:11:56 +08:00

parser_front_end.rb

Merge branch 'nccu0501_cust' of github.com:Rulingcom/orbit into nccu0501_cust

2012-05-04 15:59:26 +08:00

parser_layout.rb

Fix bugs in upload design and missing menu

2012-04-06 17:37:45 +08:00