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

wghreg · Mar 7, 2017 · 1091e48 · 1091e48
2 parents 9cf315a + fa02c46
commit 1091e48
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 4 deletions.
diff --git a/CHANGE_LOGS.html b/CHANGE_LOGS.html
@@ -5,6 +5,17 @@
         <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
     </head>
     <body>
+        <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>
+            <li><a href="https://github.com/b3log/symphony/issues/392">392 帖子被设置为优选处理</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/383">383 内容编辑器改进</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/387">387 用户角色变更通知</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/393">393 帖子列表摘要改进</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/400">400 发帖时标题、标签本地存储防丢失</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/408">408 帖子收藏、关注发通知</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/411">411 PJAX 优化</a>&nbsp;<span style='background: #84b6eb !important;color:#FFFFFF !important;padding: 1px 4px;'>enhancement</span></li>
+        </ul>
         <h2>Release 1.9.0 - Jan 12, 2017</h2>
         <ul>
             <li><a href="https://github.com/b3log/symphony/issues/332">332 新手向导</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.14.6.50, Feb 5, 2017
+    Version: 2.14.6.51, Mar 7, 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>1.9.0</version>
+    <version>2.0.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.17.9.30, Jan 20, 2017
+ * @version 3.17.9.31, Mar 7, 2017
  * @since 0.2.0
  */
 public final class SymphonyServletListener extends AbstractServletListener {
 
     /**
      * Symphony version.
      */
-    public static final String VERSION = "1.9.0";
+    public static final String VERSION = "2.0.0";
     /**
      * JSONO print indent factor.
      */

diff --git a/src/main/webapp/CHANGE_LOGS.html b/src/main/webapp/CHANGE_LOGS.html
@@ -5,6 +5,17 @@
         <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
     </head>
     <body>
+        <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>
+            <li><a href="https://github.com/b3log/symphony/issues/392">392 帖子被设置为优选处理</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/383">383 内容编辑器改进</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/387">387 用户角色变更通知</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/393">393 帖子列表摘要改进</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/400">400 发帖时标题、标签本地存储防丢失</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/408">408 帖子收藏、关注发通知</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/411">411 PJAX 优化</a>&nbsp;<span style='background: #84b6eb !important;color:#FFFFFF !important;padding: 1px 4px;'>enhancement</span></li>
+        </ul>
         <h2>Release 1.9.0 - Jan 12, 2017</h2>
         <ul>
             <li><a href="https://github.com/b3log/symphony/issues/332">332 新手向导</a>&nbsp;<span style='background: #02e10c !important;color:#FFFFFF !important;padding: 1px 4px;'>feature</span></li>