From 96dfa4281de7c3e19b6da96c4c607aab8e3e00bc Mon Sep 17 00:00:00 2001
From: daiao <358551898@qq.com>
Date: Fri, 9 Sep 2016 15:03:46 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=EF=BC=9A=E5=BC=BA?=
 =?UTF-8?q?=E5=88=B6=E4=BF=AE=E6=94=B9=E9=A1=B5=E9=9D=A2=EF=BC=8C=E5=B7=A6?=
 =?UTF-8?q?=E4=BE=A7=E7=BC=96=E8=BE=91=E4=B8=AA=E4=BA=BA=E8=B5=84=E6=96=99?=
 =?UTF-8?q?=E5=8F=AF=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/layouts/new_base_user_show.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/layouts/new_base_user_show.html.erb b/app/views/layouts/new_base_user_show.html.erb
index b92218241..94c5c8a30 100644
--- a/app/views/layouts/new_base_user_show.html.erb
+++ b/app/views/layouts/new_base_user_show.html.erb
@@ -147,7 +147,7 @@
           </ul>
         </div>
         <div id="watch_user_btn_div">
-          <a href="javascript:void(0);" class="user_editinfo" disabled="true">编辑个人资料</a>
+          <%= link_to "编辑个人资料", my_account_path(:tip => 1), :class => "user_editinfo"%>
         </div>
       </div>
 

From de769454a7b6866ad9ebe6aebcf95b75ca89d9be Mon Sep 17 00:00:00 2001
From: daiao <358551898@qq.com>
Date: Fri, 9 Sep 2016 15:16:08 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=85=AC=E5=85=B1?=
 =?UTF-8?q?=E8=B4=B4=E5=90=A7=EF=BC=9A=E5=9B=9E=E5=A4=8D=E9=9D=9E=E6=B1=89?=
 =?UTF-8?q?=E5=AD=97=E7=B1=BB=E5=9E=8B=E5=86=85=E5=AE=B9=E8=B6=85=E5=87=BA?=
 =?UTF-8?q?=E8=BE=B9=E6=A1=86=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/memos/show.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/memos/show.html.erb b/app/views/memos/show.html.erb
index 435fd0f9e..d684b4297 100644
--- a/app/views/memos/show.html.erb
+++ b/app/views/memos/show.html.erb
@@ -90,7 +90,7 @@
       </div>
       <div class="homepagePostReplyDes">
         <div class="homepagePostReplyPublisher"><a href="<%=user_path(reply.author)%>" class="newsBlue mr10 f14"><%= reply.author.name%></a><%=  format_date(reply.created_at) %></div>
-        <div class="homepagePostReplyContent" id="activity_description_<%= reply.id %>"><%= h reply.content.html_safe%></div>
+        <div class="homepagePostReplyContent break_word"  id="activity_description_<%= reply.id %>"><%= h reply.content.html_safe%></div>
       </div>
       <script type="text/javascript">
           $(function(){