whimlex
|
33fc193e65
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-04-29 17:50:51 +08:00 |
|
whimlex
|
bbe4c15293
|
问题跟踪图片附件和定义的样式不一时，调整图片缩略图显示方式
|
2015-04-29 17:50:35 +08:00 |
 lizanle
|
cc276c649d
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2015-04-29 17:46:52 +08:00 |
|
lizanle
|
519eab76bd
|
添加显示课程的课件列表
|
2015-04-29 17:46:39 +08:00 |
 huang
|
dfcc076a7f
|
角色多选的时候权限控制
|
2015-04-29 16:46:34 +08:00 |
 sw
|
4dfad62ebd
|
Merge branch 'szzh' into develop
|
2015-04-29 14:59:43 +08:00 |
|
huang
|
84a7bb5907
|
修改超级管理员不能退出项目
|
2015-04-29 14:57:12 +08:00 |
|
huang
|
f94c2769e6
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-04-29 14:29:25 +08:00 |
|
huang
|
135c3d9b19
|
课程讨论区代码重构
解决路由匹配和JS显示冲突
|
2015-04-29 14:29:03 +08:00 |
|
sw
|
bec3c23edc
|
Merge branch 'szzh' into guange_dev
|
2015-04-29 14:20:24 +08:00 |
|
sw
|
bef306e94c
|
Merge branch 'guange_dev' into szzh
|
2015-04-29 14:18:56 +08:00 |
|
sw
|
750393508a
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-04-29 11:20:12 +08:00 |
|
sw
|
33da5b4a44
|
1、作业评论回复删除不即使刷新
2、匿评弹框样式
|
2015-04-29 11:18:32 +08:00 |
|
huang
|
412052dd0d
|
修改:引入我的文件提示信息
|
2015-04-29 10:44:05 +08:00 |
 guange
|
e6f8610dea
|
Merge remote-tracking branch 'origin/szzh' into guange_dev
|
2015-04-29 10:44:04 +08:00 |
|
guange
|
6c6ef757e1
|
Merge branch 'guange_dev' of http://repository.trustie.net/xianbo/trustie2 into guange_dev
|
2015-04-29 10:43:48 +08:00 |
|
guange
|
2afdd57fb6
|
修复服务器打包乱码问题
|
2015-04-29 10:43:36 +08:00 |
|
whimlex
|
b5b50bef21
|
问题跟踪图片压缩不清晰
|
2015-04-29 10:11:50 +08:00 |
|
sw
|
23b37c5b47
|
Merge branch 'szzh' into develop
|
2015-04-28 15:08:46 +08:00 |
|
sw
|
ee0ef7dc69
|
Merge branch 'guange_dev' into szzh
|
2015-04-28 15:08:00 +08:00 |
|
sw
|
387ab567d2
|
Merge branch 'szzh' into guange_dev
|
2015-04-28 15:06:12 +08:00 |
|
sw
|
90c143f047
|
评论上传附件换行
|
2015-04-28 15:02:10 +08:00 |
|
sw
|
e6a724d439
|
编辑作业样式
|
2015-04-28 14:57:02 +08:00 |
|
sw
|
a6a144d079
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-04-28 14:37:45 +08:00 |
|
sw
|
4c3013f1ac
|
修改作业评价上传附件功能500
作业标题换行
|
2015-04-28 14:37:25 +08:00 |
|
lizanle
|
edd4bbbe96
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2015-04-28 14:10:04 +08:00 |
|
lizanle
|
404b3e3275
|
暂时去掉一些editor功能
|
2015-04-28 14:09:58 +08:00 |
|
sw
|
2d7e4278ad
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-04-28 13:35:36 +08:00 |
|
sw
|
e676636e2e
|
Merge branch 'develop' into szzh
|
2015-04-28 13:35:06 +08:00 |
|
sw
|
9b15cbd6ee
|
1、老师评分、学生匿评增加附件上传，可上传批改后的作业
2、修改作业列表作业数不显示
|
2015-04-28 12:21:35 +08:00 |
|
lizanle
|
df7b33fe48
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2015-04-28 10:51:28 +08:00 |
|
lizanle
|
fb043f2451
|
暂时去掉有问题的功能
|
2015-04-28 10:51:17 +08:00 |
|
guange
|
38ec84cde9
|
将删除版本库的操作置入后台
|
2015-04-28 10:33:15 +08:00 |
|
sw
|
b3fb7914e2
|
课程通知评论编辑框不可用，解决方案：编辑跳转到新的页面
|
2015-04-28 10:31:55 +08:00 |
|
guange
|
273b360b51
|
Merge remote-tracking branch 'origin/szzh' into guange_dev
|
2015-04-28 09:53:50 +08:00 |
|
lizanle
|
de640a59b6
|
没有push上传成功，打个空格继续push
|
2015-04-28 09:38:46 +08:00 |
|
lizanle
|
2aac345645
|
去掉重复的图片上传
|
2015-04-28 09:37:31 +08:00 |
|
lizanle
|
3fac34d942
|
删掉没有被修改的图片
|
2015-04-28 09:16:54 +08:00 |
|
guange
|
b70ada57e6
|
邮件未处理text发送类型，导致每日发送失败
|
2015-04-27 21:54:49 +08:00 |
|
sw
|
261ebb916c
|
1、当login过长，用户匿评界面的星星换行
2、去掉无用的创建作业的代码，与弹出框创建作业代码冲突
|
2015-04-27 20:25:28 +08:00 |
|
sw
|
3da4c07d35
|
Merge branch 'szzh' into develop
|
2015-04-27 18:04:22 +08:00 |
|
sw
|
0eed5558ff
|
Merge branch 'guange_dev' into szzh
|
2015-04-27 18:03:14 +08:00 |
|
sw
|
827d99fce4
|
Merge branch 'szzh' into guange_dev
|
2015-04-27 18:02:35 +08:00 |
|
sw
|
456dcf9d40
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-04-27 17:52:34 +08:00 |
|
sw
|
d2f1f7d142
|
1、当教师评论为空时，预留一部分显示
|
2015-04-27 17:52:16 +08:00 |
|
whimlex
|
bf47f3bbb3
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-04-27 17:50:33 +08:00 |
|
sw
|
a64b3940dd
|
1、当教师评论为空时，预留一部分
|
2015-04-27 17:50:03 +08:00 |
|
whimlex
|
e30c446847
|
项目私有问题提示信息
|
2015-04-27 17:49:05 +08:00 |
|
lizanle
|
d07a1b945f
|
kindeditor增加切换到简单功能按钮
|
2015-04-27 17:38:32 +08:00 |
|
lizanle
|
92b79b40da
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2015-04-27 17:38:21 +08:00 |