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

1262 Commits

Author SHA1 Message Date
cxt 5a6e64beb2 Revert "测验头部和新建题目的改版" 
This reverts commit c33bf1b163.

Conflicts:
	public/stylesheets/css/courses.css
 2016-12-06 15:02:32 +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
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
huang 2311731de4 Merge branch 'dai_ao' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-12-02 13:39:46 +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 aea81f2b10 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-12-02 13:23:55 +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
陈晓婷 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
huang 9ee36f05bc 资源库专业分类model创建 2016-12-01 15:57:42 +08:00
cxt 423018fa15 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-12-01 15:47:46 +08:00
cxt c33bf1b163 测验头部和新建题目的改版 2016-12-01 15:42:07 +08:00
daiao 2e5cd96bb9 pullrequest发送消息 2016-12-01 11:31:48 +08:00
daiao e4d43cc163 项目pull request 项目消息框架搭建 2016-11-29 12:25:15 +08:00
cxt 3f35b7f806 贴吧回复改版 2016-11-29 09:36:38 +08:00
daiao 2a768cbd49 Innov用户消息通知报500，并将Pull request的登录名改为姓名 2016-11-28 11:32:28 +08:00
guange a2439f0a14 git文件比较功能 2016-11-26 17:47:39 +08:00
cxt 88c4a26303 Merge branch 'cxt_course' into develop 2016-11-25 14:03:01 +08:00
cxt 8efcf876c6 班级删除成员后，隐藏对应作品记录历史数据迁移 2016-11-25 11:03:30 +08:00
daiao 428cb8e928 项目issue。里程碑为空，完成为100%的issue筛选不了 2016-11-21 17:21:15 +08:00
daiao c31287f2f5 temp用户，铃铛消息报500，并修改点击名称进个人主页（目前申请类消息点击进自己主页） 2016-11-21 15:21:51 +08:00
huang 90cf429a10 fork 弹出新页面 2016-11-18 21:20:44 +08:00
huang de61d699a8 Merge branch 'dev_newproject' into develop 2016-11-18 16:22:03 +08:00
cxt 5510df165d Merge branch 'cxt_course' into develop 
Conflicts:
	db/schema.rb
 2016-11-18 15:45:06 +08:00
cxt 3ebc3c6492 老师、学生测验列表的调整 2016-11-17 17:04:00 +08:00
cxt efd0bf6707 删除学生/退出班级时隐藏学生作品、退出班级按钮位置调整 2016-11-17 10:23:13 +08:00
huang 5dcb99c3ad 优化projects数据库表，删除不必要的字段 2016-11-15 16:38:30 +08:00
cxt ef9b389cfc 作业动态报500 2016-11-14 17:32:18 +08:00
huang d040d2efd1 版本库添加返回上一级目录 2016-11-11 17:21:18 +08:00
cxt cb5ca96bb5 Merge branch 'cxt_course' into develop 
Conflicts:
	app/views/users/_course_homework.html.erb
	db/schema.rb
 2016-11-11 16:53:20 +08:00
cxt 16c51e1eaa 基于项目的分组作业没有显示项目详情 2016-11-11 16:50:25 +08:00
huang e544b04f6f Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-11-11 16:10:20 +08:00
huang 442fb8a531 添加fork成员列表 2016-11-11 16:09:43 +08:00
daiao 65e59e31e0 Issue表fixed_version_id数据迁移 2016-11-11 15:39:13 +08:00
huang 8fce011392 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-11-11 15:35:39 +08:00
huang 766e4fcb1d 上线迁移问题 2016-11-11 15:35:18 +08:00
daiao e8f1a388ef 项目issue表数据迁移 2016-11-11 15:20:07 +08:00
cxt d1bfdde261 班级名称命名和显示规范调整 2016-11-11 15:19:22 +08:00
huang 629770a703 Issue指派给为0的时候迁移 2016-11-11 14:50:49 +08:00
cxt e65f9bd98b issue多级回复的调整 2016-10-31 15:56:37 +08:00
yuanke 93ed72fb59 Merge branch 'cxt_course' into develop 
Conflicts:
	db/schema.rb
 2016-10-28 15:57:53 +08:00
huang d2138dd872 里程碑中增加创建者、项目私有公开显示特性 2016-10-28 14:20:00 +08:00
huang 3ef90a3c62 Merge branch 'dev_newproject' into develop 
Conflicts:
	db/schema.rb
 2016-10-27 17:33:28 +08:00
cxt c79676d426 问卷的上移、下移 2016-10-27 15:11:52 +08:00
huang 412b37d643 modified quality analysis error list 2016-10-25 17:08:05 +08:00
cxt 453e91dcfb Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-10-20 14:24:13 +08:00