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

15827 Commits

Author SHA1 Message Date
Tim ba7f9ed735 班级、项目侧导航文字缩小 2016-08-10 17:19:32 +08:00
huang b046f24b44 合并信息提交 2016-08-10 16:54:58 +08:00
cxt 7edb30754b student_works添加字段commit_time，记录学生作品实际的提交时间 2016-08-10 16:50:27 +08:00
huang 98a8702ba6 记录谁合并的pull request请求 2016-08-10 16:49:48 +08:00
huang 5ad063b830 记录接受PR用户信息，并且唯一性判断 2016-08-10 16:27:41 +08:00
cxt 71326c901d 学生在启动匿评后再提交作品，此时该学生及该学生的作品是不被匿评的，应该是“查看作品” 2016-08-10 16:09:13 +08:00
huang 8af8147ebb 代码分析列表加上时间 2016-08-10 14:47:50 +08:00
cxt a50ac2d79d 禁用匿评的作业提交时不要显示“提示：作品名称和描述中不要出现真实的姓名信息”的提示 2016-08-10 14:22:05 +08:00
cxt fa07f2532f 题库弹框样式修改 2016-08-10 11:16:04 +08:00
huang 8270344794 job 2016-08-10 11:01:20 +08:00
huang f2a13540a2 Merge branch 'rep_quality' of https://git.trustie.net/jacknudt/trustieforge into rep_quality 2016-08-10 10:59:10 +08:00
huang e2557aede8 test jenkins 2016-08-10 10:58:47 +08:00
cxt 0cc9fafddb “关注、粉丝”页面中分页显示要紧跟上面的内容 2016-08-09 17:21:11 +08:00
cxt 0ed508a887 题库预览弹窗的调整 2016-08-09 17:09:36 +08:00
huang 5ae59f6b6c 邀请码去掉前后空格 2016-08-09 17:06:50 +08:00
cxt 9594aada50 Merge branch 'cxt_course' into develop 
Conflicts:
	public/javascripts/application.js
 2016-08-09 16:42:23 +08:00
cxt a3011c319b 我的题库显示我的所有作业 2016-08-09 16:40:56 +08:00
cxt fc3df1c26f 题库预览弹框的样式调整 2016-08-09 16:38:17 +08:00
huang 1588f5cfca 开发环境下不启动elastic 2016-08-09 16:31:14 +08:00
cxt 8de8035441 班级首页顶部加上主讲老师的链接 2016-08-09 16:17:58 +08:00
huang 4f3b41f323 详情页面提供分页（评论、变更、提交） 2016-08-09 16:11:49 +08:00
cxt 65f6b0fc70 新建课程报500 2016-08-09 15:50:23 +08:00
huang 867434531d pull request 列表页面添加分页 2016-08-09 15:28:06 +08:00
cxt 4a527dc84e Merge branch 'cs_optimize_txz' into develop 2016-08-09 15:25:01 +08:00
cxt 739edd68bf Merge branch 'cxt_course' into develop 2016-08-09 15:24:07 +08:00
cxt c891a41ef1 打印log 2016-08-09 15:23:21 +08:00
huang dcdc09d864 修改gitlab api接口 2016-08-09 15:02:15 +08:00
huang 87c5f50545 PULL request 评论创建及局部刷新 2016-08-09 14:51:48 +08:00
huang b7bccc7d22 PR添加评论 列表页面 2016-08-09 14:00:36 +08:00
huang e7f01e5363 Merge branch 'rep_quality' of https://git.trustie.net/jacknudt/trustieforge into rep_quality 2016-08-09 10:54:51 +08:00
huang 6319a1bac6 PR添加评论定义 2016-08-09 10:53:44 +08:00
Tim 5838e8f810 Merge branch 'rep_quality' of https://git.trustie.net/jacknudt/trustieforge into rep_quality 2016-08-09 10:45:33 +08:00
Tim 5dd6244a34 pull request添加留言 2016-08-09 10:45:14 +08:00
cxt 547aae0743 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-08-09 10:40:25 +08:00
cxt 2951259d23 左侧项目列表的展开 2016-08-09 10:40:00 +08:00
cxt 153e02c4fa 消息列表报500 2016-08-09 10:39:32 +08:00
cxt 40dc9b761f 未配置课程的班级报404 2016-08-09 10:39:12 +08:00
cxt 6c9a4a6620 首页的左侧项目栏无法展开 2016-08-09 10:38:44 +08:00
huang d1b4e83fee 完成pull request 关闭功能 2016-08-09 10:29:18 +08:00
Tim 39c50a6e4c Merge branch 'rep_quality' of https://git.trustie.net/jacknudt/trustieforge into rep_quality 
Conflicts:
	app/views/pull_requests/_show.html.erb
 2016-08-08 16:35:52 +08:00
Tim 53dd41ec37 显示页面添加留言 2016-08-08 16:33:39 +08:00
huang 26c11693fd Merge branch 'rep_quality' of https://git.trustie.net/jacknudt/trustieforge into rep_quality 2016-08-08 15:24:27 +08:00
huang 518d6bacbe 添加关闭pull request功能 2016-08-08 15:23:55 +08:00
huang fbdb1249c2 Merge branch 'develop' into rep_quality 2016-08-08 10:07:45 +08:00
huang ecc6f5601e 接受请求后显示admin问题 2016-08-05 20:14:19 +08:00
huang 2bdf3d573b Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-08-05 19:45:06 +08:00
huang 20fac3852d 合并信息 2016-08-05 19:44:52 +08:00
daiao 85c16ca9e8 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-08-05 19:02:41 +08:00
daiao e89d7398aa 申请管理消息通知 2016-08-05 19:02:05 +08:00
cxt 90e480f7e9 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-08-05 18:52:39 +08:00