发布 - 1.6.0

a00b71ba · Liang Ding · 79beb405 · 70d9b17c · a00b71ba · a00b71ba
Commit a00b71ba authored Sep 08, 2016 by Liang Ding
7 changed files
--- a/CHANGE_LOGS.html
+++ b/CHANGE_LOGS.html
@@ -5,6 +5,12 @@
        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
    </head>
    <body>
+        <h2>Release 1.6.0 - Sep 8, 2016</h2>
+        <ul>
+            <li><a href="https://github.com/b3log/solo/issues/12147">12147 用户管理翻页失败</a>&nbsp;<span style='background: #fc2929 !important;color:#FFFFFF !important;padding: 1px 4px;'>bug</span></li>
+            <li><a href="https://github.com/b3log/solo/issues/12153">12153 语言设置为 English 时首页报错</a>&nbsp;<span style='background: #fc2929 !important;color:#FFFFFF !important;padding: 1px 4px;'>bug</span></li>
+            <li><a href="https://github.com/b3log/solo/issues/12150">12150 新版后台 UI</a>&nbsp;<span style='background: #84b6eb !important;color:#FFFFFF !important;padding: 1px 4px;'>enhancement</span></li>
+        </ul>
        <h2>Release 1.5.0 - Aug 10, 2016</h2>
        <ul>
            <li><a href="https://github.com/b3log/solo/issues/12130">12130 MySQL 数据导出 SQL 文件</a>&nbsp;<span style='background: #02e10c !important;color:#FFFFFF !important;padding: 1px 4px;'>feature</span></li>

--- a/pom.xml
+++ b/pom.xml
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
    Description: Solo POM.
-    Version: 3.13.1.25, Aug 19, 2016
+    Version: 3.14.1.25, Sep 8, 2016
    Author: <a href="http://88250.b3log.org">Liang Ding</a>
    Author: <a href="http://www.annpeter.cn">Ann Peter</a>
 -->
@@ -13,7 +13,7 @@
    <artifactId>solo</artifactId>
    <packaging>war</packaging>
    <name>Solo</name>
-    <version>1.5.0</version>
+    <version>1.6.0</version>
    <description>
        A blogging system written in Java, feel free to create your or your team own blog. 一个用 Java 实现的博客系统，为你或你的团队创建个博客吧。
    </description>

--- a/src/main/java/org/b3log/solo/SoloServletListener.java
+++ b/src/main/java/org/b3log/solo/SoloServletListener.java
@@ -60,7 +60,7 @@ import org.json.JSONObject;
 * Solo Servlet listener.
 *
 * @author <a href="http://88250.b3log.org">Liang Ding</a>
