Spen 6c514770bc 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
_form.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
_new.html.erb	solved conflict for member_new_ui	2013-08-12 15:40:34 +08:00
_role_filter.html.erb	solved conflict for member_new_ui	2013-08-12 15:40:34 +08:00
create.js.erb	user id set & user fields set & role set & member frontend list & user translation & create new member bug fix	2013-04-25 19:59:59 +08:00
destroy.js.erb	user id set & user fields set & role set & member frontend list & user translation & create new member bug fix	2013-04-25 19:59:59 +08:00
edit.html.erb	solved conflict for member_new_ui	2013-08-12 15:40:34 +08:00
edit.js.erb	user id set & user fields set & role set & member frontend list & user translation & create new member bug fix	2013-04-25 19:59:59 +08:00
index.html.erb	solved conflict for member_new_ui	2013-08-12 15:40:34 +08:00
index.js.erb	solved conflict for member_new_ui	2013-08-12 15:40:34 +08:00
new.html.erb	solved conflict for member_new_ui	2013-08-12 15:40:34 +08:00
new.js.erb	user id set & user fields set & role set & member frontend list & user translation & create new member bug fix	2013-04-25 19:59:59 +08:00
update.js.erb	user id set & user fields set & role set & member frontend list & user translation & create new member bug fix	2013-04-25 19:59:59 +08:00