Commit Graph

10633 Commits

Author SHA1 Message Date
huang a40e5c5b54 frok功能开发--权限还未完成 2015-11-13 17:30:14 +08:00
huang af70dc0ca3 Merge branch 'develop' into gitlab_guange 2015-11-12 09:52:25 +08:00
huang e9e07aadd6 Merge branch 'szzh' into develop 2015-11-11 16:41:34 +08:00
huang 9b2ccca649 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-11-11 16:40:38 +08:00
huang e4daad95b7 Merge branch 'develop' into szzh 2015-11-11 16:40:23 +08:00
huang 2596f0a788 优化权限代码 2015-11-11 16:39:05 +08:00
huang 3aa73fba35 Gitlab权限修改
更新项目Gitlab同步更新
2015-11-11 16:33:09 +08:00
lizanle 84348d15ea 文件上传的 确定按钮的联动 作业提交回退 2015-11-11 16:32:13 +08:00
lizanle 4b26af8920 Merge remote-tracking branch 'origin/szzh' into szzh 2015-11-11 16:03:00 +08:00
lizanle a01de011ca 文件上传的 确定按钮的联动 2015-11-11 16:02:37 +08:00
Tim 465c5958f1 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-11-11 15:36:06 +08:00
Tim b8999e1c6e 博客标题输入框宽度调整 2015-11-11 15:35:47 +08:00
huang 16c31e254e 区分Gitlab公开项目和私有项目 2015-11-11 15:33:43 +08:00
huang 7318b172ee Merge branch 'szzh' into develop 2015-11-11 12:44:50 +08:00
huang c32dc2f5c1 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-11-11 12:44:27 +08:00
huang cc0afa7d9b 添加删除迁移版本库 2015-11-11 12:43:59 +08:00
lizanle d13205bd3d 文件正在上传提示 2015-11-11 11:39:02 +08:00
lizanle 508ca7f823 文件提交进度条
文件提交提示
2015-11-11 11:19:10 +08:00
huang 8164ffc1b2 Merge branch 'szzh' into gitlab_guange 2015-11-11 10:25:41 +08:00
huang d8dc7786ca fork接口 2015-11-11 10:25:24 +08:00
huang 700081f54f Merge branch 'szzh' into develop 2015-11-10 17:36:39 +08:00
huang 419b3f4036 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-11-10 17:36:22 +08:00
lizanle 2cf61ad74f 编辑的时候报500 2015-11-10 17:34:18 +08:00
huang 422d4569b8 Merge branch 'szzh' into develop 2015-11-10 17:13:20 +08:00
huang bebda15582 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-11-10 17:12:41 +08:00
huang 74f2827a8b Merge branch 'develop' into szzh 2015-11-10 17:12:29 +08:00
lizanle db0978c657 编辑的时候报500 2015-11-10 17:07:37 +08:00
lizanle 8d7a203411 Merge remote-tracking branch 'origin/szzh' into szzh 2015-11-10 16:03:25 +08:00
lizanle 463b6e91f5 添加邮箱验证 2015-11-10 16:03:06 +08:00
huang 5efd3fae48 Merge branch 'szzh' into develop 2015-11-10 15:32:26 +08:00
huang 0f32e7fe24 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-11-10 15:31:59 +08:00
huang 0051733956 Merge branch 'develop' into szzh 2015-11-10 15:31:44 +08:00
huang ef74d8d956 添加任务--解决用户同步不成功的问题 2015-11-10 15:31:24 +08:00
lizanle 94367eee82 Merge branch 'dev_zanle' into szzh 2015-11-10 15:26:48 +08:00
lizanle d64b6cfad0 Merge remote-tracking branch 'origin/szzh' into szzh 2015-11-10 15:22:18 +08:00
lizanle c20ff6980b 进度条不见了bug。 2015-11-10 15:22:10 +08:00
lizanle 82c377a60a 在导航处上传文件不可用 2015-11-10 15:18:13 +08:00
cxt 5218287419 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-11-10 14:51:56 +08:00
cxt 4be3b16b60 隐藏点击查看详情 2015-11-10 14:51:44 +08:00
lizanle dcdffe5d04 上传文件的进度条不见了。 2015-11-10 14:37:16 +08:00
lizanle 8d94f57ec3 上传文件的进度条不见了。 2015-11-10 14:33:46 +08:00
cxt 0c43a703ed Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-11-10 14:18:53 +08:00
cxt 4adc6deabf 配置课程页面的开课学期不可更改,弹框提醒用户。 2015-11-10 14:18:39 +08:00
Tim 679ec44f8a Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
	app/views/student_work/_evaluation_work.html.erb
2015-11-10 09:23:01 +08:00
Tim d9610d2694 作品列表提示标签 2015-11-10 09:12:12 +08:00
cxt 2a82f33227 个人首页的留言动态显示不合理 2015-11-09 16:08:15 +08:00
lizanle 3c93103bc7 迟交提示,老师名称要给称呼 2015-11-09 15:59:24 +08:00
lizanle 7bd9c5b65c 更改时区设置
作业发布消息添加发布时间
2015-11-09 15:55:55 +08:00
lizanle 20b49385de 更改时区设置
作业发布消息添加发布时间
2015-11-09 15:36:32 +08:00
cxt dc7a90cab5 助教无法打开学生作品 2015-11-09 15:07:33 +08:00