Matthew K. Fu JuYuan b5571dbc43 Merge branch 'new_member' of github.com:Rulingcom/orbit into new_member ...

Conflicts:
	app/controllers/admin/users_new_interface_controller.rb
	app/views/admin/users_new_interface/show.html.erb

2012-10-12 18:17:05 +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

user new interface 70%

2012-10-09 06:40:18 +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-12 18:09:02 +08:00

_infos.html.erb

user new interface 70%

2012-10-09 06:40:18 +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

_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-12 18:09:02 +08:00

_temp_sub_role_from.html.erb

user new interface 70%

2012-10-09 06:40:18 +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-12 18:09:02 +08:00

edit.html.erb

user new interface 70%

2012-10-09 06:40:18 +08:00

index_summary.html.erb

basic function

2012-09-17 13:32:52 +08:00

index_summary.js.erb

basic function

2012-09-17 13:32:52 +08:00

index_thumbnail.html.erb

basic function

2012-09-17 13:32:52 +08:00

index_thumbnail.js.erb

basic function

2012-09-17 13:32:52 +08:00

index.html.erb

basic function

2012-09-17 13:32:52 +08:00

index.js.erb

basic function

2012-09-17 13:32:52 +08:00

plugin_dashbroad.html.erb

first version app config for Spen durning Chris's leave.

2012-09-24 11:43:48 +08:00

show.html.erb

new code for attribute fields and values for new member interface

2012-10-12 18:09:02 +08:00

temp_edit.html.erb

user new interface 70%

2012-10-09 06:40:18 +08:00