Commit Graph

9879 Commits

Author SHA1 Message Date
huang 8c84179650 修改issue更新消息重复提示的问题 2015-09-25 17:52:34 +08:00
sw 715ec0bed8 Merge branch 'szzh' into develop 2015-09-25 17:51:06 +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 16869ea42c Merge branch 'szzh' into develop 2015-09-25 17:23:31 +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
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 eeb40f9077 Merge remote-tracking branch 'origin/szzh' into szzh 2015-09-25 15:46:46 +08:00
lizanle a61e60d1b9 帖子内容会超出边框 2015-09-25 15:46:40 +08:00
ouyangxuhua 6591ea8e9a Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-25 15:27:00 +08:00
lizanle 93542448e2 如果字符够了删除键 不能被屏蔽 2015-09-25 15:26:48 +08:00
ouyangxuhua 0b932267c7 调整截止日期快到了的宽度 2015-09-25 15:26:40 +08:00
lizanle 66ea9e3052 删除贴吧 取消也会被删除 2015-09-25 15:23:12 +08:00
lizanle f501b24cbd Merge remote-tracking branch 'origin/szzh' into szzh 2015-09-25 15:17:22 +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
huang 3d91786fe2 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-25 15:11:00 +08:00
huang b9c7f7ba5c Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-25 15:10:38 +08:00
huang 61513153ec Merge branch 'dev_hjq' into szzh 2015-09-25 15:10:20 +08:00
sw 4765cef7bf Merge branch 'szzh' into develop 2015-09-25 15:09:59 +08:00
huang d32f92ed1d Merge branch 'szzh' into dev_hjq 2015-09-25 15:09:18 +08:00
huang 44a1518ddd Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-25 15:08:44 +08:00
huang e15ea06e2a 修改邮件标题 2015-09-25 15:08:31 +08:00
sw 241da3a37b Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-25 15:06:38 +08:00
sw 6c62b44b59 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-25 15:06:06 +08:00
sw 0b0befa38c Merge branch 'develop' into szzh 2015-09-25 15:05:51 +08:00
lizanle 8f93cdcd80 Merge remote-tracking branch 'origin/szzh' into szzh 2015-09-25 15:05:43 +08:00
lizanle befd8d66f6 编辑名称检查 2015-09-25 15:05:32 +08:00