Merge remote-tracking branch 'refs/remotes/origin/2.1.0-dev'

ITHTT · May 18, 2017 · 6358868 · 6358868
2 parents 716db62 + 5833ced
commit 6358868
Show file tree

Hide file tree

Showing 9 changed files with 60 additions and 9 deletions.
diff --git a/CHANGE_LOGS.html b/CHANGE_LOGS.html
@@ -5,6 +5,23 @@
         <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
     </head>
     <body>
+        <h2>Release 2.1.0 - May 18, 2017</h2>
+        <ul>
+            <li><a href="https://github.com/b3log/symphony/issues/416">416 客户端 API</a>&nbsp;<span style='background: #02e10c !important;color:#FFFFFF !important;padding: 1px 4px;'>feature</span></li>
+            <li><a href="https://github.com/b3log/symphony/issues/419">419 本地邮件发送</a>&nbsp;<span style='background: #02e10c !important;color:#FFFFFF !important;padding: 1px 4px;'>feature</span></li>
+            <li><a href="https://github.com/b3log/symphony/issues/424">424 帖子语音预览</a>&nbsp;<span style='background: #02e10c !important;color:#FFFFFF !important;padding: 1px 4px;'>feature</span></li>
+            <li><a href="https://github.com/b3log/symphony/issues/428">428 新活动 - 小游戏【五子棋】</a>&nbsp;<span style='background: #02e10c !important;color:#FFFFFF !important;padding: 1px 4px;'>feature</span></li>
+            <li><a href="https://github.com/b3log/symphony/issues/450">450 删除自己发布的帖子</a>&nbsp;<span style='background: #02e10c !important;color:#FFFFFF !important;padding: 1px 4px;'>feature</span></li>
+            <li><a href="https://github.com/b3log/symphony/issues/451">451 删除自己发布的回帖</a>&nbsp;<span style='background: #02e10c !important;color:#FFFFFF !important;padding: 1px 4px;'>feature</span></li>
+            <li><a href="https://github.com/b3log/symphony/issues/452">452 更新自己的回帖</a>&nbsp;<span style='background: #02e10c !important;color:#FFFFFF !important;padding: 1px 4px;'>feature</span></li>
+            <li><a href="https://github.com/b3log/symphony/issues/293">293 帖子编辑器显示关注的标签</a>&nbsp;<span style='background: #84b6eb !important;color:#FFFFFF !important;padding: 1px 4px;'>enhancement</span></li>
+            <li><a href="https://github.com/b3log/symphony/issues/373">373 未登录访问帖子权限改进</a>&nbsp;<span style='background: #84b6eb !important;color:#FFFFFF !important;padding: 1px 4px;'>enhancement</span></li>
+            <li><a href="https://github.com/b3log/symphony/issues/384">384 编辑器上增加表情弹出框链接</a>&nbsp;<span style='background: #84b6eb !important;color:#FFFFFF !important;padding: 1px 4px;'>enhancement</span></li>
+            <li><a href="https://github.com/b3log/symphony/issues/420">420 帖子/回帖赞同、反对发通知</a>&nbsp;<span style='background: #84b6eb !important;color:#FFFFFF !important;padding: 1px 4px;'>enhancement</span></li>
+            <li><a href="https://github.com/b3log/symphony/issues/429">429 帖子页大改版</a>&nbsp;<span style='background: #84b6eb !important;color:#FFFFFF !important;padding: 1px 4px;'>enhancement</span></li>
+            <li><a href="https://github.com/b3log/symphony/issues/442">442 删除未被使用的标签</a>&nbsp;<span style='background: #84b6eb !important;color:#FFFFFF !important;padding: 1px 4px;'>enhancement</span></li>
+            <li><a href="https://github.com/b3log/symphony/issues/447">447 编辑器内容和预览同步滚动</a>&nbsp;<span style='background: #84b6eb !important;color:#FFFFFF !important;padding: 1px 4px;'>enhancement</span></li>
+        </ul>
         <h2>Release 2.0.0 - Mar 7, 2017</h2>
         <ul>
             <li><a href="https://github.com/b3log/symphony/issues/388">388 关注帖子</a>&nbsp;<span style='background: #02e10c !important;color:#FFFFFF !important;padding: 1px 4px;'>feature</span></li>

diff --git a/pom.xml b/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
     Description: Symphony POM.
-    Version: 2.15.6.56, May 13, 2017
+    Version: 2.15.6.57, May 18, 2017
     Author: Liang Ding
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0"
@@ -11,7 +11,7 @@
     <groupId>org.b3log</groupId>
     <artifactId>symphony</artifactId>
     <packaging>war</packaging>
-    <version>2.0.0</version>
+    <version>2.1.0</version>
     <name>Symphony</name>
     <url>https://github.com/b3log/symphony</url>
     <description>

