Commit Graph

9709 Commits

Author SHA1 Message Date
cxt 955d87a98c 新增测试集的编辑框自适应高度 2015-09-28 16:09:59 +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
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
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
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
cxt 9190f0515d Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-28 08:46:20 +08:00
huang c250945422 修改消息500问题 2015-09-25 18:19:23 +08:00
huang 4a5dfe1109 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-25 17:52:50 +08:00
huang 8c84179650 修改issue更新消息重复提示的问题 2015-09-25 17:52:34 +08:00
lizanle e092b6c36e Merge remote-tracking branch 'origin/szzh' into szzh 2015-09-25 17:38:25 +08:00
lizanle 4845435aa3 帖子的编辑长度限制 2015-09-25 17:38:19 +08:00
sw 591324854b 项目缺陷点击留言,下面留言框获得焦点 2015-09-25 17:22:31 +08:00
sw aa07c3408f 项目资源增加TAG后点击报错 2015-09-25 17:18:01 +08:00
sw b84ec1360a Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-25 16:58:57 +08:00
lizanle 745a32b684 资源库tag修改问题 2015-09-25 16:58:36 +08:00
sw 4e7d9f4f72 Merge branch 'develop' into szzh 2015-09-25 16:57:54 +08:00
sw 9b5a362e24 查看附件样式不正确 2015-09-25 16:57:36 +08:00
lizanle f54149a5b7 发送动态 消息会重复 2015-09-25 16:53:23 +08:00
lizanle 9a5b83c898 如果没有大于两条回复。那么展开回复就要隐藏 2015-09-25 16:34:01 +08:00
cxt be932e3b1b Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-25 16:32:41 +08:00
cxt c81e07d588 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
	db/schema.rb
2015-09-25 16:32:25 +08:00
lizanle 39c5571d73 Merge remote-tracking branch 'origin/szzh' into szzh 2015-09-25 16:32:07 +08:00
lizanle c3d829a68f 名称检查 2015-09-25 16:32:02 +08:00
ouyangxuhua 6857b62f00 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-25 16:30:22 +08:00
ouyangxuhua 31c5cf2163 1.将作品评论、回复作品评论等加入至作业消息列表 2015-09-25 16:30:00 +08:00
cxt 223bac373f 课程动态的数据迁移 2015-09-25 16:29:47 +08:00