Commit Graph

1193 Commits

Author SHA1 Message Date
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
xianbo 95ed1880b5 fix setting about migrate path 2014-01-02 09:11:38 +08:00
yanxd 3dd3578bcb 设置回复时间字体大小,在Firefox页面中乱跳的问题 2014-01-02 09:07:19 +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
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