Commit Graph

6205 Commits

Author SHA1 Message Date
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 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
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 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 9b5a362e24 查看附件样式不正确 2015-09-25 16:57:36 +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
lizanle e0c338b497 限制字符长度 2015-09-25 16:20:51 +08:00
sw fd4a2b19c8 课程界面老师数量 2015-09-25 16:11:59 +08:00
lizanle a8812dd48e Merge remote-tracking branch 'origin/szzh' into szzh 2015-09-25 16:11:20 +08:00
lizanle 959d3f1a93 万一长度过大,阻止提交 2015-09-25 16:11:12 +08:00
ouyangxuhua c906c7ee1d Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-25 16:05:36 +08:00
ouyangxuhua 272bd2730a 消息中,更新了问题为留言时,去掉“留言内容”几个字;
内容显示主题
2015-09-25 16:05:19 +08:00
lizanle c8cbab2d50 火狐浏览器 和 ie浏览器的event获得 和 阻止 方式不同 2015-09-25 15:55:29 +08:00
lizanle 926bdd81e8 论坛名换行问题 2015-09-25 15:52:28 +08:00
lizanle a61e60d1b9 帖子内容会超出边框 2015-09-25 15:46:40 +08:00
lizanle 93542448e2 如果字符够了删除键 不能被屏蔽 2015-09-25 15:26:48 +08:00
lizanle 66ea9e3052 删除贴吧 取消也会被删除 2015-09-25 15:23:12 +08:00
lizanle 1ee00fcae4 论坛描述自动换行 2015-09-25 15:17:14 +08:00
lizanle fc1ec7135d Merge remote-tracking branch 'origin/szzh' into szzh 2015-09-25 15:12:08 +08:00
lizanle b525f12a32 文件上传问题 2015-09-25 15:12:01 +08:00
sw 6c62b44b59 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-25 15:06:06 +08:00
lizanle befd8d66f6 编辑名称检查 2015-09-25 15:05:32 +08:00
sw 29fd5b41e2 调整用户搜索界面样式 2015-09-25 14:55:58 +08:00
sw 709e099770 增加部分作业关联表的判断 2015-09-25 14:33:33 +08:00
lizanle 35dd56d51c Merge remote-tracking branch 'origin/szzh' into szzh 2015-09-25 12:32:03 +08:00
lizanle 7ef48f3fa3 标签修改的问题 2015-09-25 12:31:52 +08:00