Skip to content

S
solo
Commit 88cdd063 authored by Liang Ding's avatar Liang Ding
Browse files
Options

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

parents 0da390b4 dfc70ab6
Hide whitespace changes
Inline Side-by-side
Showing with 20 additions and 8 deletions
CHANGE_LOGS.html
View file @ 88cdd063
...@@ -5,6 +5,12 @@ ...@@ -5,6 +5,12 @@
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
</head> </head>
<body> <body>
<h2>Release 1.9.0 - Jan 21, 2017</h2>
<ul>
<li><a href="https://github.com/b3log/solo/issues/12248">12248 回复提醒邮件模版丢失</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/12180">12180 新皮肤 9IPHP</a>&nbsp;<span style='background: #eb6420 !important;color:#FFFFFF !important;padding: 1px 4px;'>skin</span></li>
<li><a href="https://github.com/b3log/solo/issues/12240">12240 next 皮肤细节改进</a>&nbsp;<span style='background: #84b6eb !important;color:#FFFFFF !important;padding: 1px 4px;'>enhancement</span>&nbsp;<span style='background: #eb6420 !important;color:#FFFFFF !important;padding: 1px 4px;'>skin</span></li> <li><a href="https://github.com/b3log/solo/issues/12246">12246 添加评论优化</a>&nbsp;<span style='background: #e102d8 !important;color:#FFFFFF !important;padding: 1px 4px;'>development</span></li>
</ul>
<h2>Release 1.8.0 - Jan 23, 2017</h2> <h2>Release 1.8.0 - Jan 23, 2017</h2>
<ul> <ul>
<li><a href="https://github.com/b3log/solo/issues/12210">12210 七牛上传支持改进</a>&nbsp;<span style='background: #84b6eb !important;color:#FFFFFF !important;padding: 1px 4px;'>enhancement</span></li> <li><a href="https://github.com/b3log/solo/issues/12210">12210 七牛上传支持改进</a>&nbsp;<span style='background: #84b6eb !important;color:#FFFFFF !important;padding: 1px 4px;'>enhancement</span></li>
......
pom.xml
View file @ 88cdd063
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!-- <!--
Description: Solo POM. Description: Solo POM.
Version: 3.15.1.30, Feb 13, 2017 Version: 3.15.1.31, Feb 20, 2017
Author: <a href="http://88250.b3log.org">Liang Ding</a> Author: <a href="http://88250.b3log.org">Liang Ding</a>
Author: <a href="http://www.annpeter.cn">Ann Peter</a> Author: <a href="http://www.annpeter.cn">Ann Peter</a>
--> -->
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
<artifactId>solo</artifactId> <artifactId>solo</artifactId>
<packaging>war</packaging> <packaging>war</packaging>
<name>Solo</name> <name>Solo</name>
<version>1.8.0</version> <version>1.9.0</version>
<description> <description>
A blogging system written in Java, feel free to create your or your team own blog. 一个用 Java 实现的博客系统，为你或你的团队创建个博客吧。 A blogging system written in Java, feel free to create your or your team own blog. 一个用 Java 实现的博客系统，为你或你的团队创建个博客吧。
</description> </description>
......
src/main/java/org/b3log/solo/SoloServletListener.java
View file @ 88cdd063
...@@ -60,7 +60,7 @@ import org.json.JSONObject; ...@@ -60,7 +60,7 @@ import org.json.JSONObject;
* Solo Servlet listener. * Solo Servlet listener.
* *
* @author <a href="http://88250.b3log.org">Liang Ding</a> * @author <a href="http://88250.b3log.org">Liang Ding</a>
* @version 1.9.2.18, Jan 23, 2017 * @version 1.9.2.19, Feb 20, 2017
* @since 0.3.1 * @since 0.3.1
*/ */
public final class SoloServletListener extends AbstractServletListener { public final class SoloServletListener extends AbstractServletListener {
...@@ -68,7 +68,7 @@ public final class SoloServletListener extends AbstractServletListener { ...@@ -68,7 +68,7 @@ public final class SoloServletListener extends AbstractServletListener {
/** /**
* Solo version. * Solo version.
*/ */
public static final String VERSION = "1.8.0"; public static final String VERSION = "1.9.0";
/** /**
* Logger. * Logger.
......
src/main/java/org/b3log/solo/service/UpgradeService.java
View file @ 88cdd063
...@@ -47,7 +47,7 @@ import org.json.JSONObject; ...@@ -47,7 +47,7 @@ import org.json.JSONObject;
* *
* @author <a href="http://88250.b3log.org">Liang Ding</a> * @author <a href="http://88250.b3log.org">Liang Ding</a>
* @author <a href="mailto:dongxu.wang@acm.org">Dongxu Wang</a> * @author <a href="mailto:dongxu.wang@acm.org">Dongxu Wang</a>
* @version 1.2.0.9, Jan 23, 2017 * @version 1.2.0.10, Feb 20, 2017
* @since 1.2.0 * @since 1.2.0
*/ */
@Service @Service
...@@ -112,7 +112,7 @@ public class UpgradeService { ...@@ -112,7 +112,7 @@ public class UpgradeService {
/** /**
* Old version. * Old version.
*/ */
private static final String FROM_VER = "1.7.0"; private static final String FROM_VER = "1.8.0";
/** /**
* New version. * New version.
......
src/main/webapp/CHANGE_LOGS.html
View file @ 88cdd063
...@@ -5,6 +5,12 @@ ...@@ -5,6 +5,12 @@
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
</head> </head>
<body> <body>
<h2>Release 1.9.0 - Jan 21, 2017</h2>
<ul>
<li><a href="https://github.com/b3log/solo/issues/12248">12248 回复提醒邮件模版丢失</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/12180">12180 新皮肤 9IPHP</a>&nbsp;<span style='background: #eb6420 !important;color:#FFFFFF !important;padding: 1px 4px;'>skin</span></li>
<li><a href="https://github.com/b3log/solo/issues/12240">12240 next 皮肤细节改进</a>&nbsp;<span style='background: #84b6eb !important;color:#FFFFFF !important;padding: 1px 4px;'>enhancement</span>&nbsp;<span style='background: #eb6420 !important;color:#FFFFFF !important;padding: 1px 4px;'>skin</span></li> <li><a href="https://github.com/b3log/solo/issues/12246">12246 添加评论优化</a>&nbsp;<span style='background: #e102d8 !important;color:#FFFFFF !important;padding: 1px 4px;'>development</span></li>
</ul>
<h2>Release 1.8.0 - Jan 23, 2017</h2> <h2>Release 1.8.0 - Jan 23, 2017</h2>
<ul> <ul>
<li><a href="https://github.com/b3log/solo/issues/12210">12210 七牛上传支持改进</a>&nbsp;<span style='background: #84b6eb !important;color:#FFFFFF !important;padding: 1px 4px;'>enhancement</span></li> <li><a href="https://github.com/b3log/solo/issues/12210">12210 七牛上传支持改进</a>&nbsp;<span style='background: #84b6eb !important;color:#FFFFFF !important;padding: 1px 4px;'>enhancement</span></li>
......
src/main/webapp/skins/mobile/skin.properties
View file @ 88cdd063
...@@ -16,11 +16,11 @@ ...@@ -16,11 +16,11 @@
# #
# Description: Mobile skin. # Description: Mobile skin.
# Version: 1.0.0.14, Aug 10, 2016 # Version: 1.0.0.15, Feb 20, 2017
# Author: Liang Ding # Author: Liang Ding
# #
name=Mobile name=Mobile
version=0.1.5 version=0.1.5
forSolo=1.8.0 forSolo=1.9.0
memo=\u8bf7\u4e0d\u8981\u4ece\u90e8\u7f72\u76ee\u5f55\u4e2d\u5220\u9664\u8be5\u76ae\u80a4\uff0c\u5426\u5219\u79fb\u52a8\u8bbe\u5907\u8bbf\u95ee\u65f6\u535a\u5ba2\u5c06\u4e0d\u53ef\u7528\u3002 memo=\u8bf7\u4e0d\u8981\u4ece\u90e8\u7f72\u76ee\u5f55\u4e2d\u5220\u9664\u8be5\u76ae\u80a4\uff0c\u5426\u5219\u79fb\u52a8\u8bbe\u5907\u8bbf\u95ee\u65f6\u535a\u5ba2\u5c06\u4e0d\u53ef\u7528\u3002
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment