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

1229 Commits

Author SHA1 Message Date
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
cxt 269083c4a6 分组作业的评分设置 2016-10-20 14:24:07 +08:00
huang 1b8bf05be5 用户ID装换成用户名 2016-10-20 13:26:11 +08:00
cxt 6109a1602b Merge branch 'cxt_course' into develop 
Conflicts:
	db/schema.rb
 2016-10-19 18:11:02 +08:00
cxt e102815f60 个人主页 2016-10-19 18:03:59 +08:00
huang fce6c407c8 Merge branch 'rep_quality' into dev_newproject 
Conflicts:
	app/controllers/projects_controller.rb
	app/views/layouts/base_projects.html.erb
	app/views/projects/settings/_new_edit.html.erb
	public/stylesheets/css/project.css
 2016-10-19 11:27:49 +08:00
cxt a5375fc668 迁移的修改 2016-10-15 18:39:17 +08:00
cxt 1433bcb8ab 历史数据迁移 2016-10-15 18:35:36 +08:00
huang c94f986ba2 将未发布的作业恢复成已发布 2016-10-15 14:20:54 +08:00
huang 5532ec3b86 Merge branch 'develop' into dev_newproject 
Conflicts:
	app/views/issues/index.html.erb
	app/views/layouts/base_projects.html.erb
	public/stylesheets/css/project.css
 2016-10-15 10:53:01 +08:00
huang f2f9792203 attachment history中description字段类型修改 2016-10-15 09:38:48 +08:00
daiao d3575b288e Merge branch 'dev_newproject' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject 
Conflicts:
	db/schema.rb
 2016-10-15 09:00:03 +08:00
huang 0760836f29 项目base优化 2016-10-14 17:23:51 +08:00
cxt a581f989c9 给messages、journals_for_messages、blog_comments、org_document_comments表增加root_id，优化平台的回复 2016-10-11 14:08:44 +08:00
huang 5f1458483c 修改attachment字段类型，解决字段长不能上传的问题 2016-10-09 13:44:32 +08:00
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