Commit Graph

10993 Commits

Author SHA1 Message Date
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
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 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
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
huang c3745be0eb 项目版本库历史记录代码优化及界面调整 2016-12-02 10:21:48 +08:00
陈晓婷 39258f4ac5 Merge branch 'develop' into 'develop'
课程相关bug修复;叠层回复的“回复”、“赞”的显隐



See merge request !32
2016-12-02 10:14:07 +08:00
cxt 0afed6624d 未参与匿评的缺评扣分 2016-12-02 10:04:11 +08:00
daiao 7a8c937173 项目issue列表,讨论区,版本库,pullrequests,里程碑及其里程碑详情页面,数据为空时,页面调整 2016-12-01 17:29:14 +08:00
daiao c745f69e95 项目成员列表,fork列表,关注列表样式调整。并修改小铃铛消息的班级加入的申请文字 2016-12-01 15:44:15 +08:00
daiao eeb57401d9 优化消息列表代码 2016-12-01 14:40:58 +08:00
daiao c960b401f6 修复消息列表为匿名用户 2016-12-01 14:16:36 +08:00
daiao 233ce0428b 消息列表改为用户名 2016-12-01 13:55:15 +08:00
daiao 2e5cd96bb9 pullrequest发送消息 2016-12-01 11:31:48 +08:00
cxt a2af654a91 具体作业的标题行右侧显示内容变更 2016-11-30 15:53:51 +08:00
cxt c47f41307e 分班的学生列表,请将“导出成绩”直接显示出来,且不需要“成员管理”入口 2016-11-30 10:44:15 +08:00
cxt f4ea4e2add 班级的学生列表,标题行显示的“导出列表”换成“导出成绩” 2016-11-30 10:40:53 +08:00
huang dbc8c5811a Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject
Conflicts:
	app/controllers/pull_requests_controller.rb
2016-11-30 09:55:45 +08:00
huang 1299be5384 pullrequest(井泉修改) 2016-11-29 18:22:43 +08:00
daiao 2cee4448ea pullrequest消息通知(未完) 2016-11-29 18:19:29 +08:00