 wanglinchun
|
80f40cd1c0
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
2013-12-30 16:28:04 +08:00 |
 nieguanghui
|
36289eba41
|
modified projects
|
2013-12-30 16:03:28 +08:00 |
yanxd
|
4c4e725b5c
|
project leave message.
|
2013-12-30 08:47:45 +08:00 |
|
yanxd
|
1d962b98d3
|
model project leave message
|
2013-12-29 19:35:52 +08:00 |
|
yanxd
|
42fa7eb4c1
|
dd
|
2013-12-28 13:40:22 +08:00 |
|
yanxd
|
8cb3756bbc
|
首页帖子数量
|
2013-12-28 13:33:04 +08:00 |
|
nieguanghui
|
61116b0495
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
Conflicts:
app/views/words/_new_respond.html.erb
|
2013-12-28 13:17:00 +08:00 |
|
yanxd
|
69448b36ea
|
字数统计
|
2013-12-28 13:16:22 +08:00 |
|
nieguanghui
|
ae094bde28
|
主页界面修改
|
2013-12-28 13:14:38 +08:00 |
|
yanxd
|
1996283bd4
|
invoke char length js.
|
2013-12-28 12:27:35 +08:00 |
|
yanxd
|
112a2b4da6
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
Conflicts:
app/views/words/_message.html.erb
app/views/words/_new_respond.html.erb
|
2013-12-28 12:19:37 +08:00 |
|
yanxd
|
1b389586ad
|
留言回复人错误
|
2013-12-28 12:16:08 +08:00 |
|
nieguanghui
|
b0bb8b4a48
|
主页界面修改
|
2013-12-28 12:09:56 +08:00 |
|
nieguanghui
|
d9a85e3508
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
2013-12-28 10:59:01 +08:00 |
|
nieguanghui
|
ed55fe0175
|
1
|
2013-12-28 10:57:56 +08:00 |
|
yanxd
|
997c546083
|
remove html char
|
2013-12-28 10:48:22 +08:00 |
|
nieguanghui
|
398e35cf19
|
留言增加字数限制
|
2013-12-28 10:48:10 +08:00 |
|
yanxd
|
c3cbf87b3d
|
首页排序大概搞定
|
2013-12-27 16:30:45 +08:00 |
|
wanglinchun
|
6ad3505b14
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
2013-12-27 15:09:56 +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 |
|
wanglinchun
|
5b00db37de
|
添加无作业提交时的提示语
|
2013-12-27 13:46:19 +08:00 |
|
yanxd
|
e12922544a
|
链接bug，去掉动态里的文档内容
|
2013-12-27 09:00:50 +08:00 |
|
nieguanghui
|
e4ae5e56fc
|
delete leave message .
|
2013-12-26 20:22:19 +08:00 |
|
wanglinchun
|
092c70ffd6
|
竞赛-用户反馈留言框内容修改
|
2013-12-26 20:10:25 +08:00 |
|
nieguanghui
|
58ff68a9cc
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
2013-12-26 19:58:10 +08:00 |
|
nieguanghui
|
8a0dc59f3e
|
welcome index helper.
|
2013-12-26 19:57:40 +08:00 |
|
yanxd
|
8a1316cf8f
|
删除留言操作
|
2013-12-26 19:28:18 +08:00 |
|
yanxd
|
7197e3d90c
|
论坛直接建立新帖传送文件不能成功
|
2013-12-26 16:34:50 +08:00 |
|
nieguanghui
|
809e7023ee
|
给留言增加删除功能；
_message.html.erb, _journal_reply_items.html.erb
调用words的destroy方法。
|
2013-12-26 16:06:59 +08:00 |
|
nieguanghui
|
4c9f9d9210
|
Merge branch 'wordh' into develop
|
2013-12-26 15:35:11 +08:00 |
|
nieguanghui
|
4fc47ce3a3
|
修改回复按钮表现方式
|
2013-12-26 15:32:34 +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 |
|
nieguanghui
|
6d47031d72
|
改变样式
|
2013-12-26 11:13:30 +08:00 |
|
nieguanghui
|
d0c28a60bc
|
留言页面显示改进
|
2013-12-26 11:05:09 +08:00 |
|
yanxd
|
7130347f39
|
回复框 设置姓名 七八糟
|
2013-12-26 10:52:16 +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
|
64d85a9ab2
|
一部分ajax留言实现
|
2013-12-25 22:21:16 +08:00 |
|
nieguanghui
|
c05dd4f900
|
修改用户页面留言显示样式
|
2013-12-25 21:00:40 +08:00 |
|
yanxd
|
6b3c3516cd
|
去除给留言的回复显示在留言中
|
2013-12-25 16:04:14 +08:00 |
|
nieguanghui
|
b716b60c0b
|
修复回复框默认展开的bug
|
2013-12-25 15:57:19 +08:00 |
|
yanxd
|
60489bdbfd
|
'fix'
|
2013-12-25 15:45:14 +08:00 |
|
yanxd
|
2c5cd7a12a
|
'merge'
|
2013-12-25 15:43:28 +08:00 |
|
yanxd
|
f05d2131bd
|
组织留言数据方法
|
2013-12-25 15:40:34 +08:00 |
|
nieguanghui
|
fbf73de68b
|
1234
|
2013-12-25 15:37:03 +08:00 |