socialforge/app/views/users
nwb 099e8a0912 Merge branch 'szzh' into CourseModify
Conflicts:
	app/controllers/application_controller.rb
	app/views/attachments/upload.js.erb
	app/views/courses/_homework_form.html.erb
	app/views/layouts/base_courses.html.erb
	app/views/users/_my_joinedcourse.html.erb
	db/schema.rb
	lib/redmine.rb
	lib/redmine/access_control.rb
2014-06-17 10:12:44 +08:00
..
blocks first commit 2013-08-01 10:33:49 +08:00
_activity_score_index.html.erb 修复项目列表分数显示不一致的问题,修改用户列表显示不一致的问题,修改作业中项目显示分数和项目内部分数不一致的问题 2014-04-11 10:53:51 +08:00
_course_form.html.erb 更改课程图标显示逻辑,添加课程图标文件夹 2014-06-04 17:30:42 +08:00
_course_list_have_entity.html.erb 1.给各角色添加项目相关的权限 2014-06-06 13:56:48 +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_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 first commit 2013-08-01 10:33:49 +08:00
_my_course.html.erb 1.课程control添加create方法 2014-06-04 15:47:09 +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 1.Non member角色添加add_couese权限 2014-06-10 17:03:02 +08:00
_preferences.html.erb 解决冲突 2013-08-12 17:30:31 +08:00
_project_score_index.html.erb 个人分数 2014-01-16 10:34:39 +08:00
_score_index.html.erb 修复项目列表分数显示不一致的问题,修改用户列表显示不一致的问题,修改作业中项目显示分数和项目内部分数不一致的问题 2014-04-11 10:53:51 +08:00
_show_score.html.erb 讨论区发帖协同得分+2 2014-06-09 17:37:48 +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_show.html.erb admin账户个人主页显示修改 2014-05-23 11:50:36 +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 admin账户个人主页显示修改 2014-05-23 11:50:36 +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 first commit 2013-08-01 10:33:49 +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
search.html.erb admin个人主页项目功能修正 2014-05-26 16:25:53 +08:00
show.api.rsb first commit 2013-08-01 10:33:49 +08:00
show.html.erb 修复个人动态中留言人链接错误 2014-06-04 09:31:16 +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_score_index.js.erb 所有项目列表、创客列表中的分数都能被点击,然后弹出项目或个人的窗口;点击应该在分数上而不是文字上、 2014-01-23 14:34:54 +08:00
user_activities.html.erb socailForge#329 2014-03-28 18:12:44 +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 暂且提交,增加活动失败。 2014-03-13 22:06:49 +08:00
user_homeworks.html.erb 将课程和作业分开 2013-10-11 20:25:24 +08:00
user_newfeedback.html.erb 整理页面标签格式 2013-12-24 10:27:43 +08:00
user_projects.html.erb user tab bar 2014-05-29 18:34:51 +08:00
user_watchlist.html.erb 看用户列表出错 2014-06-09 15:07:08 +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