developers
/
orbit-basic
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
orbit-basic/app/views/admin/users_new_interface
History
Matthew K. Fu JuYuan 664c6d2f61 Merge branch 'new_member' of github.com:Rulingcom/orbit into new_member 
Conflicts:
	vendor/built_in_modules/personal_patent/app - %BDƻs/assets/images/personal_patent/.gitkeep
	vendor/built_in_modules/personal_patent/app - %BDƻs/assets/javascripts/personal_patent/.gitkeep
	vendor/built_in_modules/personal_patent/app - %BDƻs/assets/stylesheets/personal_patent/.gitkeep
	vendor/built_in_modules/personal_patent/app - %BDƻs/controllers/.gitkeep
	vendor/built_in_modules/personal_patent/app - %BDƻs/controllers/application_controller.rb
	vendor/built_in_modules/personal_patent/app - %BDƻs/controllers/panel/personal_patent/back_end/tags_controller.rb
	vendor/built_in_modules/personal_patent/app - %BDƻs/controllers/panel/personal_patent/back_end/writing_patent_categorys_controller.rb
	vendor/built_in_modules/personal_patent/app - %BDƻs/controllers/panel/personal_patent/back_end/writing_patents_controller.00.rb
	vendor/built_in_modules/personal_patent/app - %BDƻs/controllers/panel/personal_patent/back_end/writing_patents_controller.rb
	vendor/built_in_modules/personal_patent/app - %BDƻs/controllers/panel/personal_patent/plugin/writing_patents_controller.rb
	vendor/built_in_modules/personal_patent/app - %BDƻs/helpers/.gitkeep
	vendor/built_in_modules/personal_patent/app - %BDƻs/mailers/.gitkeep
	vendor/built_in_modules/personal_patent/app - %BDƻs/models/.gitkeep
	vendor/built_in_modules/personal_patent/app - %BDƻs/models/personal_patent_tag.rb
	vendor/built_in_modules/personal_patent/app - %BDƻs/models/writing_patent.rb
	vendor/built_in_modules/personal_patent/app - %BDƻs/models/writing_patent_category.rb
	vendor/built_in_modules/personal_patent/app - %BDƻs/models/writing_patent_file.rb
	vendor/built_in_modules/personal_patent/app - %BDƻs/views/.gitkeep
	vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patent_categorys/_form.html.erb
	vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patent_categorys/_writing_patent_category.html.erb
	vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patent_categorys/create.js.erb
	vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patent_categorys/destroy.js.erb
	vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patent_categorys/edit.js.erb
	vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patent_categorys/index.html.erb
	vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patent_categorys/new.js.erb
	vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patent_categorys/update.js.erb
	vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patents/_filter.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/back_end/writing_patents/_form_file.html.erb
	vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patents/_list_writing_patent_category.html.erb
	vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patents/_sort_headers.html.erb
	vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patents/_writing_patent.html.erb
	vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patents/_writing_patent_category_qe.html.erb
	vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patents/create_writing_patent_setting.js.erb
	vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patents/destroy.js.erb
	vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patents/edit.html.erb
	vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patents/index.html.erb
	vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patents/index.js.erb
	vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patents/new.html.erb
	vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patents/show.html.erb
	vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patents/toggle_enable.js.erb
	vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patents/update_writing_patent_setting.js.erb
	vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patents/writing_patent_category_quick_add.js.erb
	vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patents/writing_patent_category_quick_edit.js.erb
	vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patents/writing_patent_setting.html.erb
	vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/plugin/writing_patents/_filter.html.erb
	vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/plugin/writing_patents/_form.html.erb
	vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/plugin/writing_patents/_form_file.html.erb
	vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/plugin/writing_patents/_sort_headers.html.erb
	vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/plugin/writing_patents/_writing_patent.html.erb
	vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/plugin/writing_patents/destroy.js.erb
	vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/plugin/writing_patents/edit.html.erb
	vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/plugin/writing_patents/index.html.erb
	vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/plugin/writing_patents/index.js.erb
	vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/plugin/writing_patents/new.html.erb
	vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/plugin/writing_patents/show.html.erb
	vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/plugin/writing_patents/toggle_enable.js.erb
 		2012-10-30 10:11:51 +08:00
..
tag_helpers Merge branch 'new_member' of github.com:Rulingcom/orbit into new_member 2012-10-30 10:11:51 +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 for user new interface, member role is working. 2012-10-26 11:27:37 +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 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
_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 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 Changes for side_bar 2012-10-26 11:19:56 +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 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