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

..

_drop_down_menu.html.erb

Changes for i18n yml

2012-09-24 09:02:45 +08:00

_lang_menu.html.erb

Chris's first commit at Fri Jan 28 2011 10:14:32 GMT+0800 (CST)

2011-04-13 18:19:51 +08:00

_orbit_bar.html.erb

Merge branch 'various_bugs' into nccu_master

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

_side_bar_content.html.erb

Merge branch 'master' into various_bugs

2012-11-06 11:44:00 +08:00

_side_bar.html.erb

Fix after merge from NCCU, the translations still need to be cleaned

2012-10-30 11:08:26 +08:00

_users_checkbox_ary.html.erb

fix for not working cache

2012-07-13 18:32:17 +08:00

admin.html.erb

new code for attribute fields and values for new member interface

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

application.html.erb

Merge server and rails_3_1

2011-08-18 13:43:33 +08:00

desktop.html.erb

Desktop Commit

2012-04-06 17:47:02 +08:00

devise.html.erb

Changes for IE9 with html5

2012-03-21 15:51:55 +08:00

module_widget.html.erb

Changes for widgets

2012-05-13 21:55:39 +08:00

new_admin.html.erb

Changes for side_bar

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

page_layout.html.erb

Error popup only shows on flash[:error]

2012-08-15 15:55:29 +08:00

site_editor.html.erb

Changes for structure

2012-05-22 14:45:49 +08:00