Commit Graph

10024 Commits

Author SHA1 Message Date
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
huang cfdaf1f1b4 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-29 16:21:53 +08:00
huang 1eac300fb7 去掉打印结果 2015-09-29 16:21:36 +08:00
cxt 06b97e281a Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-29 16:20:50 +08:00
cxt 26624c8009 动态回复编辑框的“我要回复”的隐藏 2015-09-29 16:20:35 +08:00
whimlex aa969f013b Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-29 16:18:18 +08:00
sw 2e9d6d396f Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-29 16:17:03 +08:00
lizanle 9d122886a9 删除帖子会删除贴吧 2015-09-29 16:10:43 +08:00
lizanle c80854ad7f Merge remote-tracking branch 'origin/szzh' into szzh 2015-09-29 16:06:19 +08:00
lizanle 3c01969db1 代码缩进 2015-09-29 16:06:04 +08:00
sw a3ce43c3d5 去掉与我相关 2015-09-29 16:01:23 +08:00
Tim 74dc276383 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-29 16:01:18 +08:00
Tim f2b2062b9c 贴吧点赞位置再调整 2015-09-29 16:01:01 +08:00
huang 39800b2aac Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-29 16:00:10 +08:00
huang 3f6d64877a 1、老师发布作业自己能收到
2、关闭给所有人发
3、修改参数member问题
2015-09-29 15:59:48 +08:00
ouyangxuhua 17cfa10dca Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-29 15:46:04 +08:00
ouyangxuhua b29546cd13 评论了项目新闻消息,其内容应该为新闻题目,而非评论内容。 2015-09-29 15:45:52 +08:00
Tim 852435d708 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-29 15:44:23 +08:00
Tim 1613f41e77 点赞判断 2015-09-29 15:44:04 +08:00
cxt fe339e6a8f Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-29 15:38:06 +08:00
cxt 03436bca2a 贴吧的用户链接可点击 2015-09-29 15:37:52 +08:00
whimlex 4515c397db Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-29 15:26:14 +08:00
Tim 0fdf10649c Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-29 15:25:01 +08:00
Tim a0f4cabcf2 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-29 15:24:30 +08:00