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

2115 Commits

Author SHA1 Message Date
yuanke 93ed72fb59 Merge branch 'cxt_course' into develop 
Conflicts:
	db/schema.rb
 2016-10-28 15:57:53 +08:00
huang 03b8d081ce 一些细节的修改 2016-10-28 09:43:30 +08:00
cxt cc2ef93808 多选题的上限 2016-10-27 18:25:47 +08:00
huang 3ef90a3c62 Merge branch 'dev_newproject' into develop 
Conflicts:
	db/schema.rb
 2016-10-27 17:33:28 +08:00
Tim c58fb36f44 在线测验单选、多选、填空题显示调整 2016-10-27 14:31:14 +08:00
huang 05b206a7cf 收藏者列表 2016-10-27 12:39:44 +08:00
huang 5c31a5379e 里程碑添加删除功能 2016-10-26 18:39:14 +08:00
huang b93b4ca3f3 quality analisis css of list 2016-10-25 17:27:38 +08:00
daiao e3f0f222e6 新版Issue新建页面 2016-10-25 09:28:09 +08:00
yuanke bb5d957ec5 Merge branch 'cxt_course' into develop 2016-10-21 17:46:29 +08:00
cxt 3d29eb2be0 分班批量添加学生、小班页面 2016-10-21 17:34:02 +08:00
huang 6481978def Merge branch 'rep_quality' into develop 2016-10-21 14:20:32 +08:00
yuanke 8e35158fe9 增加统计功能 2016-10-21 14:06:45 +08:00
cxt f085b79999 个人主页的调整 2016-10-20 10:50:59 +08:00
cxt dff47b586e 主页宽度调整、主页配置菜单调整 2016-10-20 09:26:01 +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 97172ed76f 版本库异步加载 2016-10-19 15:18:26 +08:00
huang cff887a2be 删除项目的时候删除版本库功能 2016-10-19 11:23:15 +08:00
daiao 32c5d7a13b Merge branch 'dev_newproject' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject 2016-10-18 15:19:34 +08:00
daiao bdbd2e9cf7 项目配置组织与里程碑界面 2016-10-18 15:17:36 +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
huang 207273839b Merge branch 'dev_newrep' into dev_newproject 
Conflicts:
	app/controllers/projects_controller.rb
	app/views/projects/settings/_new_repositories.html.erb
 2016-10-19 08:53:38 +08:00
cxt 8648ea605f 问卷导出的统计结果：“其他”选项要标出来，多行主观题要对各小题标识出来 2016-10-18 11:14:29 +08:00
cxt a289a2cee0 班级问卷：新建时只保存并设置学生可查看统计列表，再到问卷列表中去发布，但实际学生不能查看统计结果 2016-10-15 15:16:21 +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 80bf13c516 资源库删除历史版本功能 2016-10-14 19:21:41 +08:00
cxt a1b70a7e91 Merge branch 'cxt_course' into develop 2016-10-14 16:18:12 +08:00
huang 333c9c6db0 项目历史版本一键删除功能 2016-10-14 15:01:22 +08:00
cxt 12ad7c1612 班级讨论区增加二级子栏目 2016-10-14 14:28:19 +08:00
huang edf2a059e8 Merge branch 'develop' into rep_quality 2016-10-13 09:00:35 +08:00
huang 10778fabc9 新版版本库界面代码整理 2016-10-12 17:02:51 +08:00
huang 57d1397597 版本库界面优化（未完） 2016-10-12 10:45:14 +08:00
huang 3c15c4f315 版本库权限，及项目收藏用户列表 2016-10-11 10:03:00 +08:00
huang e9a1582b71 项目添加收藏功能 2016-10-11 09:30:45 +08:00
huang bd29a637b6 新版项目 2016-10-09 17:24:37 +08:00
huang 2e94fbee81 项目、课程、组织资源描述过长不能提交的问题 2016-10-09 15:09:18 +08:00
daiao b259f92381 一级帖子栏目默认展示5个，点击可进入详情页面， 2016-10-09 09:02:12 +08:00
huang b573563a52 Merge branch 'rep_quality' into develop 2016-09-28 10:59:55 +08:00
daiao b22b444a7b 修改issue开始时间与结束时间判断，并将导出excel的作者改为发布人 2016-09-28 10:58:31 +08:00
huang d647f7153a 新建里程碑术语 2016-09-27 20:01:23 +08:00
huang 70d58ea28e 版本库导出代码统计功能 2016-09-27 15:10:52 +08:00
daiao 1c33e6481f 问题issue列表及其动态的目标版本改为里程碑， 2016-09-27 10:48:39 +08:00
huang b1496e1874 项目邀请码去掉冒号 2016-09-27 09:15:19 +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 3ace67f706 版本库库代码统计导出excel功能 2016-09-26 16:17:21 +08:00
huang a8acb4a6cb 项目base功能添加 2016-09-23 10:36:47 +08:00
cxt caf5602389 课程大纲教师团队的管理 2016-09-23 09:22:47 +08:00
Tim c718cb2144 新建issue时，增加评审，来源，实际工时选项 2016-09-21 15:27:32 +08:00
huang 2ae7dd0087 项目issue导出excel功能 2016-09-21 10:18:40 +08:00