jacknudt
/
socialforge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
18,123 Commits 98 Branches 0 Tags 0 B
Commit Graph

18123 Commits

Author SHA1 Message Date
cxt 1d23b2cf65 Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-12-22 11:19:59 +08:00
cxt fddcbe2a56 新建竞赛 2016-12-22 11:17:13 +08:00
cxt 159f0b294f Merge branch 'develop' into cxt_course 2016-12-22 10:11:47 +08:00
cxt 5242e12373 竞赛框架搭建 2016-12-22 10:01:37 +08:00
黄井泉 426ee0a26c Merge branch 'develop' into 'develop' 
个人主页课程、项目链接修改



See merge request !79
 2016-12-19 12:22:44 +08:00
huang 3bf6c35d0e 我(Ta)的主页 课程、项目链接修改 2016-12-19 11:33:14 +08:00
黄井泉 b74ddd8348 Merge branch 'develop' into 'develop' 
message数据重复问题



See merge request !78
 2016-12-19 11:08:29 +08:00
huang 711f234148 message 中重复发消息问题 2016-12-19 11:06:45 +08:00
黄井泉 38659fc5a9 Merge branch 'develop' into 'develop' 
message 的delay job发送方式优化



See merge request !77
 2016-12-19 10:27:45 +08:00
huang cb33bec7db 讨论区发帖delay 模式优化 2016-12-19 10:24:36 +08:00
huang 9a6a4a5203 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-12-19 09:55:07 +08:00
huang 7a8eb84806 Merge branch 'guange_dev' into develop 2016-12-18 18:52:47 +08:00
guange 34f8450885 ids为空时不需要执行 2016-12-18 18:29:24 +08:00
guange d34ed4b744 切分一下，解决delayed_job卡死问题。 2016-12-18 18:25:14 +08:00
guange d7155afbe5 切分一下，解决delayed_job卡死问题。 2016-12-18 18:17:39 +08:00
guange 6ef7a15a5b 设置只读不需要放到delayed_job 2016-12-18 12:28:56 +08:00
陈晓婷 73de078c58 Merge branch 'cxt_course' into 'develop' 
消息列表报500



See merge request !76
 2016-12-17 18:03:28 +08:00
cxt 35dfdeea98 消息报500 2016-12-17 18:01:08 +08:00
cxt fc6d2f1155 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into cxt_course 2016-12-17 17:59:05 +08:00
cxt c444096a04 消息列表报500 2016-12-17 17:58:31 +08:00
陈晓婷 7d2bcaada3 Merge branch 'develop' into 'develop' 
项目社区、课程社区点击我的动态错误，新建用户个人主页显示错误

项目社区、课程社区点击我的动态错误，新建用户个人主页显示错误

See merge request !75
 2016-12-17 17:10:09 +08:00
陈晓婷 ce5ab81b13 Merge branch 'cxt_course' into 'develop' 
bug修复



See merge request !73
 2016-12-17 17:09:23 +08:00
daiao c3450accd5 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-12-17 17:04:53 +08:00
daiao 96e02cd48f 项目社区、课程社区点击我的动态错误，新建用户个人主页显示错误 2016-12-17 17:04:44 +08:00
cxt 4755294743 班级作业：老师或助教同意申诉后，作品列表中“同意/拒绝”、“申诉中”、分数没有自动刷新 2016-12-17 16:26:06 +08:00
陈晓婷 369514bcc6 Merge branch 'develop' into 'develop' 
个人主页相关功能

个人主页相关功能

See merge request !72
 2016-12-17 15:42:58 +08:00
daiao d16e9e4ecd Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-12-17 15:38:49 +08:00
陈晓婷 ca965ee61c Merge branch 'cxt_course' into 'develop' 
bug提示



See merge request !71
 2016-12-17 15:38:26 +08:00
cxt 158ea7dc41 问卷报网络异常 2016-12-17 15:36:45 +08:00
daiao 73747a81d6 个人主页消息铃铛翻页 2016-12-17 15:34:26 +08:00
cxt ef78de1a9c 班级分组作业：评分设置中勾选启用匿评申诉，点击确定按钮报500 2016-12-17 14:50:40 +08:00
cxt 21377fa45a 班级作业：评分设置中“最终评分”设置为“助教评分+学生匿评”不可用 2016-12-17 14:36:32 +08:00
cxt f7f1c68576 匿评申诉的错别字、匿评申诉：评阅人、老师或助教点击收到的申诉消息返回对应的作品列表，建议定位到对应的作品 2016-12-17 14:10:51 +08:00
cxt d9dcb3b291 “我的作业”页面中“评分”建议跳转到作品列表，而不是作业信息页面 2016-12-17 10:41:30 +08:00
陈晓婷 feca94ffc0 Merge branch 'cxt_course' into 'develop' 
上线bug修复



See merge request !70
 2016-12-17 10:35:56 +08:00
cxt fc67e6e3be Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into cxt_course 
Conflicts:
	app/views/users/_anonymous_evaluation_list.html.erb
 2016-12-17 10:25:48 +08:00
陈晓婷 fd889805ec Merge branch 'develop' into 'develop' 
个人主页样式调整

个人主页样式调整

See merge request !69
 2016-12-17 10:22:27 +08:00
cxt d6c51cce2a 首页：如图关注列表中添加关注、取消关注后关注数统计未自动刷新 2016-12-17 10:20:08 +08:00
daiao b76dd30b6d Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-12-17 10:17:34 +08:00
daiao 882ceb6a63 个人主页样式调整 2016-12-17 10:12:56 +08:00
cxt e29eb67f68 课程列表中删除课程确认弹框中“关闭”改为“取消” 2016-12-17 10:07:51 +08:00
cxt d876962f05 课程社区和项目社区的左侧列表无法收回 2016-12-17 09:53:23 +08:00
cxt 16fe5f58a1 详细列表的样式调整 2016-12-17 09:38:48 +08:00
cxt 2275a0ecae 首页、课程社区、项目社区的点击展开更多 2016-12-17 09:38:32 +08:00
cxt b661593e29 问卷创建者不应填问卷 2016-12-17 09:37:26 +08:00
huang ea3b71df8d Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-12-16 21:01:27 +08:00
huang de86584850 个人主页 我的issue 分页不能点的问题 2016-12-16 20:58:53 +08:00
黄井泉 353073c82a Merge branch 'develop' into 'develop' 
个人主页功能

个人主页功能

See merge request !67
 2016-12-16 20:57:21 +08:00
daiao 0c8774416e 个人主页样式调整 2016-12-16 20:50:48 +08:00
daiao 72ff880424 个人主页样式调整 2016-12-16 20:19:57 +08:00