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

1198 Commits

Author SHA1 Message Date
cxt 3b8dded2bc 新建课程的教师团队为空 2016-10-08 10:21:33 +08:00
huang db54d6e0d9 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 
Conflicts:
	public/stylesheets/css/project.css
 2016-09-26 22:21:45 +08:00
huang 528aeaff89 Merge branch 'rep_quality' into develop 2016-09-26 22:20:08 +08:00
cxt 398a6f1da7 Merge branch 'cxt_course' into develop 2016-09-23 16:50:45 +08:00
huang 61f99137fc 去掉项目模式及数据迁移 2016-09-23 10:53:45 +08:00
cxt caf5602389 课程大纲教师团队的管理 2016-09-23 09:22:47 +08:00
yuanke 0a9d288880 Merge branch 'weixin_guange' into develop 2016-09-22 13:41:52 +08:00
huang a3467a5697 项目课程讨论区资源公开迁移 2016-09-18 15:53:32 +08:00
liguangye 53bdeed1e4 解决铃铛404问题 2016-09-18 14:20:08 +08:00
yuanke 98aaca3572 Merge branch 'develop' into weixin_guange 2016-09-18 13:07:51 +08:00
yuanke 65bd77f0ff 微信二维码过期问题修改 2016-09-18 10:50:40 +08:00
huang de3fc8aa9f school为0的情况数据迁移 2016-09-14 16:26:37 +08:00
daiao 5a25eb324b Merge branch 'dev_shcool' into develop 2016-09-14 15:13:31 +08:00
huang 390f68aad6 作品列表页面性能提升（主要是数据库查询减少，建立相关索引） 2016-09-13 14:57:45 +08:00
daiao a3f444819e 项目列表名字太长排版问题 2016-09-12 10:52:43 +08:00
Tim b796ac3b53 Merge branch 'develop' into cxt_course 
Conflicts:
	app/views/exercise/_student_table.html.erb
	db/schema.rb
 2016-09-09 13:30:10 +08:00
daiao ed448f0087 Merge branch 'develop' into dev_shcool 
Conflicts:
	db/schema.rb
 2016-09-09 09:31:17 +08:00
daiao aa27d7def2 修复编辑issue，更新附件时，自动回复提示问题（不同Issue下，重名不显示，同意issue下，会更新创建时的附件） 2016-09-09 09:16:22 +08:00
cxt d8bc6a51fc 加索引 2016-09-07 15:14:10 +08:00
cxt bec09a7f1c 为student_work_tests增加索引 2016-09-07 14:03:20 +08:00
cxt 1e7f3db946 分组作业：组内每个成员都复制一份组长的作业，得分相同 2016-09-06 15:07:43 +08:00
daiao cdd4dfcf09 项目列表中：私有项目对非成员显示，非成员不点击进入 2016-09-05 16:55:56 +08:00
huang cde1d11871 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-08-31 10:34:42 +08:00
cxt f4632c432f 消息列表中的at消息报500 2016-08-30 17:11:22 +08:00
huang e2c0237fcd 解决空数据库问题 2016-08-30 15:30:01 +08:00
huang ee2ae456ac unresolved issues for sonar 2016-08-30 10:43:47 +08:00
huang 803bd9819a Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 
Conflicts:
	db/schema.rb
	public/stylesheets/css/public.css
 2016-08-26 17:55:51 +08:00
huang a71f948f41 项目、课程资源库添加私有资源提示 2016-08-26 16:26:12 +08:00
Tim df1039cd09 项目收藏按钮位置调整 2016-08-25 15:55:36 +08:00
cxt 56b74b755b 取消收藏 2016-08-24 17:30:30 +08:00
cxt 7d89f69981 班级和项目收藏夹 2016-08-24 15:58:23 +08:00
yuanke 9446760258 Merge branch 'weixin_guange' into develop 
Conflicts:
	db/schema.rb
 2016-08-14 09:56:17 +08:00
huang d7faed7f6d Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-08-13 15:39:06 +08:00
cxt 35260f2f6d Merge branch 'cxt_course' into develop 
Conflicts:
	db/schema.rb
 2016-08-13 15:36:48 +08:00
guange 3130296e69 修改微信个人信息获取实现 2016-08-13 11:09:48 +08:00
yuanke 4e6c58ae37 动态点提交如果没绑定则自动创建一个帐号绑定，然后注册的时候将已绑定的用户信息修改为注册的信息 2016-08-11 17:22:48 +08:00
cxt 7edb30754b student_works添加字段commit_time，记录学生作品实际的提交时间 2016-08-10 16:50:27 +08:00
huang 5ad063b830 记录接受PR用户信息，并且唯一性判断 2016-08-10 16:27:41 +08:00
huang e2557aede8 test jenkins 2016-08-10 10:58:47 +08:00
huang 3ef2509d27 报告人员加入项目不用提醒 2016-08-05 16:35:22 +08:00
Tim 950b18c250 加入班级提示 2016-08-03 16:39:22 +08:00
guange fc38ef6a3f 增加了一个查看服务器内网ip的middleware，利于以后分析问题，headers为X-Response-Ip 2016-08-01 19:16:51 +08:00
cxt 3bc696a597 申请学校的更改 2016-08-01 13:57:55 +08:00
daiao 911a769670 Merge branch 'develop' into dev_shcool 
Conflicts:
	app/models/applied_message.rb
 2016-07-29 22:05:56 +08:00
huang 847cae6d41 Merge branch 'develop' into rep_quality 
Conflicts:
	app/models/applied_message.rb
	db/schema.rb
 2016-07-29 21:39:00 +08:00
daiao 3251890c91 Merge branch 'rep_quality' into dev_shcool 
Conflicts:
	app/models/applied_message.rb
	db/schema.rb
 2016-07-29 20:52:18 +08:00
huang 643b06484b 消息表添加字段 2016-07-29 20:50:55 +08:00
cxt e3d538c3fa Merge branch 'cxt_course' into develop 
Conflicts:
	app/views/layouts/_course_base_info.html.erb
	db/schema.rb
 2016-07-29 19:39:42 +08:00
cxt 335b82c046 加入班级的弹框 2016-07-29 19:19:58 +08:00
huang c07677ef99 项目邀请框架 拒绝消息 2016-07-29 14:49:37 +08:00