Commit Graph

10643 Commits

Author SHA1 Message Date
cxt 2c5cd1a4b3 编辑作业页面添加截止日期和发布日期label 2015-11-12 18:14:56 +08:00
cxt 7a93fddb83 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-11-12 17:20:11 +08:00
cxt ab868d7b65 课程通知增加置顶 2015-11-12 16:52:42 +08:00
lizanle 6b7dd81509 Merge remote-tracking branch 'origin/szzh' into szzh 2015-11-12 16:35:30 +08:00
lizanle 506709b474 个人资源库,课程 资源文件上传
1.单个上传
 2.给出明确的提示
 3.按钮联动
2015-11-12 16:35:13 +08:00
cxt 3f60893591 禁用匿评的作业在截止时作业状态变为3 2015-11-12 14:53:12 +08:00
cxt 8fa790dd6b 作品列表的文字调整 2015-11-12 11:48:27 +08:00
cxt 41751f08ba 学生作品列表右上角的编辑和删除icon增加tip,两个icon的距离增加 2015-11-12 11:31:35 +08:00
Tim aed305f5bf Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-11-11 17:16:37 +08:00
Tim 7dd299255b 博客页面微调 2015-11-11 17:16:19 +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
cxt 70ce172b88 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-11-11 16:33:31 +08:00
huang 3aa73fba35 Gitlab权限修改
更新项目Gitlab同步更新
2015-11-11 16:33:09 +08:00
lizanle 84348d15ea 文件上传的 确定按钮的联动 作业提交回退 2015-11-11 16:32:13 +08:00
cxt 62cd410e1e Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-11-11 16:16:22 +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
lizanle d13205bd3d 文件正在上传提示 2015-11-11 11:39:02 +08:00
lizanle 508ca7f823 文件提交进度条
文件提交提示
2015-11-11 11:19:10 +08:00
cxt 29abe1ab02 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-11-11 10:38:42 +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
cxt 91ef155b10 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-11-10 16:47:55 +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
cxt ec6728df07 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-11-10 15:28:13 +08:00
cxt 6dd264990e 作品列表的“点击查看详情” 2015-11-10 15:27:59 +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