| .. |
|
_clear_filters.html.erb
|
solved conflict for member_new_ui
|
2013-08-12 15:40:34 +08:00 |
|
_deled_quick_edit.html.erb
|
Translation changes
|
2012-12-03 23:00:04 +08:00 |
|
_filter.html.erb
|
solved conflict for member_new_ui
|
2013-08-12 15:40:34 +08:00 |
|
_form.html.erb
|
solved conflict for member_new_ui
|
2013-08-12 15:40:34 +08:00 |
|
_index_paginator.html.erb
|
solved conflict for member_new_ui
|
2013-08-12 15:40:34 +08:00 |
|
_info.html.erb
|
solved conflict for member_new_ui
|
2013-08-12 15:40:34 +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
|
solved conflict for member_new_ui
|
2013-08-12 15:40:34 +08:00 |
|
_plugin_summary.html.erb
|
Change icons
|
2013-01-09 21:17:50 +08:00 |
|
_role.html.erb
|
solved conflict for member_new_ui
|
2013-08-12 15:40:34 +08:00 |
|
_roles.html.erb
|
solved conflict for member_new_ui
|
2013-08-12 15:40:34 +08:00 |
|
_show_roles.html.erb
|
new ui personal front_end page(member app) & users_new_interface show sub_roles fix
|
2013-08-21 14:13:36 +08:00 |
|
_show_sub_role.html.erb
|
new ui personal front_end page(member app) & users_new_interface show sub_roles fix
|
2013-08-21 14:13:36 +08:00 |
|
_side_bar.html.erb
|
solved conflict for member_new_ui
|
2013-08-12 15:40:34 +08:00 |
|
_sort_headers.html.erb
|
Fix some translations
|
2012-12-04 01:03:28 +08:00 |
|
_temp_form.html.erb
|
Translation changes
|
2012-12-03 23:00:04 +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
|
solved conflict for member_new_ui
|
2013-08-12 15:40:34 +08:00 |
|
_user_basic_passwd.html.erb
|
solved conflict for member_new_ui
|
2013-08-12 15:40:34 +08:00 |
|
_user_for_listing.html.erb
|
solved conflict for member_new_ui
|
2013-08-12 15:40:34 +08:00 |
|
_user_for_summary.html.erb
|
solved conflict for member_new_ui
|
2013-08-12 15:40:34 +08:00 |
|
_user_for_thumbnail.html.erb
|
solved conflict for member_new_ui
|
2013-08-12 15:40:34 +08:00 |
|
_user_role.html.erb
|
solved conflict for member_new_ui
|
2013-08-12 15:40:34 +08:00 |
|
edit.html.erb
|
solved conflict for member_new_ui
|
2013-08-12 15:40:34 +08:00 |
|
edit_passwd.html.erb
|
solved conflict for member_new_ui
|
2013-08-12 15:40:34 +08:00 |
|
index.html.erb
|
solved conflict for member_new_ui
|
2013-08-12 15:40:34 +08:00 |
|
index.js.erb
|
basic function
|
2012-09-17 13:32:52 +08:00 |
|
index_summary.html.erb
|
solved conflict for member_new_ui
|
2013-08-12 15:40:34 +08:00 |
|
index_summary.js.erb
|
basic function
|
2012-09-17 13:32:52 +08:00 |
|
index_thumbnail.html.erb
|
solved conflict for member_new_ui
|
2013-08-12 15:40:34 +08:00 |
|
index_thumbnail.js.erb
|
basic function
|
2012-09-17 13:32:52 +08:00 |
|
new.html.erb
|
solved conflict for member_new_ui
|
2013-08-12 15:40:34 +08:00 |
|
plugin_dashbroad.html.erb
|
fix for Spen's translation and Chris's tag error
|
2013-04-26 15:37:27 +08:00 |
|
show.html.erb
|
solved conflict for member_new_ui
|
2013-08-12 15:40:34 +08:00 |
|
temp_edit.html.erb
|
fix for Spen's translation and Chris's tag error
|
2013-04-26 15:37:27 +08:00 |
4078d426a6