Commit Graph

2169 Commits

Author SHA1 Message Date
cxt a67d809168 在导出的Excel中,如果用户填写了其它,则应该在下方的列表中记录“其它(我录入的其它回复)” 2016-12-16 17:27:24 +08:00
cxt d8f098c6f4 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
Conflicts:
	app/views/users/_user_message_course.html.erb
2016-12-16 16:56:21 +08:00
huang c477d15fae Merge branch 'dev_newproject' into develop 2016-12-16 16:13:26 +08:00
daiao 1ff1ed3c54 个人主页 2016-12-16 14:03:01 +08:00
cxt 710c06e41a 匿评成绩的申诉功能 2016-12-16 11:01:58 +08:00
huang 5527adb795 版本406异常处理,pull request 冲突接受后406异常提醒 2016-12-15 17:03:59 +08:00
daiao ffd1e3942c 个人主页tab列表 2016-12-15 09:13:39 +08:00
daiao fb62d4f1b2 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
	public/stylesheets/css/project.css
2016-12-09 20:00:07 +08:00
黄井泉 b8eee2b131 Merge branch 'cxt_course' into 'develop'
本周上线任务



See merge request !50
2016-12-09 16:43:00 +08:00
cxt 0b217b9998 基于项目的分做作业,关联项目列表需要增加“更换项目”的功能 2016-12-09 16:39:24 +08:00
黄井泉 74a20dddc1 Merge branch 'dev_newproject' into 'develop'
Issue和commit关联功能



See merge request !49
2016-12-09 14:17:06 +08:00
huang d67fc1c3be Merge branch 'guange_dev' into develop 2016-12-09 09:42:42 +08:00
guange 9b155c9573 mini profiler只在dev下生效 2016-12-09 09:40:39 +08:00
huang 2a5bb6dcb8 Merge branch 'guange_dev' into develop
Conflicts:
	Gemfile
2016-12-09 09:35:12 +08:00
cxt abdbfd87b0 班级的邀请码增加“停用”和“启用”功能,停用的邀请码不允许用户主动加入班级 2016-12-08 13:40:11 +08:00
huang a1a96e4667 issue编辑优化,性能简单优化 2016-12-08 09:55:41 +08:00
huang 12b73f54d3 commit issue关联提供删除功能,局部刷新 2016-12-07 15:39:48 +08:00
cxt 27d800a94a 新版首页架构 2016-12-07 15:15:00 +08:00
huang 33a4186e69 完成issue和commit关联创建。去重,及相关局部刷新 2016-12-06 17:37:07 +08:00
huang 6ebaa1c90a Merge branch 'develop' into dev_newproject 2016-12-05 11:12:52 +08:00
guange d351827ba2 at功能实现 2016-12-04 19:20:02 +08:00
cxt 2fd4cb9064 班级作业增加设置选项:成绩公开范围 2016-12-02 13:30:49 +08:00
guange 38215dad77 mini profiler开关 2016-12-02 09:30:07 +08:00
guange 3054b21871 [deprecated] I18n.enforce_available_locales will default to true in the future. If you really want to skip validation of your locale you can set I18n.enforce_available_locales = false to avoid this message. 2016-12-02 09:29:04 +08:00
huang bbc8d11f80 项目issue关联commit(未完成) 2016-12-01 14:21:40 +08:00
huang 1299be5384 pullrequest(井泉修改) 2016-11-29 18:22:43 +08:00
huang 6d14353ef7 commit_diff 2016-11-28 15:25:26 +08:00
huang 21b13e33ce pull request的时候各种异常类型打印 2016-11-25 19:05:37 +08:00
huang 8393679c9c 项目关注车成员列表结构梳理 2016-11-25 17:08:11 +08:00
cxt 785f027a63 Merge branch 'cxt_course' into develop 2016-11-25 14:56:24 +08:00
cxt 8743460134 动态与详情的回复叠层调整 2016-11-25 09:59:03 +08:00
huang 30a0347cd6 项目头部修改,及其成员列表,关注列表新版样式(未完) 2016-11-24 17:40:33 +08:00
huang 67a9d04a64 版本库添加删除功能 2016-11-23 17:14:49 +08:00
cxt 4388b7625e 首页班级列表的归档 2016-11-21 16:58:25 +08:00
huang a58a3c0655 项目成员新弹框ajax局部刷新 2016-11-18 19:00:44 +08:00
daiao 290a301cee Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
	public/stylesheets/css/common.css
2016-11-18 15:48:40 +08:00
cxt 1fcb1db27c 课程大纲下的班级归档 2016-11-18 15:34:53 +08:00
cxt 1ad0c1cbff 测验列表 2016-11-17 09:06:44 +08:00
daiao e956d20d6e 我的issue部分功能 2016-11-16 16:57:02 +08:00
cxt 2dc717df0c Merge branch 'develop' into cxt_course 2016-11-15 16:57:33 +08:00
cxt 9f79408e32 导入试卷 2016-11-15 16:57:07 +08:00
huang 0adde560ba 我的issue路由修改及查询修改 2016-11-15 14:30:01 +08:00
daiao c927a6fecc Merge branch 'dev_newproject' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject 2016-11-15 13:21:37 +08:00
daiao ffe86c7ec9 项目配置删除按钮新版弹框 2016-11-15 13:21:27 +08:00
huang 5f21b63c41 我的issue框架搭建 2016-11-15 10:47:07 +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 07b97c8eb9 学生列表增加删除功能、删除学生时删除其对应的作品 2016-11-11 13:58:07 +08:00
huang 431ff8b31c 甘特图配置及issue导出指派人为空的问题 2016-11-09 10:40:59 +08:00
daiao ac60940c34 1.项目头部样式调整 2016-11-08 16:18:59 +08:00
huang a3dfd03e81 项目顶端框架搭建及权限判断 2016-11-08 10:23:02 +08:00