Commit Graph

144 Commits

Author SHA1 Message Date
yanxd 1b389586ad 留言回复人错误 2013-12-28 12:16:08 +08:00
yanxd 997c546083 remove html char 2013-12-28 10:48:22 +08:00
yanxd 8bc5b2ebf5 改了论坛回复不会触发修改update字段的问题 2013-12-27 15:04:05 +08:00
yanxd fea1cdff53 首页时间排序,可能会引起其他调用event_datetime的问题。待观察 2013-12-27 13:54:57 +08:00
yanxd 8a1316cf8f 删除留言操作 2013-12-26 19:28:18 +08:00
wanglinchun d48d17bece 留言邮件问题 2013-12-26 15:24:03 +08:00
yanxd 7b895e5cde Merge branch 'wordh' into develop
Conflicts:
	app/views/layouts/base_users.html.erb
2013-12-26 11:36:09 +08:00
wanglinchun 6d1f395caf mutil thread 2013-12-26 11:35:07 +08:00
wanglinchun a3ef595099 Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
Conflicts:
	app/models/journals_for_message_observer.rb
2013-12-26 11:31:30 +08:00
wanglinchun 3707af3810 mail 2013-12-26 11:30:31 +08:00
yanxd a01123c5bf d 2013-12-26 08:43:16 +08:00
yanxd 605d7ec565 ajax message fix 2013-12-26 08:39:43 +08:00
yanxd f05d2131bd 组织留言数据方法 2013-12-25 15:40:34 +08:00
yanxd 6f0e3501b8 fix bug. 2013-12-25 09:25:22 +08:00
yanxd ff317e48e9 words jourformessage design ing... 2013-12-25 09:17:15 +08:00
yanxd deaae6998c Merge remote-tracking branch 'origin/develop' into wordh 2013-12-24 16:47:57 +08:00
nieguanghui f3ce918699 留言修改 2013-12-24 16:42:56 +08:00
yanxd 5e5689d945 闭合素有标签 2013-12-24 11:19:20 +08:00
wanglinchun 79571e8651 留言发邮件通知改进 2013-12-23 22:36:32 +08:00
yanxd cda9543849 帖子回复数量超过一页,首页动态点击过去无法跳转到相应页面定位,锚点失效 2013-12-23 09:28:28 +08:00
yanxd 99686ec269 留言不能是空字符 2013-12-21 10:15:41 +08:00
wanglinchun 775f07a89d Merge remote-tracking branch 'origin/develop' into develop 2013-12-20 22:04:49 +08:00
wanglinchun e16fea9387 fix:项目提交留言出错 2013-12-20 22:04:13 +08:00
yanxd 7226186316 to login using validate with email. 2013-12-20 10:30:41 +08:00
yanxd 60be338848 作业提交的部分问题
禁止js的情况
修复一些路由错误
ie提交的问题.
2013-12-19 15:59:10 +08:00
nieguanghui c6f657ed8c 重构排序代码 2013-12-17 16:59:07 +08:00
yanxd 3484632ce8 Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop 2013-12-13 20:02:20 +08:00
yanxd b703c65033 关注取消关注位置漂移
个人主页学号的隐藏
2013-12-13 20:01:27 +08:00
wanglinchun 10177618f0 message send email 2013-12-13 11:31:12 +08:00
yanxd dcc47ae989 amigo 2013-12-12 17:18:55 +08:00
yanxd 5cae2010c1 download access 2013-12-12 09:23:08 +08:00
yanxd 0bc2b8f2b3 项目论坛丢失了的编辑功能
贴吧的置顶锁定功能,目前只针对管理员开放
贴吧列表搜索功能重构
增加1/2帖子显示数目
取出楼主,防止输入帖子id让回复作为主贴显示
首页取新帖子
帖子下载内容随意删除功能
2013-12-11 08:52:55 +08:00
yanxd e5010d118b Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop 2013-12-09 18:31:52 +08:00
yanxd 4eeb7c3ea8 look at daily log. 2013-12-09 18:31:08 +08:00
huangjingquan 0c5c07a5a3 对留言在动态里面的显示进行了修改! 2013-12-09 17:10:10 +08:00
huangjingquan f99e5dcc64 修改了之前留言回复双重显示的问 2013-12-09 16:01:50 +08:00
yanxd c272783f1c 工具栏边距调整,讨论区的修改删除功能,项目竞赛边框顶出页面的问题。 2013-12-07 10:15:55 +08:00
yanxd d29154cc24 hot memo merged board/topic. 2013-12-06 11:19:15 +08:00
yanxd 31a4ecc8e8 welcome activity, eventtypes: Forum=>Memo, Memo=>Reply. 2013-12-05 08:52:41 +08:00
huangjingquan 096f0eed03 添加了留言结果在用户动态里面显示 2013-12-04 21:24:52 +08:00
yanxd 6cede3d2be 计算评论数量,修复按照时间查找bug,etc... 2013-12-04 16:46:16 +08:00
yanxd 28978b88b2 首页用户动态加入讨论区内容,点击之后定位到帖子。 2013-12-04 15:31:18 +08:00
yanxd cc9dca4012 主题帖子数量不算在回复数之中 2013-11-28 15:51:38 +08:00
yanxd 8f707f3987 修复帖子统计问题 2013-11-28 15:29:19 +08:00
huangjingquan 6dc692bb6a 修改了主页、论坛显示 2013-11-27 16:40:47 +08:00
yanxd 16c218ccae 隐藏搜索栏 and something... 2013-11-27 14:52:36 +08:00
yanxd 5d02d0adc1 封装memo 2013-11-27 10:16:35 +08:00
yanxd cdbc26e8df Merge branch 'forum' into develop 2013-11-26 17:32:28 +08:00
yanxd f0b6c33217 修改一些删除权限问题 2013-11-26 16:55:46 +08:00
yanxd 16c0bc3ac3 memo edit/destory. 2013-11-26 16:32:08 +08:00