jacknudt
/
socialforge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
socialforge/app/views/users
History
alan 8c19ec8aa0 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 
Conflicts:
	app/helpers/projects_helper.rb
	app/views/contest_notification/show.html.erb

Signed-off-by: alan <547533434@qq.com>
 		2014-09-15 10:58:14 +08:00
..
blocks first commit 2013-08-01 10:33:49 +08:00
_activity_new_score_index.html.erb 个人得分细节显示 2014-08-13 15:59:19 +08:00
_activity_score_index.html.erb 修复项目列表分数显示不一致的问题，修改用户列表显示不一致的问题，修改作业中项目显示分数和项目内部分数不一致的问题 2014-04-11 10:53:51 +08:00
_course_form.html.erb 修复火狐不兼容自动换行的问题 2014-08-28 17:30:08 +08:00
_course_list_have_entity.html.erb 1.给各角色添加项目相关的权限 2014-06-06 13:56:48 +08:00
_course_list_have_entity_ex.html.erb 修正用户课程界面关闭、重启课程，数据刷新不及时的问题 2014-06-27 10:50:23 +08:00
_form.html.erb "我的头像"国际化；修改资料里的显示布局 2013-08-06 20:09:52 +08:00
_general.html.erb first commit 2013-08-01 10:33:49 +08:00
_groups.html.erb first commit 2013-08-01 10:33:49 +08:00
_influence_new_score_index.html.erb 个人得分细节显示 2014-08-13 15:59:19 +08:00
_influence_score_index.html.erb 个人分数 2014-01-16 10:34:39 +08:00
_leave_message.html.erb first commit 2013-08-01 10:33:49 +08:00
_mail_notifications.html.erb -。- 2014-05-09 17:08:42 +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 修改了部分国际化 2013-10-19 15:39:53 +08:00
_my_homework.html.erb modify homework show and the link of style 2013-10-16 17:02:38 +08:00
_my_joinedcourse.html.erb 部分BUG修正 2014-07-01 16:56:23 +08:00
_preferences.html.erb 解决冲突 2013-08-12 17:30:31 +08:00
_project_new_score_index.html.erb 个人得分细节显示 2014-08-13 15:59:19 +08:00
_project_score_index.html.erb 个人分数 2014-01-16 10:34:39 +08:00
_score_index.html.erb 新得分显示 2014-06-16 17:50:28 +08:00
_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 个人得分细节显示 2014-08-13 15:59:19 +08:00
_show_score.html.erb 讨论区发帖协同得分+2 2014-06-09 17:37:48 +08:00
_topic_new_score_index.html.erb 个人得分细节显示 2014-08-13 15:59:19 +08:00
_topic_score_index.html.erb 个人分数 2014-01-16 10:34:39 +08:00
_user_extensions.html.erb 给tag search结果添加了分页。 2013-08-19 17:28:59 +08:00
_user_score.html.erb 积分计算修改 2014-08-13 11:17:22 +08:00
_user_show.html.erb 1、去除不用了的旧的积分代码。2、将刷新提交次数功能修改（原来是在显示项目或个人信息的页面之前调用repository.fetch_changesets刷新changeset，修改为创建changeset对象后马上调用repository.fetch_changesets方法刷新changeset对象，注意：尚需测试） 2014-08-25 14:47:27 +08:00
activity_new_score_index.js.erb 个人得分规则显示 2014-06-30 16:19:28 +08:00
activity_score_index.js.erb 所有项目列表、创客列表中的分数都能被点击，然后弹出项目或个人的窗口；点击应该在分数上而不是文字上、 2014-01-23 14:34:54 +08:00
destroy_membership.js.erb first commit 2013-08-01 10:33:49 +08:00
edit.html.erb first commit 2013-08-01 10:33:49 +08:00
edit_membership.js.erb first commit 2013-08-01 10:33:49 +08:00
index.api.rsb first commit 2013-08-01 10:33:49 +08:00
index.html.erb 修复导航bug 2014-07-22 15:59:35 +08:00
influence_new_score_index.js.erb 个人得分规则显示 2014-06-30 16:19:28 +08:00
influence_score_index.js.erb 所有项目列表、创客列表中的分数都能被点击，然后弹出项目或个人的窗口；点击应该在分数上而不是文字上、 2014-01-23 14:34:54 +08:00
info.html.erb del the link of .head portrait 2013-11-01 15:48:23 +08:00
leave_message.js.erb first commit 2013-08-01 10:33:49 +08:00
list.api.rsb first commit 2013-08-01 10:33:49 +08:00
list.html.erb 修复个人主页查看关注的项目时报user_id指代不明的sql错误 2014-05-26 17:04:55 +08:00
new.html.erb 修复导航bug 2014-07-22 15:59:35 +08:00
project_new_score_index.js.erb 个人得分规则显示 2014-06-30 16:19:28 +08:00
project_score_index.js.erb 所有项目列表、创客列表中的分数都能被点击，然后弹出项目或个人的窗口；点击应该在分数上而不是文字上、 2014-01-23 14:34:54 +08:00
score_index.js.erb 所有项目列表、创客列表中的分数都能被点击，然后弹出项目或个人的窗口；点击应该在分数上而不是文字上、 2014-01-23 14:34:54 +08:00
score_new_index.js.erb 新得分显示 2014-06-16 17:50:28 +08:00
search.html.erb 修改软件创客搜索结果显示样式 2014-07-18 15:47:48 +08:00
show.api.rsb first commit 2013-08-01 10:33:49 +08:00
show.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 个人得分细节显示 2014-08-13 15:59:19 +08:00
show_new_score.js.erb 新得分显示 2014-06-16 17:50:28 +08:00
show_old.html.erb 去除网站中的邮箱地址显示 2014-05-19 11:02:07 +08:00
show_score.js.erb 合并user_score属性 2014-06-06 16:17:27 +08:00
tag_save.js.erb issues#377 074e8adf 引入的issue页面权限问题，除了控制器还修改过views判断语句 keyworks: @edit_allowed 2014-04-24 10:16:49 +08:00
tag_saveEx.js.erb 1.优化资源文件上传下载界面 2014-05-20 11:33:17 +08:00
topic_new_score_index.js.erb 新得分显示 2014-06-16 17:50:28 +08:00
topic_score_index.js.erb 所有项目列表、创客列表中的分数都能被点击，然后弹出项目或个人的窗口；点击应该在分数上而不是文字上、 2014-01-23 14:34:54 +08:00
update_score.js.erb 实时刷新（ajax轮询） 2014-06-21 15:34:10 +08:00
user_activities.html.erb 修复用户动态首页描述不正确的问题 2014-08-27 11:31:18 +08:00
user_comments.html.erb first commit 2013-08-01 10:33:49 +08:00
user_courses.html.erb student user_course 2014-05-21 18:29:56 +08:00
user_fanslist.html.erb 1.个人主页--关注、粉丝，即使关注者、粉丝没有参加项目、课程，显示为“参与了0个项目/课程” #1211 2014-08-29 09:40:57 +08:00
user_homeworks.html.erb 将课程和作业分开 2013-10-11 20:25:24 +08:00
user_newfeedback.html.erb 修复用户留言取消按钮描述不正确的问题 2014-08-21 17:14:30 +08:00
user_projects.html.erb 修复火狐不兼容自动换行的问题 2014-08-28 17:30:08 +08:00
user_watchlist.html.erb 1.个人主页--关注、粉丝，即使关注者、粉丝没有参加项目、课程，显示为“参与了0个项目/课程” #1211 2014-08-29 09:40:57 +08:00
watch_bids.html.erb del the link of .head portrait 2013-11-01 15:48:23 +08:00
watch_projects.html.erb user tab bar 2014-05-29 18:34:51 +08:00