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
..
_deled_quick_edit.html.erb	…
_filter.html.erb	…
_form.html.erb	Merge branch 'various_bugs' into nccu_master	2012-10-29 16:10:07 +08:00
_index_paginator.html.erb	…
_info.html.erb	new code for attribute fields and values for new member interface	2012-10-26 11:19:55 +08:00
_infos.html.erb	Merge branch 'various_bugs' into nccu_master	2012-10-29 16:10:07 +08:00
_js_and_css.html.erb	…
_plugin_summary.html.erb	…
_role.html.erb	for user new interface, member role is working.	2012-10-26 11:27:37 +08:00
_roles.html.erb	can add member	2012-10-26 11:19:56 +08:00
_show_roles.html.erb	for user new interface, member role is working.	2012-10-26 11:27:37 +08:00
_show_sub_role.html.erb	for user new interface, member role is working.	2012-10-26 11:27:37 +08:00
_side_bar.html.erb	Changes for side_bar	2012-10-26 11:19:56 +08:00
_sort_headers.html.erb	…
_temp_form.html.erb	…
_temp_profile.html.erb	new code for attribute fields and values for new member interface	2012-10-26 11:19:55 +08:00
_temp_sub_role_from.html.erb	…
_user_basic.html.erb	fixed html for add link. form html	2012-10-26 11:19:56 +08:00
_user_for_listing.html.erb	…
_user_for_summary.html.erb	…
_user_for_thumbnail.html.erb	…
_user_role.html.erb	new code for attribute fields and values for new member interface	2012-10-26 11:19:55 +08:00
edit.html.erb	add new member with role interface. add more not usable.	2012-11-04 20:42:58 +08:00
index.html.erb	Changes for side_bar	2012-10-26 11:19:56 +08:00
index.js.erb	…
index_summary.html.erb	Changes for side_bar	2012-10-26 11:19:56 +08:00
index_summary.js.erb	…
index_thumbnail.html.erb	Changes for side_bar	2012-10-26 11:19:56 +08:00
index_thumbnail.js.erb	…
new.html.erb	Changes for side_bar	2012-10-26 11:19:56 +08:00
plugin_dashbroad.html.erb	Changes for side_bar	2012-10-26 11:19:56 +08:00
show.html.erb	for user new interface, member role is working.	2012-10-26 11:27:37 +08:00
temp_edit.html.erb	Changes for side_bar	2012-10-26 11:19:56 +08:00