Commit Graph

18965 Commits

Author SHA1 Message Date
cxt c8d6445398 迁移 2017-06-10 09:16:43 +08:00
陈晓婷 fe548fe544 Merge branch 'guange_dev' into 'develop'
短信功能通过



See merge request !172
2017-03-15 15:15:47 +08:00
cxt 3b4b069348 头像上传代码还原 2017-03-15 14:47:54 +08:00
cxt a1509088e4 头像获取延迟一秒 2017-03-14 16:51:55 +08:00
cxt 2d38af7c3d 头像上传加打印输出 2017-03-14 16:42:08 +08:00
cxt 9468257c0c 头像上传 2017-03-14 16:30:04 +08:00
cxt 931022c7b1 团队竞赛补交作品 2017-03-13 17:18:36 +08:00
cxt bb5522332c Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2017-03-13 16:59:03 +08:00
陈晓婷 7a3e1a6a75 Merge branch 'develop' into 'develop'
竞赛相关



See merge request !174
2017-03-13 16:58:52 +08:00
cxt 54a4a189be 作品附件打包下载调整到500M 2017-03-13 16:57:46 +08:00
cxt 15b1a82cd4 竞赛作品允许补交 2017-03-13 15:11:28 +08:00
cxt 55573d2016 放宽下载附件限制 2017-03-13 14:28:47 +08:00
cxt 907dcf1f7d 班级的统计-英雄榜中,在列表右上角增加“导出作业成绩”功能按钮 2017-03-13 14:23:23 +08:00
陈晓婷 44d88084f8 Merge branch 'develop' into 'develop'
bug修复



See merge request !173
2017-03-13 14:02:26 +08:00
cxt 38e618f2f5 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2017-03-13 13:48:48 +08:00
cxt 2b16c45ff1 消息头像有问题 2017-03-13 13:48:11 +08:00
guange 981a191b05 短信发送测试通过 2017-03-13 11:40:07 +08:00
陈晓婷 c9a5f9ed7f Merge branch 'develop' into 'develop'
竞赛相关



See merge request !171
2017-03-13 11:30:39 +08:00
cxt b1f19ccb5f 无权限下载 2017-03-13 11:29:03 +08:00
cxt afe439abf3 管理员下载竞赛作品附件报没权限 2017-03-13 11:15:10 +08:00
cxt c67288de0d 竞赛组长提交作品时,选择项目成员,无需验证其是否是竞赛成员 2017-03-13 10:30:09 +08:00
cxt a859f954d2 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2017-03-13 10:28:29 +08:00
cxt 77c25db233 竞赛者加入,无需身份验证,发送消息通知给竞赛所有管理员即可 2017-03-13 10:22:55 +08:00
guange 606e431396 集成云片的短信发送功能 2017-03-12 16:53:47 +08:00
huang 828dce5d07 修复500问题 2017-03-12 12:09:29 +08:00
huang a43167c6cf 修复500 2017-03-12 11:53:15 +08:00
huang 18cd52a0bb 竞赛500问题 2017-03-12 09:01:09 +08:00
cxt b318c460d9 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2017-03-10 18:02:43 +08:00
daiao a26c93c680 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2017-03-10 17:57:02 +08:00
cxt c20b7fff43 新建/编辑作品的截止时间显示 2017-03-10 17:54:40 +08:00
daiao 219d1d7a4a 自己无法置顶自己的帖子 2017-03-10 17:26:41 +08:00
daiao 2e6a89bf48 修改个人资料报500 2017-03-10 17:09:14 +08:00
陈晓婷 2e137ea5b7 Merge branch 'develop' into 'develop'
头像上传



See merge request !167
2017-03-10 15:43:08 +08:00
cxt 35b9dc0275 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2017-03-10 15:41:40 +08:00
陈晓婷 c288754485 Merge branch 'develop' into 'develop'
问吧置顶功能



See merge request !166
2017-03-10 15:41:26 +08:00
daiao 22367b0d0a Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2017-03-10 15:40:48 +08:00
cxt d5472f667b 课程的logo在更新时会出现不显示的情况,显示的是一个文本的? 2017-03-10 15:39:05 +08:00
daiao 4881b2555c 贴吧吧主能置顶帖子 2017-03-10 15:18:24 +08:00
cxt d0e73c12ff 讨论区的消息状态更新 2017-03-10 14:59:24 +08:00
陈晓婷 6477c9b71e Merge branch 'develop' into 'develop'
本周上线任务



See merge request !165
2017-03-10 13:59:33 +08:00
cxt 34dee33edb Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
	app/views/boards/_course_new.html.erb
	db/schema.rb
2017-03-10 13:57:44 +08:00
陈晓婷 66553a2a5e Merge branch 'develop' into 'develop'
本周任务上线



See merge request !164
2017-03-10 13:55:31 +08:00
daiao 378ef6add5 项目issue二级回复,讨论区帖子一级回复 2017-03-10 11:15:53 +08:00
daiao a9fb270b54 问吧的帖子,吧主和超级管理员有置顶权限 2017-03-09 16:42:30 +08:00
cxt f4f0363b40 作业评分设置的弹框页面显示问题 2017-03-09 15:45:53 +08:00
cxt 42b22ddb83 作业小齿轮中的“启用/禁用匿评”功能的完善 2017-03-09 15:45:08 +08:00
cxt 149b837aff 作业启用匿评的默认设置出错,只余一天的期间了 2017-03-09 13:58:53 +08:00
daiao 401880bc26 班级贴子的消息点击之后,不会变成已读 2017-03-09 11:19:54 +08:00
cxt 42ab249651 小铃铛的数字标识和事情情况有冲突 2017-03-09 10:58:46 +08:00
huang 679a6274e6 版本库删除功能 2017-03-08 18:32:08 +08:00