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

17916 Commits

Author SHA1 Message Date
cxt 03b00f0af5 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into cxt_course 2016-12-06 16:17:46 +08:00
cxt 494946c70e 匿评结束后提交的作品也应计算缺评扣分 2016-12-06 16:13:04 +08:00
cxt 5a6e64beb2 Revert "测验头部和新建题目的改版" 
This reverts commit c33bf1b163.

Conflicts:
	public/stylesheets/css/courses.css
 2016-12-06 15:02:32 +08:00
陈晓婷 c031e23a1f Merge branch 'sx_cxt' into 'develop' 
更改作业的截止日期时也应重新判断作品是否迟交



See merge request !48
 2016-12-06 14:51:45 +08:00
cxt 098d42cbd1 更改作业的截止日期时也应重新判断作品是否迟交、作业id为4198的作品数据迁移 2016-12-06 14:47:17 +08:00
cxt 5bbe9e71ba Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into sx_cxt 
Conflicts:
	db/schema.rb
 2016-12-06 14:12:40 +08:00
cxt 9e9f1d44a1 具体班级页里的班级动态，不需要显示班级名称，直接显示栏目名称就可、具体作业的详情页，也不需要显示班级名称 2016-12-06 10:00:18 +08:00
cxt 88c8c4144b 编程作业新建和编辑的时候，测试输出集很长的显示不友好，调整 2016-12-05 17:18:56 +08:00
cxt f9767abd3b 在线测验的导入试卷弹框中，因列表内容长度不确定，请将标题靠左显示，不需要居中 2016-12-05 14:42:11 +08:00
cxt b1356d00a0 学生列表、作品列表，中的学生姓名，应该增加超链接，现在不能通过这里进入学生的主页 2016-12-05 14:34:22 +08:00
cxt bd458e1aef 班级的教师列表显示样式比较旧，更换样式 2016-12-05 14:17:33 +08:00
cxt 6775c902f3 班级作品列表，如题提示优化 2016-12-05 09:37:37 +08:00
huang efee984c4f 作品列表500问题 2016-12-03 11:49:36 +08:00
huang d87620a758 作品列表总不显示，动态得分显示 2016-12-03 11:41:09 +08:00
huang 9b8e072753 作品列表--改成** 2016-12-03 11:25:41 +08:00
huang 69ab80bf9e 对于设置了仅对自己显示的作业课程英雄榜显示方式 2016-12-03 11:20:50 +08:00
huang 20e07bb1ba 学生列表得分显示 2016-12-03 10:56:35 +08:00
陈晓婷 9d00979647 Merge branch 'cxt_course' into 'develop' 
帮助中心的弹框



See merge request !47
 2016-12-02 20:23:11 +08:00
cxt 93a4f0bc76 帮助中心的弹框 2016-12-02 20:17:50 +08:00
黄井泉 73dcd5256f Merge branch 'develop' into 'develop' 
pull request总数获取方式修改，列表页面添加相应的分页



See merge request !46
 2016-12-02 20:09:18 +08:00
huang 7baa5be7ee pull request总数获取方式修改，列表页面添加相应的分页 2016-12-02 20:00:15 +08:00
黄井泉 4a8af6d40f Merge branch 'dai_ao' into 'develop' 
申请加入班级，将小铃铛消息的课程改为班级

申请加入班级，将小铃铛消息的课程改为班级

See merge request !43
 2016-12-02 19:23:49 +08:00
黄井泉 3b194c71b3 Merge branch 'develop' into 'develop' 
pull request commit 页面提供分页



See merge request !45
 2016-12-02 19:22:47 +08:00
陈晓婷 c89f15b97f Merge branch 'cxt_course' into 'develop' 
非匿评阶段应看到评语回复的用户名



See merge request !44
 2016-12-02 19:18:41 +08:00
daiao 585d1ebb0d 申请加入班级，将课程改为班级 2016-12-02 19:14:09 +08:00
cxt cad06701be 非匿评阶段应看到评语回复的用户名 2016-12-02 19:07:06 +08:00
daiao 6fc4c5d138 Merge branch 'develop' into dai_ao 2016-12-02 18:50:19 +08:00
huang e4e57380cf pull request提交添加分页 2016-12-02 17:52:02 +08:00
陈晓婷 54a7965a3e Merge branch 'cxt_course' into 'develop' 
作业的bug修复



See merge request !42
 2016-12-02 17:48:45 +08:00
cxt 28444e0af7 “未评分”改为“无评分”， 评分设置的缺评扣分 2016-12-02 17:46:31 +08:00
陈晓婷 dd0c202f8c Merge branch 'cxt_course' into 'develop' 
匿评时其他人的评语不可见



See merge request !41
 2016-12-02 17:09:34 +08:00
cxt 56b6d43862 匿评时其他人的评分不可见 2016-12-02 17:08:09 +08:00
daiao ffce6f074f Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-12-02 16:19:42 +08:00
daiao b48fc7ba3b pullrequest发送消息 2016-12-02 16:18:31 +08:00
黄井泉 42775a82f9 Merge branch 'cxt_course' into 'develop' 
班级作业增加设置选项：成绩公开范围



See merge request !37
 2016-12-02 14:53:55 +08:00
cxt adac1d3d7a 班级问卷列表样式调整 2016-12-02 14:53:20 +08:00
黄井泉 ef86b6da2a Merge branch 'develop' into 'develop' 
项目提交动态的方法优化，及多个样式调整风格一致



See merge request !38
 2016-12-02 14:47:25 +08:00
huang 4acb674d43 pull request 发送消息代码重构，封装 2016-12-02 14:42:52 +08:00
huang 2311731de4 Merge branch 'dai_ao' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-12-02 13:39:46 +08:00
黄井泉 9a83b81269 Merge branch 'develop' into 'develop' 
项目没有数据的页面调整为新版；项目3类成员页面调整；组织列表新增新建功能；issue显示加长;

项目没有数据的页面调整为新版；项目3类成员页面调整；组织列表新增新建功能；issue显示加长;

See merge request !35
 2016-12-02 13:36:25 +08:00
黄井泉 23aef1ee3c Merge branch 'develop' into 'develop' 
版本库提交动态优化及界面调整



See merge request !34
 2016-12-02 13:34:18 +08:00
cxt 2fd4cb9064 班级作业增加设置选项：成绩公开范围 2016-12-02 13:30:49 +08:00
daiao 77f252b538 Merge branch 'develop' into dai_ao 
Conflicts:
	app/controllers/pull_requests_controller.rb
	app/views/users/_user_message_course.html.erb
	app/views/users/_user_message_forge.html.erb
 2016-12-02 13:26:41 +08:00
huang 26e6986fa3 新建版本库纯数字提示 2016-12-02 13:24:13 +08:00
huang aea81f2b10 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-12-02 13:23:55 +08:00
daiao 51b630666f 还原pullrequest注释的代码 2016-12-02 13:20:46 +08:00
huang bd31af108e 提交历史现实样式整体变更 版本库中提交详情也现实样式调整 2016-12-02 11:26:15 +08:00
cxt ff6434d456 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into cxt_course 
Conflicts:
	db/schema.rb
 2016-12-02 10:35:05 +08:00
huang 83da92a16c pull request详情页面 显示源项目及目标项目的合并信息 2016-12-02 10:32:17 +08:00
daiao 7e5fda197e 组织列表增加新建组织按钮，并将我的issue与issue列表的issue标题显示加长 2016-12-02 10:21:56 +08:00