- * @version 1.8.2.15, Aug 10, 2016
+ * @version 1.9.2.15, Sep 8, 2016
 * @since 0.3.1
 */
 public final class SoloServletListener extends AbstractServletListener {
@@ -68,7 +68,7 @@ public final class SoloServletListener extends AbstractServletListener {
    /**
     * Solo version.
     */
-    public static final String VERSION = "1.5.0";
+    public static final String VERSION = "1.6.0";

    /**
     * Logger.

--- a/src/main/java/org/b3log/solo/service/UpgradeService.java
+++ b/src/main/java/org/b3log/solo/service/UpgradeService.java
@@ -46,7 +46,7 @@ import org.json.JSONObject;
 *
 * @author <a href="http://88250.b3log.org">Liang Ding</a>
 * @author <a href="mailto:dongxu.wang@acm.org">Dongxu Wang</a>
- * @version 1.2.0.6, Aug 10, 2016
+ * @version 1.2.0.7, Sep 8, 2016
 * @since 1.2.0
 */
 @Service
@@ -111,7 +111,7 @@ public class UpgradeService {
    /**
     * Old version.
     */
-    private static final String FROM_VER = "1.4.0";
+    private static final String FROM_VER = "1.5.0";

    /**
     * New version.

--- a/src/main/webapp/CHANGE_LOGS.html
+++ b/src/main/webapp/CHANGE_LOGS.html
@@ -5,6 +5,12 @@
        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
    </head>
    <body>
+        <h2>Release 1.6.0 - Sep 8, 2016</h2>
+        <ul>
+            <li><a href="https://github.com/b3log/solo/issues/12147">12147 用户管理翻页失败</a>&nbsp;<span style='background: #fc2929 !important;color:#FFFFFF !important;padding: 1px 4px;'>bug</span></li>
+            <li><a href="https://github.com/b3log/solo/issues/12153">12153 语言设置为 English 时首页报错</a>&nbsp;<span style='background: #fc2929 !important;color:#FFFFFF !important;padding: 1px 4px;'>bug</span></li>
+            <li><a href="https://github.com/b3log/solo/issues/12150">12150 新版后台 UI</a>&nbsp;<span style='background: #84b6eb !important;color:#FFFFFF !important;padding: 1px 4px;'>enhancement</span></li>
+        </ul>
        <h2>Release 1.5.0 - Aug 10, 2016</h2>
        <ul>
            <li><a href="https://github.com/b3log/solo/issues/12130">12130 MySQL 数据导出 SQL 文件</a>&nbsp;<span style='background: #02e10c !important;color:#FFFFFF !important;padding: 1px 4px;'>feature</span></li>

--- a/src/main/webapp/skins/next/css/next.min.css
+++ b/src/main/webapp/skins/next/css/next.min.css
--- a/src/main/webapp/skins/next/js/next.min.js
+++ b/src/main/webapp/skins/next/js/next.min.js
@@ -13,4 +13,4 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-var NexT={init:function(){$(".sidebar-toggle").click(function(){var i=$(".sidebar");$(this).hasClass("sidebar-active")?($(this).removeClass("sidebar-active"),$("body").animate({"padding-right":0}),i.animate({right:-320}),i.find("section").css("opacity",0)):($(this).addClass("sidebar-active"),$("body").animate({"padding-right":320}),i.animate({right:0},function(){i.find("section:first").animate({opacity:1})}))}),$(".site-nav-toggle").click(function(){$(".site-nav").slideToggle()}),$(document).ready(function(){setTimeout(function(){$(".logo-wrap").css("opacity",1),$(".logo-line-before i").animate({left:"0"},function(){$(".site-title").css("opacity",1).animate({top:0},function(){$(".menu").css("opacity",1).animate({"margin-top":"15px"}),$(".main").css("opacity",1).animate({top:"0"},function(){$(".b3-solo-list li").length>0&&$(window).width()>1e3&&$(".sidebar-toggle").click()})})}),$(".logo-line-after i").animate({right:"0"})},500)})},initArticle:function(){if($(".b3-solo-list li").length>0&&$(window).width()>1e3){$(".sidebar-toggle").addClass("has-toc");var i='<ul><li class="current" data-tab="toc">'+Label.tocLabel+'</li><li data-tab="site">'+Label.siteViewLabel+"</li></ul><section></section>";$(".sidebar").prepend(i);var t=$(".sidebar section:first").html($(".b3-solo-list")),a=$(".sidebar section:last");$(".sidebar > ul > li").click(function(){"toc"===$(this).data("tab")?a.animate({opacity:"0",top:"-50px"},300,function(){t.show().css("top","-50px"),t.animate({opacity:"1",top:"0"},300)}):t.animate({opacity:"0",top:"-50px"},300,function(){t.hide().css("top","-50px"),a.animate({opacity:"1",top:"0"},300)}),$(".sidebar > ul > li").removeClass("current"),$(this).addClass("current")})}}};NexT.init();
\ No newline at end of file
+var NexT={init:function(){$(".sidebar-toggle").click(function(){var i=$(".sidebar");$(this).hasClass("sidebar-active")?($(this).removeClass("sidebar-active"),$("body").animate({"padding-right":0}),i.animate({right:-320}),i.find("section").css("opacity",0)):($(this).addClass("sidebar-active"),$("body").animate({"padding-right":320}),i.animate({right:0},function(){i.find("section:first").animate({opacity:1})}))}),$(".site-nav-toggle").click(function(){$(".site-nav").slideToggle()}),$(document).ready(function(){setTimeout(function(){$(".logo-wrap").css("opacity",1),$(".logo-line-before i").animate({left:"0"},function(){$(".site-title").css("opacity",1).animate({top:0},function(){$(".menu").css("opacity",1).animate({"margin-top":"15px"}),$(".main").css("opacity",1).animate({top:"0"},function(){$(".b3-solo-list li").length>0&&$(window).width()>1e3&&$(".sidebar-toggle").click()})})}),$(".logo-line-after i").animate({right:"0"})},500)})},initArticle:function(){if($(".b3-solo-list li").length>0&&$(window).width()>1e3){$(".sidebar-toggle").addClass("has-toc");var i='<ul><li class="current" data-tab="toc">'+Label.tocLabel+'</li><li data-tab="site">'+Label.siteViewLabel+"</li></ul><section></section>";$(".sidebar").prepend(i);var t=$(".sidebar section:first").html($(".b3-solo-list")),a=$(".sidebar section:last");$(".sidebar > ul > li").click(function(){"toc"===$(this).data("tab")?a.animate({opacity:"0",top:"-50px"},300,function(){t.show().css("top","-50px"),t.animate({opacity:"1",top:"0"},300)}):t.animate({opacity:"0",top:"-50px"},300,function(){t.hide().css("top","-50px"),a.animate({opacity:"1",top:"0"},300)}),$(".sidebar > ul > li").removeClass("current"),$(this).addClass("current")})}}};NexT.init();