 sw
|
0a8f3faf6a
|
1、project.css错误代码
2、项目上传资源弹框
|
2015-04-30 09:02:33 +08:00 |
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 |
 huang
|
135c3d9b19
|
课程讨论区代码重构
解决路由匹配和JS显示冲突
|
2015-04-29 14:29:03 +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
|
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 |
|
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 |
|
sw
|
456dcf9d40
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-04-27 17:52:34 +08:00 |
|
sw
|
a64b3940dd
|
1、当教师评论为空时，预留一部分
|
2015-04-27 17:50:03 +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 |
|
lizanle
|
e5e0a5857a
|
kindeditor增加切换到简单功能按钮
|
2015-04-27 17:38:05 +08:00 |
|
whimlex
|
4982c9f7d2
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-04-27 17:15:38 +08:00 |
|
whimlex
|
f3fb0115e4
|
版本库git操作文档默认展开，样式调整
|
2015-04-27 17:15:21 +08:00 |
|
lizanle
|
99ae746bff
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2015-04-27 17:02:06 +08:00 |
|
lizanle
|
8b6369a84f
|
kindeditor增加更多功能按钮
|
2015-04-27 17:01:52 +08:00 |
|
whimlex
|
40fdda0ee2
|
版本库git帮助文档的显示与隐藏
|
2015-04-27 16:58:16 +08:00 |
|
sw
|
03044d0190
|
课程--资源库：加粗上传课件分类字样
|
2015-04-27 15:59:22 +08:00 |
|
lizanle
|
aff7a97c4b
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2015-04-24 16:05:40 +08:00 |
|
lizanle
|
338a7d3ded
|
暂时去掉code icon
|
2015-04-24 16:05:32 +08:00 |
|
whimlex
|
481f7ee4ba
|
意见反馈按回退键重新计算
|
2015-04-24 15:08:09 +08:00 |
|
whimlex
|
091c6125d5
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-04-24 15:02:53 +08:00 |
|
whimlex
|
85e1262769
|
意见反馈
|
2015-04-24 15:02:32 +08:00 |
|
sw
|
91e37c7ab8
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-04-24 14:58:51 +08:00 |
|
whimlex
|
650ffd4397
|
课程和项目意见反馈
|
2015-04-24 14:47:50 +08:00 |
|
lizanle
|
138fff1bf5
|
暂时去掉全屏icon
|
2015-04-24 12:05:23 +08:00 |
|
lizanle
|
c384384b35
|
改变图标icon位置
|
2015-04-24 12:02:35 +08:00 |
|
lizanle
|
3810561fb1
|
改变图标icon
|
2015-04-24 12:02:09 +08:00 |
|
sw
|
f67bdae22a
|
课程讨论去引用、回帖不换行
|
2015-04-24 09:10:15 +08:00 |
|
lizanle
|
3e27acf03c
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2015-04-24 09:07:36 +08:00 |
|
lizanle
|
f4b6b795e3
|
kindeditor增加代码编辑功能
|
2015-04-24 09:07:12 +08:00 |
|
whimlex
|
1f83950b50
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-04-23 18:18:50 +08:00 |
|
whimlex
|
b61d76d94e
|
意见反馈
|
2015-04-23 18:18:07 +08:00 |
|
lizanle
|
cf9cc0af82
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2015-04-23 18:08:10 +08:00 |
|
lizanle
|
681f7b75d6
|
kindeditor图片上传改为一次弹框
|
2015-04-23 18:07:51 +08:00 |
|
whimlex
|
e61822d74a
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-04-23 17:56:11 +08:00 |
|
whimlex
|
b3e0490b90
|
意见反馈
|
2015-04-23 17:55:48 +08:00 |
|
sw
|
e21dfe28fd
|
Merge branch 'szzh' into guange_dev
|
2015-04-23 17:45:22 +08:00 |
|
lizanle
|
f7dd4924c1
|
Merge remote-tracking branch 'origin/szzh' into szzh
Conflicts:
public/assets/kindeditor/kindeditor.js
|
2015-04-23 17:44:42 +08:00 |
|
lizanle
|
3b99c97617
|
kindeditor图片上传改为一次弹框
|
2015-04-23 17:43:34 +08:00 |
 guange
|
5c0d0230fc
|
去掉首页底部留白和不对齐
|
2015-04-23 17:43:10 +08:00 |
|
whimlex
|
b5781ac22b
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-04-23 16:13:19 +08:00 |