diff --git a/src/main/java/org/b3log/symphony/SymphonyServletListener.java b/src/main/java/org/b3log/symphony/SymphonyServletListener.java
@@ -63,15 +63,15 @@
  *
  * @author <a href="http://88250.b3log.org">Liang Ding</a>
  * @author Bill Ho
- * @version 3.19.9.32, May 6, 2017
+ * @version 3.19.9.33, May 18, 2017
  * @since 0.2.0
  */
 public final class SymphonyServletListener extends AbstractServletListener {
 
     /**
      * Symphony version.
      */
-    public static final String VERSION = "2.0.0";
+    public static final String VERSION = "2.1.0";
     /**
      * JSONO print indent factor.
      */

diff --git a/src/main/webapp/CHANGE_LOGS.html b/src/main/webapp/CHANGE_LOGS.html
@@ -5,6 +5,23 @@
         <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
     </head>
     <body>
+        <h2>Release 2.1.0 - May 18, 2017</h2>
+        <ul>
+            <li><a href="https://github.com/b3log/symphony/issues/416">416 客户端 API</a>&nbsp;<span style='background: #02e10c !important;color:#FFFFFF !important;padding: 1px 4px;'>feature</span></li>
+            <li><a href="https://github.com/b3log/symphony/issues/419">419 本地邮件发送</a>&nbsp;<span style='background: #02e10c !important;color:#FFFFFF !important;padding: 1px 4px;'>feature</span></li>
+            <li><a href="https://github.com/b3log/symphony/issues/424">424 帖子语音预览</a>&nbsp;<span style='background: #02e10c !important;color:#FFFFFF !important;padding: 1px 4px;'>feature</span></li>
+            <li><a href="https://github.com/b3log/symphony/issues/428">428 新活动 - 小游戏【五子棋】</a>&nbsp;<span style='background: #02e10c !important;color:#FFFFFF !important;padding: 1px 4px;'>feature</span></li>
+            <li><a href="https://github.com/b3log/symphony/issues/450">450 删除自己发布的帖子</a>&nbsp;<span style='background: #02e10c !important;color:#FFFFFF !important;padding: 1px 4px;'>feature</span></li>
+            <li><a href="https://github.com/b3log/symphony/issues/451">451 删除自己发布的回帖</a>&nbsp;<span style='background: #02e10c !important;color:#FFFFFF !important;padding: 1px 4px;'>feature</span></li>
+            <li><a href="https://github.com/b3log/symphony/issues/452">452 更新自己的回帖</a>&nbsp;<span style='background: #02e10c !important;color:#FFFFFF !important;padding: 1px 4px;'>feature</span></li>
+            <li><a href="https://github.com/b3log/symphony/issues/293">293 帖子编辑器显示关注的标签</a>&nbsp;<span style='background: #84b6eb !important;color:#FFFFFF !important;padding: 1px 4px;'>enhancement</span></li>
+            <li><a href="https://github.com/b3log/symphony/issues/373">373 未登录访问帖子权限改进</a>&nbsp;<span style='background: #84b6eb !important;color:#FFFFFF !important;padding: 1px 4px;'>enhancement</span></li>
+            <li><a href="https://github.com/b3log/symphony/issues/384">384 编辑器上增加表情弹出框链接</a>&nbsp;<span style='background: #84b6eb !important;color:#FFFFFF !important;padding: 1px 4px;'>enhancement</span></li>
+            <li><a href="https://github.com/b3log/symphony/issues/420">420 帖子/回帖赞同、反对发通知</a>&nbsp;<span style='background: #84b6eb !important;color:#FFFFFF !important;padding: 1px 4px;'>enhancement</span></li>
+            <li><a href="https://github.com/b3log/symphony/issues/429">429 帖子页大改版</a>&nbsp;<span style='background: #84b6eb !important;color:#FFFFFF !important;padding: 1px 4px;'>enhancement</span></li>
+            <li><a href="https://github.com/b3log/symphony/issues/442">442 删除未被使用的标签</a>&nbsp;<span style='background: #84b6eb !important;color:#FFFFFF !important;padding: 1px 4px;'>enhancement</span></li>
+            <li><a href="https://github.com/b3log/symphony/issues/447">447 编辑器内容和预览同步滚动</a>&nbsp;<span style='background: #84b6eb !important;color:#FFFFFF !important;padding: 1px 4px;'>enhancement</span></li>
+        </ul>
         <h2>Release 2.0.0 - Mar 7, 2017</h2>
         <ul>
             <li><a href="https://github.com/b3log/symphony/issues/388">388 关注帖子</a>&nbsp;<span style='background: #02e10c !important;color:#FFFFFF !important;padding: 1px 4px;'>feature</span></li>