socialforge/app/views/users
sw 111478ec72 Merge branch 'szzh' into sw_new_course
Conflicts:
	app/controllers/users_controller.rb
	config/routes.rb
2015-08-24 10:39:52 +08:00
..
blocks
_activity_new_score_index.html.erb 完善用户资料模块,用户主页课程栏、留言栏、项目栏和标签模块国际化;对一些存储在数据表中的固定的中文属性,比如学期,职称,在helper和model中定义方法封装;平台导航模块,包括各模块内部导航的国际化;课程平台模块国际化整理和修改,去除重复功能标签 2015-03-10 09:45:36 +08:00
_activity_score_index.html.erb
_attachment_list.html.erb 资源库 2015-08-15 17:07:50 +08:00
_course_form.html.erb 访问他人课程列表,非课程成员的课程显示加入课程,加入课程后界面刷新 2015-07-30 11:21:35 +08:00
_course_list_have_entity.html.erb 完善用户资料模块,用户主页课程栏、留言栏、项目栏和标签模块国际化;对一些存储在数据表中的固定的中文属性,比如学期,职称,在helper和model中定义方法封装;平台导航模块,包括各模块内部导航的国际化;课程平台模块国际化整理和修改,去除重复功能标签 2015-03-10 09:45:36 +08:00
_course_list_have_entity_ex.html.erb 完善用户资料模块,用户主页课程栏、留言栏、项目栏和标签模块国际化;对一些存储在数据表中的固定的中文属性,比如学期,职称,在helper和model中定义方法封装;平台导航模块,包括各模块内部导航的国际化;课程平台模块国际化整理和修改,去除重复功能标签 2015-03-10 09:45:36 +08:00
_form.html.erb
_general.html.erb
_groups.html.erb
_history.html.erb bug#2948:在课程和个人主页模块,被留言的人应该能看到留言人的昵称和真实姓名 2015-07-03 15:20:53 +08:00
_influence_new_score_index.html.erb 用户得分:项目得分中添加发帖得分(帖子回复在协同得分) 2015-07-06 16:38:16 +08:00
_influence_score_index.html.erb
_leave_message.html.erb
_mail_notifications.html.erb 邮件样式调整,国际化;用户资料页面调整 2015-01-21 18:12:04 +08:00
_memberships.html.erb #1290 修改admin配置管理--用户列表--项目列表界面以及相关功能问题 2014-08-13 16:52:07 +08:00
_my_course.html.erb 修正用户课程界面关闭、重启课程,数据刷新不及时的问题 2014-06-27 10:50:23 +08:00
_my_course_ex.html.erb 修正用户课程界面关闭、重启课程,数据刷新不及时的问题 2014-06-27 10:50:23 +08:00
_my_create_homework.html.erb 恢复respond_path路由并修改部分respond_path 2014-11-02 10:20:28 +08:00
_my_homework.html.erb
_my_joinedcourse.html.erb 新版项目成员,关注者,资源库国际化;修改国际化缺失的bug 2015-03-17 18:04:35 +08:00
_preferences.html.erb bug#2911:用超级管理员进入admin配置窗口,点击进入“用户列表”,搜索某用户,点击该用户,如图,用户动态中字被截断了 2015-06-24 15:39:16 +08:00
_project_new_score_index.html.erb 完善用户资料模块,用户主页课程栏、留言栏、项目栏和标签模块国际化;对一些存储在数据表中的固定的中文属性,比如学期,职称,在helper和model中定义方法封装;平台导航模块,包括各模块内部导航的国际化;课程平台模块国际化整理和修改,去除重复功能标签 2015-03-10 09:45:36 +08:00
_project_score_index.html.erb
_resource_search_form.html.erb 资源库 修改 2015-08-20 17:38:30 +08:00
_resource_share_for_project_popup.html.erb 资源库 多选发送 2015-08-20 16:05:58 +08:00
_resource_share_popup.html.erb 资源库 多选发送 2015-08-20 16:05:58 +08:00
_resource_upload_popup.html.erb 资源库 2015-08-15 17:07:50 +08:00
_resources_list.html.erb 新成员注册的时候报错 2015-08-21 17:13:42 +08:00
_score_index.html.erb
_score_new_index.html.erb Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2014-09-15 10:58:14 +08:00
_show_new_score.html.erb 个人主页 2015-07-10 15:38:49 +08:00
_show_score.html.erb
_topic_new_score_index.html.erb 用户得分:项目得分中添加发帖得分(帖子回复在协同得分) 2015-07-06 16:38:16 +08:00
_topic_score_index.html.erb
_upload_resource.html.erb 资源库 2015-08-15 17:07:50 +08:00
_user_extensions.html.erb
_user_fans_item.html.erb 3227缺陷已修复 2015-07-21 14:10:56 +08:00
_user_jour_reply.html.erb 没有昵称的用户显示为:匿名用户 2015-08-01 15:14:45 +08:00
_user_jours.html.erb Merge remote-tracking branch 'origin/szzh' into guange_dev 2015-06-17 17:01:40 +08:00
_user_jours_new.html.erb 没有昵称的用户显示为:匿名用户 2015-08-01 15:14:45 +08:00
_user_score.html.erb 增加《作业评分弹窗》《学生列表增加作业评分》两项功能 2014-12-17 17:36:12 +08:00
_user_show.html.erb 添加关注 2015-08-12 16:28:21 +08:00
activity_new_score_index.js.erb 个人得分规则显示 2014-06-30 16:19:28 +08:00
activity_score_index.js.erb
add_exist_file_to_course.js.erb 资源库 2015-08-20 10:14:26 +08:00
add_exist_file_to_project.js.erb 资源库 2015-08-20 10:14:26 +08:00
destroy_membership.js.erb
edit.html.erb
edit_brief_introduction.js.erb 编辑个人简介 2015-08-21 16:29:25 +08:00
edit_membership.js.erb
index.api.rsb
index.html.erb #1665 “软件创客”链接入口,点击报404 2014-12-05 11:37:37 +08:00
influence_new_score_index.js.erb 个人得分规则显示 2014-06-30 16:19:28 +08:00
influence_score_index.js.erb
info.html.erb
leave_message.js.erb
list.api.rsb
list.html.erb
new.html.erb 修改bug<点击排序后内容类型自动变为全部,但又并未显示全部资源> 2014-11-06 14:45:59 +08:00
project_new_score_index.js.erb 个人得分规则显示 2014-06-30 16:19:28 +08:00
project_score_index.js.erb
rename_resource.js.erb 资源库 2015-08-18 15:25:36 +08:00
resource_preview.js.erb 资源库 2015-08-18 15:25:36 +08:00
resource_search.js.erb 分页改为了15条 2015-08-24 10:31:25 +08:00
score_index.js.erb
score_new_index.js.erb
search.html.erb 修复bug#2725 :用户搜索--默认用户名和姓名一起匹配 2015-06-05 11:39:55 +08:00
search_user_course.js.erb 资源库 分页 2015-08-20 17:00:54 +08:00
search_user_project.js.erb 资源库 分页 2015-08-20 17:00:54 +08:00
show.api.rsb
show.html.erb 个人主页,添加、取消关注及相关效果 2015-08-21 15:23:03 +08:00
show_new_score.html.erb 个人得分细节显示 2014-08-13 15:59:19 +08:00
show_new_score.js.erb 个人主页弹出框bug 2015-07-10 15:01:44 +08:00
show_old.html.erb
show_score.js.erb
tag_save.js.erb 修改contest中出现的逻辑错误 2014-10-23 11:30:34 +08:00
tag_saveEx.js.erb
topic_new_score_index.js.erb
topic_score_index.js.erb
update_score.js.erb 实时刷新(ajax轮询) 2014-06-21 15:34:10 +08:00
user_activities.html.erb 张申修改的bug 2015-07-06 11:42:26 +08:00
user_comments.html.erb
user_course_activities.html.erb 修复个人主页的课程/项目动态中可点击的私有课程/项目显示为灰色的bug 2015-08-03 10:31:05 +08:00
user_courses.html.erb f访问他人个人主页不显示加入课程按钮 2015-07-30 11:23:33 +08:00
user_courses4show.html.erb 个人主页 2015-07-18 10:55:12 +08:00
user_fanslist.html.erb 个人主页->访客 2015-07-14 15:16:15 +08:00
user_feedback4show.html.erb 个人主页 2015-07-16 11:37:03 +08:00
user_homeworks.html.erb 添加删除作业功能 2015-05-27 19:39:06 +08:00
user_messages.html.erb 解决CSS冲突 2015-08-21 17:40:28 +08:00
user_newfeedback.html.erb 1、留言界面显示top_view 2015-07-31 15:25:01 +08:00
user_projects.html.erb 进入他人个人主页,TA的项目列表,显示TA创建/TA参与 2015-07-30 16:06:42 +08:00
user_projects4show.html.erb 个人主页 2015-07-18 10:55:12 +08:00
user_resource.html.erb 分页改为了15条 2015-08-24 10:31:25 +08:00
user_resource.js.erb 分页改为了15条 2015-08-24 10:31:25 +08:00
user_resource_create.js.erb 分页改为了15条 2015-08-24 10:31:25 +08:00
user_resource_delete.js.erb 分页改为了15条 2015-08-24 10:31:25 +08:00
user_watchlist.html.erb 将setting中的domain合并到host配置中 2015-05-14 21:40:34 +08:00
watch_bids.html.erb
watch_projects.html.erb