Skip to content

S
solo-1
Commit c457ef0f authored by Liang Ding's avatar Liang Ding
Browse files
Options

🔖 Release 2.2.0

parent 3b9837b0
Show whitespace changes
Inline Side-by-side
Showing with 24 additions and 10 deletions
CHANGE_LOGS.html
View file @ c457ef0f
......@@ -26,6 +26,15 @@
</style>
</head>
<body>
<h2>Release 2.2.0 - Jul 10, 2017</h2>
<ul>
<li><a href="https://github.com/b3log/solo/issues/12293">12293 支持 Hexo/Jekyll 数据导入</a>&nbsp;<span style='background: #02e10c !important;color:#FFFFFF !important;padding: 1px 4px;'>feature</span></li>
<li><a href="https://github.com/b3log/solo/issues/12317">12317 引入新的 Markdown 引擎（NodeJS marked）</a>&nbsp;<span style='background: #02e10c !important;color:#FFFFFF !important;padding: 1px 4px;'>feature</span></li>
<li><a href="https://github.com/b3log/solo/issues/12299">12299 加密文章表单自适应</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/12304">12304 替换 MD 处理引擎</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/12307">12307 无效日志缩减</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/12308">12308 配置 MetaWeblog API 报错</a>&nbsp;<span style='background: #fc2929 !important;color:#FFFFFF !important;padding: 1px 4px;'>bug</span></li>
</ul>
<h2>Release 2.1.0 - May 25, 2017</h2>
<ul>
<li><a href="https://github.com/b3log/solo/issues/12284">12284 H2 SQL 文件导出</a>&nbsp;<span style='background: #02e10c !important;color:#FFFFFF !important;padding: 1px 4px;'>feature</span></li>
......
pom.xml
View file @ c457ef0f
<?xml version="1.0" encoding="UTF-8"?>
<!--
Description: Solo POM.
Version: 3.17.1.42, Jul 8, 2017
Version: 3.17.1.43, Jul 10, 2017
Author: <a href="http://88250.b3log.org">Liang Ding</a>
Author: <a href="http://www.annpeter.cn">Ann Peter</a>
Author: <a href="http://vanessa.b3log.org">Vanessa</a>
......@@ -14,7 +14,7 @@
<artifactId>solo</artifactId>
<packaging>war</packaging>
<name>Solo</name>
<version>2.1.0</version>
<version>2.2.0</version>
<description>
A blogging system written in Java, feel free to create your or your team own blog. 一个用 Java 实现的博客系统，为你或你的团队创建个博客吧！
</description>
......
src/main/java/org/b3log/solo/SoloServletListener.java
View file @ c457ef0f
......@@ -60,7 +60,7 @@ import java.util.concurrent.locks.ReentrantLock;
* Solo Servlet listener.
*
* @author <a href="http://88250.b3log.org">Liang Ding</a>
* @version 1.9.3.22, Jun 25, 2017
* @version 1.9.3.23, Jul 10, 2017
* @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 = "2.1.0";
public static final String VERSION = "2.2.0";
/**
* JSONO print indent factor.
......
src/main/java/org/b3log/solo/service/UpgradeService.java
View file @ c457ef0f
......@@ -51,7 +51,7 @@ import java.sql.Statement;
*
* @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.13, May 25, 2017
* @version 1.2.0.14, Jul 10, 2017
* @since 1.2.0
*/
@Service
......@@ -75,7 +75,7 @@ public class UpgradeService {
/**
* Old version.
*/
private static final String FROM_VER = "2.0.0";
private static final String FROM_VER = "2.1.0";
/**
* New version.
......@@ -175,10 +175,6 @@ public class UpgradeService {
versionOpt.put(Option.OPTION_VALUE, TO_VER);
optionRepository.update(Option.ID_C_VERSION, versionOpt);
final JSONObject editorTypeOpt = optionRepository.get(Option.ID_C_EDITOR_TYPE);
editorTypeOpt.put(Option.OPTION_VALUE, Option.DefaultPreference.DEFAULT_EDITOR_TYPE);
optionRepository.update(Option.ID_C_EDITOR_TYPE, editorTypeOpt);
transaction.commit();
LOGGER.log(Level.INFO, "Updated preference");
......
src/main/webapp/CHANGE_LOGS.html
View file @ c457ef0f
......@@ -26,6 +26,15 @@
</style>
</head>
<body>
<h2>Release 2.2.0 - Jul 10, 2017</h2>
<ul>
<li><a href="https://github.com/b3log/solo/issues/12293">12293 支持 Hexo/Jekyll 数据导入</a>&nbsp;<span style='background: #02e10c !important;color:#FFFFFF !important;padding: 1px 4px;'>feature</span></li>
<li><a href="https://github.com/b3log/solo/issues/12317">12317 引入新的 Markdown 引擎（NodeJS marked）</a>&nbsp;<span style='background: #02e10c !important;color:#FFFFFF !important;padding: 1px 4px;'>feature</span></li>
<li><a href="https://github.com/b3log/solo/issues/12299">12299 加密文章表单自适应</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/12304">12304 替换 MD 处理引擎</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/12307">12307 无效日志缩减</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/12308">12308 配置 MetaWeblog API 报错</a>&nbsp;<span style='background: #fc2929 !important;color:#FFFFFF !important;padding: 1px 4px;'>bug</span></li>
</ul>
<h2>Release 2.1.0 - May 25, 2017</h2>
<ul>
<li><a href="https://github.com/b3log/solo/issues/12284">12284 H2 SQL 文件导出</a>&nbsp;<span style='background: #02e10c !important;color:#FFFFFF !important;padding: 1px 4px;'>feature</span></li>
......
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