Matthew K. Fu JuYuan b4a2737407 Merge branch 'new_member' of github.com:Rulingcom/orbit into new_member ... Conflicts: app/helpers/attribute_fields_helper.rb app/views/admin/infos/_form.html.erb config/locales/zh_tw.yml		2012-11-16 15:42:39 +08:00
..
_deled_quick_edit.html.erb	basic function	2012-09-17 13:32:52 +08:00
_filter.html.erb	basic function	2012-09-17 13:32:52 +08:00
_form.html.erb	Merge branch 'new_member' of github.com:Rulingcom/orbit into new_member	2012-11-16 15:42:39 +08:00
_index_paginator.html.erb	basic function	2012-09-17 13:32:52 +08:00
_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	basic function	2012-09-17 13:32:52 +08:00
_plugin_summary.html.erb	break down Ray's HTML	2012-09-14 00:02:22 +08:00
_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	add_more ok	2012-11-08 18:59:19 +08:00
_side_bar.html.erb	Changes for side_bar	2012-10-26 11:19:56 +08:00
_sort_headers.html.erb	basic function	2012-09-17 13:32:52 +08:00
_temp_form.html.erb	user new interface 70%	2012-10-09 06:40:18 +08:00
_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 new interface 70%	2012-10-09 06:40:18 +08:00
_user_basic.html.erb	fixed html for add link. form html	2012-10-26 11:19:56 +08:00
_user_for_listing.html.erb	basic function	2012-09-17 13:32:52 +08:00
_user_for_summary.html.erb	basic function	2012-09-17 13:32:52 +08:00
_user_for_thumbnail.html.erb	basic function	2012-09-17 13:32:52 +08:00
_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	address field and text field convert	2012-11-15 17:23:39 +08:00
index.html.erb	Changes for side_bar	2012-10-26 11:19:56 +08:00
index.js.erb	basic function	2012-09-17 13:32:52 +08:00
index_summary.html.erb	Changes for side_bar	2012-10-26 11:19:56 +08:00
index_summary.js.erb	basic function	2012-09-17 13:32:52 +08:00
index_thumbnail.html.erb	Changes for side_bar	2012-10-26 11:19:56 +08:00
index_thumbnail.js.erb	basic function	2012-09-17 13:32:52 +08:00
new.html.erb	complete address field. still have javascript issue for fill back and display address ext fields in modal.	2012-11-16 15:36:08 +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