yanxd
|
38b1f69aa5
|
fix bug in homework.html/ with admin or user who is belong to jfm.
|
2014-01-04 17:29:35 +08:00 |
|
yanxd
|
343b656c0f
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
2014-01-03 22:18:40 +08:00 |
|
yanxd
|
d23b196eaa
|
zz
|
2014-01-03 22:18:22 +08:00 |
 wanglinchun
|
97749cfd8e
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
2014-01-03 21:44:25 +08:00 |
|
wanglinchun
|
1c374a4530
|
Merge branch 'wordh' into develop
|
2014-01-03 21:43:55 +08:00 |
|
yanxd
|
fccd83e199
|
it i
|
2014-01-03 21:41:54 +08:00 |
|
wanglinchun
|
4167e8bb8f
|
修改了门户网站中用户动态的[进入附件列表]显示颜色
|
2014-01-03 21:36:47 +08:00 |
|
yanxd
|
4587c840b1
|
a
|
2014-01-03 21:33:01 +08:00 |
|
yanxd
|
4c0acc5f3e
|
welcome css
|
2014-01-03 21:02:30 +08:00 |
|
yanxd
|
61f0eef6f3
|
words/new reply insteads of project new reply form
|
2014-01-03 11:27:16 +08:00 |
|
yanxd
|
d0601aa671
|
Merge branch 'wordh' into develop
|
2014-01-03 10:34:17 +08:00 |
|
yanxd
|
d26f274a96
|
Merge branch 'wordh' of 10.0.47.245:/home/trustie2 into wordh
|
2014-01-03 10:33:31 +08:00 |
|
yanxd
|
d114c6abed
|
add remark to words_controller
|
2014-01-03 10:33:06 +08:00 |
 nieguanghui
|
1581a3a153
|
Merge branch 'wordh' of 10.0.47.245:/home/trustie2 into wordh
|
2014-01-03 10:29:42 +08:00 |
|
nieguanghui
|
d0908c9132
|
front page
|
2014-01-03 10:29:29 +08:00 |
|
yanxd
|
4abea36f3b
|
remove label_leave_me_message from user show erb
|
2014-01-03 08:53:09 +08:00 |
|
yanxd
|
1881e9726c
|
zz
|
2014-01-02 21:36:51 +08:00 |
|
yanxd
|
123817df93
|
tools 顺序
首页讨论区去掉项目讨论区
所有留言删除功能
标题显示错误
|
2014-01-02 21:20:57 +08:00 |
|
yanxd
|
e8a313be6c
|
fixed bug in create leavemessage from bids
|
2014-01-02 20:18:39 +08:00 |
|
yanxd
|
e577e1713f
|
Merge branch 'wordh' of 10.0.47.245:/home/trustie2 into wordh
|
2014-01-02 17:29:57 +08:00 |
|
yanxd
|
90a37a5f4e
|
竞赛众包的留言修改
|
2014-01-02 17:29:46 +08:00 |
|
nieguanghui
|
8b1264c99e
|
replace table with div + css ---- bids/show
|
2014-01-02 16:07:59 +08:00 |
|
yanxd
|
6d82d2ce17
|
remove table with oneline
|
2014-01-02 15:37:12 +08:00 |
|
nieguanghui
|
2c1e53bfec
|
Merge branch 'wordh' of 10.0.47.245:/home/trustie2 into wordh
|
2014-01-02 15:21:14 +08:00 |
|
nieguanghui
|
f77ecf71f1
|
mpdified project and contest message
|
2014-01-02 15:21:03 +08:00 |
|
yanxd
|
32510028aa
|
论坛留言里发帖的分界
|
2014-01-02 14:48:01 +08:00 |
|
yanxd
|
a7c6461f03
|
move dstinguish origin message into private method
|
2013-12-31 16:09:50 +08:00 |
|
yanxd
|
2070e9dc7f
|
remove memo/messages info from welcome.index
|
2013-12-31 15:48:08 +08:00 |
|
wanglinchun
|
0c8e1e19e6
|
"软件众包"和“创新竞赛”中“关注”及前面星号的隐藏属性设置
|
2013-12-31 15:36:35 +08:00 |
|
wanglinchun
|
fdcb68bd69
|
当用户未登陆的时候，隐藏掉了“软件众包”中的“选为作业”
当用户未登陆的时候，隐藏掉了“项目托管”、“创新竞赛”以及“软件众包” 关注 前的星号
|
2013-12-31 11:12:39 +08:00 |
|
yanxd
|
9cd931cb7f
|
ajax
|
2013-12-30 20:53:48 +08:00 |
|
yanxd
|
8618ad3ede
|
add access methods for delete
|
2013-12-30 20:16:56 +08:00 |
|
yanxd
|
ebc803a88a
|
项目留言.
|
2013-12-30 17:13:44 +08:00 |
|
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 |
|
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 |
|
yanxd
|
a53e18dcc5
|
zz
|
2013-12-25 10:09:21 +08:00 |
|
nieguanghui
|
5b6f3b602a
|
参数
|
2013-12-25 09:45:16 +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 |
|
nieguanghui
|
c8bdbdce66
|
1234
|
2013-12-24 16:52:13 +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 |
|
yanxd
|
2636d6b1e6
|
项目留言页面对齐
|
2013-12-24 10:57:59 +08:00 |
|
yanxd
|
fe2dc180ba
|
整理页面标签格式
|
2013-12-24 10:27:43 +08:00 |
|
wanglinchun
|
79571e8651
|
留言发邮件通知改进
|
2013-12-23 22:36:32 +08:00 |
|
yanxd
|
ec73bb144e
|
zz
|
2013-12-23 19:54:43 +08:00 |
|
yanxd
|
1af4e4f712
|
welcome index css.
|
2013-12-23 19:45:51 +08:00 |
|
yanxd
|
36d7068ba3
|
闭合forum标签
|
2013-12-23 16:44:20 +08:00 |
|
yanxd
|
8be6e2f3d1
|
remove remark.
|
2013-12-23 10:59:04 +08:00 |
|
yanxd
|
55af88777b
|
issue#426 不是顺序乱，是没显示置顶
|
2013-12-23 09:30:15 +08:00 |
|
yanxd
|
cda9543849
|
帖子回复数量超过一页，首页动态点击过去无法跳转到相应页面定位，锚点失效
|
2013-12-23 09:28:28 +08:00 |
|
yanxd
|
99686ec269
|
留言不能是空字符
|
2013-12-21 10:15:41 +08:00 |