Commit Graph

537 Commits

Author SHA1 Message Date
cxt 70a6a26819 班级作业:分组作业,开启了匿评后,某组再加了某组员,如图该组员看到的作业列表中不应该是“作品匿评” 2016-11-07 14:38:10 +08:00
cxt 78ca68b5e3 Merge branch 'cxt_course' into develop
Conflicts:
	public/stylesheets/css/moduel.css
	public/stylesheets/css/public.css
2016-11-04 16:15:56 +08:00
huang 69bd89761d 解决编码问题 2016-11-03 16:19:04 +08:00
cxt 4575b8274e 不限定匿评人数 2016-11-03 10:25:53 +08:00
cxt fea07e07c1 分组作业:基本作业编辑为分组作业后,组长提交作品的时候不能添加组员 2016-11-02 17:17:12 +08:00
huang 03dba25ab7 项目增加fork于某项目功能 2016-11-01 16:34:05 +08:00
huang 3ef90a3c62 Merge branch 'dev_newproject' into develop
Conflicts:
	db/schema.rb
2016-10-27 17:33:28 +08:00
huang 5eb82de6e0 pull request权限判断 2016-10-26 13:45:15 +08:00
huang 2702b5a197 项目收藏结构修改 2016-10-25 14:05:07 +08:00
daiao e3f0f222e6 新版Issue新建页面 2016-10-25 09:28:09 +08:00
daiao fa453090aa 项目里程碑详情页面 2016-10-21 16:16:26 +08:00
daiao 64dd693e6f 项目里程碑详情页面 2016-10-21 14:22:14 +08:00
cxt b0d089f85c 编程作业报500 2016-10-20 17:46:33 +08:00
huang 16b6c55637 注释掉id转换成登录名 2016-10-20 13:34:02 +08:00
huang 1b8bf05be5 用户ID装换成用户名 2016-10-20 13:26:11 +08:00
huang fbb2bfce91 Merge branch 'dev_newproject' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject 2016-10-19 17:35:46 +08:00
huang 601de5d67f 项目base中统计数字四舍五入,数字中添加链接 2016-10-19 17:35:33 +08:00
daiao 269c061053 Merge branch 'dev_newproject' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject 2016-10-19 16:56:36 +08:00
daiao a9fa958f7f 项目配置,信息与模块样式调整 2016-10-19 16:56:25 +08:00
huang a722cb0031 超过1w的用k+ 2016-10-19 16:35:26 +08:00
huang b8d86fcd42 版本库界面及样式 2016-10-19 15:24:36 +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
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 80bf13c516 资源库删除历史版本功能 2016-10-14 19:21:41 +08:00
huang 0760836f29 项目base优化 2016-10-14 17:23:51 +08:00
huang b9d87b1b29 Merge branch 'develop' into rep_quality
Conflicts:
	public/stylesheets/css/project.css
2016-10-14 15:43:45 +08:00
huang b408b6ef97 组织历史版本删除功能 2016-10-14 14:46:48 +08:00
huang 4646f20bba 项目版本库历史版本删除功能及弹框样式 2016-10-14 14:28:51 +08:00
huang dcbeea6dff 版本库可见权限优化 2016-10-14 09:01:25 +08:00
daiao 2324ad31e2 Merge branch 'develop' into dev_newproject
Conflicts:
	app/views/issues/index.html.erb
	public/stylesheets/css/common.css
	public/stylesheets/css/project.css
2016-10-13 17:00:53 +08:00
daiao 5ae89613ec 项目配置成员界面 2016-10-13 16:57:43 +08:00
yuanke 7dc0ba005e Merge branch 'dev_shcool' into develop
Conflicts:
	app/views/issues/index.html.erb
	app/views/users/_course_newslist.html.erb
2016-10-13 14:37:37 +08:00
cxt c1e2642a61 课程大纲上传的附件允许所有人下载 2016-10-09 09:56:36 +08:00
cxt b123192286 分组作业的匿评分配 2016-10-09 09:48:55 +08:00
cxt 1fa07b97e3 新建班级时的课程下拉列表应包含所在课程教师团队的课程 2016-10-08 14:03:37 +08:00
cxt b28579a3a3 Merge branch 'cxt_course' into develop 2016-09-30 14:49:57 +08:00
cxt 5d0e3889df 班级、项目、组织帖子详情回复的分页 2016-09-30 14:26:16 +08:00
huang 98f47d8b81 Merge branch 'rep_quality' of https://git.trustie.net/jacknudt/trustieforge into rep_quality 2016-09-27 15:11:06 +08:00
huang 70d58ea28e 版本库导出代码统计功能 2016-09-27 15:10:52 +08:00
daiao a020ab8cd3 Issue导出excel带html标签问题 2016-09-27 14:27:32 +08:00
daiao d2d0c263d7 修改项目issue导出excel的时间输出格式及目标版本 2016-09-27 12:08:03 +08:00
huang 11c3c95c63 module中的样式 2016-09-27 09:49:03 +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
cxt 8ed3d6168e 主页报500 2016-09-26 09:00:42 +08:00
cxt 70042fe91f 帖子详情页面的优化 2016-09-23 16:44:49 +08:00
Tim e6657ae422 甘特图样式调整 2016-09-22 17:39:45 +08:00
cxt d1c284c953 作业详情页 2016-09-21 10:34:38 +08:00
cxt ba4a1c64d9 作业动态的重构 2016-09-19 17:14:14 +08:00
daiao 984b540a63 游客身份,进入具体的班级和项目各功能入口的调整 2016-09-19 10:01:22 +08:00