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_banners_helper.rb

Merge branch 'various_bugs' into nccu_master

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

app_auths_helper.rb

Changes for helpers, not including all by default

2012-10-09 14:47:16 +08:00

assets_helper.rb

Changes for helpers, not including all by default

2012-10-09 14:47:16 +08:00

attribute_values_view_helper.rb

add new member with role interface. add more not usable.

2012-11-04 20:42:58 +08:00

dashboards_helper.rb

Changes for helpers, not including all by default

2012-10-09 14:47:16 +08:00

items_helper.rb

Merge branch 'various_bugs' into nccu_master

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

module_apps_helper.rb

Merge branch 'various_bugs' into nccu_master

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

plugins_helper.rb

Changes for side_bar

2012-10-26 11:19:56 +08:00

users_helper.rb

Changes for helpers, not including all by default

2012-10-09 14:47:16 +08:00

web_component_helper.rb

complete preview for both new and announcement

2012-09-07 17:55:59 +08:00