Commit Graph

9861 Commits

Author SHA1 Message Date
lizanle 88ddaaaaf5 Merge remote-tracking branch 'origin/szzh' into szzh 2015-10-08 10:00:23 +08:00
lizanle f71ca2391f 编辑器换行行间距巨大的bug 2015-10-08 10:00:10 +08:00
huang 88b8854ed7 修改吧主和发帖人消息重复的问题 2015-09-30 11:31:29 +08:00
huang 326c05d0eb Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-30 11:24:31 +08:00
huang fd020b56f7 细调红点样式 2015-09-30 11:24:17 +08:00
sw c10501075a Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-30 10:50:35 +08:00
Tim c7a9738dc8 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-30 10:52:44 +08:00
Tim ff18381f64 引用资源库弹框调整 2015-09-30 10:52:27 +08:00
sw 0273606403 Merge branch 'develop' into szzh 2015-09-30 10:50:19 +08:00
sw fed1a99bec 课程动态报500 2015-09-30 10:49:04 +08:00
sw af892fa7ef Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-30 10:44:00 +08:00
sw 11314a5366 第二个人打分之后,评分结果的样式 2015-09-30 10:43:40 +08:00
Tim 78d11b57b9 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-30 10:33:31 +08:00
Tim 42d4a5628d 引用资源库的icon修改 2015-09-30 10:33:13 +08:00
huang 548a18d1fe Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-30 10:32:16 +08:00
huang edf6f8e1f0 消息提示,显示新消息数目 2015-09-30 10:31:47 +08:00
sw d1bb76cfcb 调整学生匿评界面提交按钮样式 2015-09-30 10:24:20 +08:00
lizanle d182f532a6 Merge remote-tracking branch 'origin/szzh' into szzh 2015-09-30 10:21:27 +08:00
lizanle acdb63974f 具体课程发布作业的样式 2015-09-30 10:21:11 +08:00
sw 11736eb266 迁移文件有问题 2015-09-30 10:16:55 +08:00
cxt f25baeca2d Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-30 09:58:41 +08:00
cxt 452766bade 课程通知的动态排序时间调整 2015-09-30 09:58:29 +08:00
sw eba54e1112 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-30 09:56:47 +08:00
sw b7ee13c0e4 Merge branch 'develop' into szzh 2015-09-30 09:55:00 +08:00
sw 1acadd1edf 1、测试时间显示不正确
2、作品列表时间增加判断
2015-09-30 09:50:14 +08:00
sw ee673ccf49 Merge branch 'szzh' into develop 2015-09-29 18:03:42 +08:00
sw 52eabd5c0a Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-29 18:03:00 +08:00
sw 50a28389e5 Merge branch 'develop' into szzh 2015-09-29 18:02:26 +08:00
sw 87e4bfdd3f 课程内导入作业却将作业发布到被导入的课程 2015-09-29 18:02:11 +08:00
lizanle ecbf1ca692 Merge remote-tracking branch 'origin/szzh' into szzh 2015-09-29 17:54:47 +08:00
lizanle 4f8e9ea2cd 编辑按钮被注释了 2015-09-29 17:54:33 +08:00
sw 9edfa49bcb 项目内上传图片按钮 2015-09-29 17:41:12 +08:00
huang 278d26e9a0 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-29 17:35:37 +08:00
huang fe83fe31af 项目版本库--》内容对比 2015-09-29 17:35:22 +08:00
sw a244a7750e Merge branch 'szzh' into develop 2015-09-29 17:34:50 +08:00
sw d8e6bf26bc Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-29 17:34:16 +08:00
sw f2b8e01aee Merge branch 'develop' into szzh 2015-09-29 17:33:57 +08:00
Tim b6a8a69be8 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-29 17:30:02 +08:00
lizanle 4386f3fddf 样式问题 2015-09-29 17:29:44 +08:00
Tim 4c5b59ebc8 作业动态图标替换 2015-09-29 17:28:45 +08:00
sw 3cf5e9e2b1 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-29 17:26:31 +08:00
lizanle 9f9b68ef2a 帮助中心报500的问题 2015-09-29 17:16:53 +08:00
sw 7a3502f5cf Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-29 17:14:02 +08:00
sw 7cba1e5f76 课程内发布作业按钮无反应 2015-09-29 17:10:16 +08:00
sw 9569bda67c 上传图片功能不可 用 2015-09-29 16:51:22 +08:00
lizanle 2c9e46fc77 靠左 0间距 2015-09-29 16:48:56 +08:00
lizanle b798c6747b 删除贴吧 函数名重复了 2015-09-29 16:40:55 +08:00
lizanle b292b1580d Merge remote-tracking branch 'origin/szzh' into szzh 2015-09-29 16:36:58 +08:00
lizanle 38702dde64 去掉源码模式 2015-09-29 16:36:51 +08:00
sw 8a6b3ab6a7 Merge branch 'szzh' into develop 2015-09-29 16:22:33 +08:00