Commit Graph

9830 Commits

Author SHA1 Message Date
huang 5f26e331c6 缺陷截止时间到了消息通知 2015-09-28 17:31:55 +08:00
sw 9a5dba7773 课程内发布、修改、删除作业后跳转仍在课程内的作业列表 2015-09-28 17:27:01 +08:00
sw 6194be8933 界面样式调整。js修改
在课程内发布作业时无课程id
2015-09-28 17:09:07 +08:00
ouyangxuhua b19007f56a 修改判断用户是老师的方法 2015-09-28 16:42:20 +08:00
huang 030f9e945e 优化消息整个界面代码 2015-09-28 16:14:53 +08:00
cxt 12c394c36e Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-28 16:11:18 +08:00
cxt 955d87a98c 新增测试集的编辑框自适应高度 2015-09-28 16:09:59 +08:00
ouyangxuhua 80fabf0681 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-28 16:09:55 +08:00
ouyangxuhua e9d61a928a 修复项目issue中,图片显示超出边界的问题 2015-09-28 16:08:47 +08:00
sw 35b1bc8069 课程内作业列表界面修改 2015-09-28 15:52:30 +08:00
huang 0a1798eb0b Merge branch 'szzh' into dev_hjq 2015-09-28 15:44:32 +08:00
huang c3422460ce 匿评失败邮件发送框架 2015-09-28 15:38:19 +08:00
huang ba569403c3 1、匿评关闭/开启发送对象为所有成员
2、匿评方法封装
3、匿评开启/关闭邮件通知发送对象为课程所有成员
2015-09-28 15:35:08 +08:00
cxt e1348a4845 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-28 15:24:27 +08:00
cxt 038bcdb80e 课程动态的作业编辑菜单样式调整 2015-09-28 15:24:03 +08:00
ouyangxuhua eac31cda7f 修改个人主页最新动态图片显示超出边界问题 2015-09-28 15:13:42 +08:00
huang 2873412d1a 修改邮件--每天发送-》内容为空的问题 2015-09-28 15:06:23 +08:00
ouyangxuhua afbfc9f8b6 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-28 14:46:23 +08:00
ouyangxuhua b58fcb58de 作业消息的内容更新;
更改样式
2015-09-28 14:45:59 +08:00
lizanle 41a6b8ab06 文件名称尽可能的显示完全 2015-09-28 14:35:55 +08:00
lizanle 08c2b9395e Merge remote-tracking branch 'origin/szzh' into szzh 2015-09-28 14:20:33 +08:00
lizanle 4e7b0c5bdf 文件名称尽可能的显示完全 2015-09-28 14:20:23 +08:00
sw 821290da31 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-28 14:20:10 +08:00
cxt ea18098a9d Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-28 14:15:35 +08:00
cxt 5909df1f69 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-28 14:11:56 +08:00
lizanle 5e0ae3a6bb 编辑贴吧描述匡样式修改 2015-09-28 14:11:46 +08:00
cxt e298f738ed 调整课程动态的过滤列表样式 2015-09-28 14:10:04 +08:00
cxt f5a6d5d349 首页的作业动态添加编辑菜单 2015-09-28 14:09:27 +08:00
huang c0d95bf872 Merge branch 'develop' into dev_hjq 2015-09-28 13:37:29 +08:00
lizanle ea515cbb5d Merge remote-tracking branch 'origin/szzh' into szzh 2015-09-28 13:36:05 +08:00
lizanle f340941e3e 贴吧描述(历史数据)显示存在html代码 2015-09-28 13:35:59 +08:00
ouyangxuhua e4140ac411 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-28 13:29:17 +08:00
ouyangxuhua ab0013d659 1.项目问题中,问题类型为“周报”时,消息提示应为“发布了周报”;
2.stylesheet_link_tag 中,prettify应该加上引号,否则报错。
2015-09-28 13:29:02 +08:00
lizanle 5174e6eeb8 添加删除确认 2015-09-28 12:02:38 +08:00
lizanle 0b5b643a8e 附件与内容距离太大 2015-09-28 11:48:57 +08:00
lizanle f2dd69f9b6 Merge remote-tracking branch 'origin/szzh' into szzh 2015-09-28 11:42:50 +08:00
lizanle 62bf136bea 标题内容 如果换行,那么就换行显示 2015-09-28 11:42:32 +08:00
ouyangxuhua f5de071191 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-28 11:22:18 +08:00
ouyangxuhua f8d7c61065 修改作业消息显示内容及样式 2015-09-28 11:22:00 +08:00
cxt 3254abf67f Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-28 10:51:58 +08:00
cxt a2d6168043 课程动态的数据迁移 2015-09-28 10:51:44 +08:00
cxt 6a3089bb9b 动态的回复图片超出边框 2015-09-28 10:51:24 +08:00
ouyangxuhua 29b4e174fd Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-28 10:20:27 +08:00
ouyangxuhua f73865b771 1.修改作业消息的样式;
2.解决系统消息时间显示问题。
2015-09-28 10:20:14 +08:00
sw b993d0e945 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-28 10:11:51 +08:00
sw e194203181 Merge branch 'develop' into szzh 2015-09-28 10:11:29 +08:00
cxt 9190f0515d Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-28 08:46:20 +08:00
huang 19e07b46d1 Merge branch 'develop' of http://repository.trustie.net/xianbo/trustie2 into develop 2015-09-25 18:21:13 +08:00
huang ab47f32a50 Merge branch 'szzh' into develop 2015-09-25 18:20:51 +08:00
huang c250945422 修改消息500问题 2015-09-25 18:19:23 +08:00