Commit 6ebabe3c authored by Liang Ding's avatar Liang Ding

Merge branch '2.9.2-dev'

parents ebb72f17 5f515552
This source diff could not be displayed because it is too large. You can view the blob instead.
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!-- <!--
Description: Solo POM. Description: Solo POM.
Version: 3.18.3.10, Jul 5, 2018 Version: 3.18.3.11, Jul 26, 2018
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>
Author: <a href="http://vanessa.b3log.org">Vanessa</a> Author: <a href="http://vanessa.b3log.org">Vanessa</a>
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
<artifactId>solo</artifactId> <artifactId>solo</artifactId>
<packaging>war</packaging> <packaging>war</packaging>
<name>Solo</name> <name>Solo</name>
<version>2.9.1</version> <version>2.9.2</version>
<description> <description>
A blogging system written in Java, feel free to create your or your team own blog. A blogging system written in Java, feel free to create your or your team own blog.
一个用 Java 实现的博客系统,为你或你的团队创建个博客吧! 一个用 Java 实现的博客系统,为你或你的团队创建个博客吧!
......
...@@ -61,7 +61,7 @@ import java.util.concurrent.locks.ReentrantLock; ...@@ -61,7 +61,7 @@ import java.util.concurrent.locks.ReentrantLock;
* 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.3.33, Jun 27, 2018 * @version 1.9.3.34, Jul 26, 2018
* @since 0.3.1 * @since 0.3.1
*/ */
public final class SoloServletListener extends AbstractServletListener { public final class SoloServletListener extends AbstractServletListener {
...@@ -74,7 +74,7 @@ public final class SoloServletListener extends AbstractServletListener { ...@@ -74,7 +74,7 @@ public final class SoloServletListener extends AbstractServletListener {
/** /**
* Solo version. * Solo version.
*/ */
public static final String VERSION = "2.9.1"; public static final String VERSION = "2.9.2";
/** /**
* Bean manager. * Bean manager.
......
...@@ -54,7 +54,7 @@ import java.sql.Statement; ...@@ -54,7 +54,7 @@ import java.sql.Statement;
* *
* @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.26, Jun 27, 2018 * @version 1.2.0.27, Jul 26, 2018
* @since 1.2.0 * @since 1.2.0
*/ */
@Service @Service
...@@ -78,7 +78,7 @@ public class UpgradeService { ...@@ -78,7 +78,7 @@ public class UpgradeService {
/** /**
* Old version. * Old version.
*/ */
private static final String FROM_VER = "2.9.0"; private static final String FROM_VER = "2.9.1";
/** /**
* New version. * New version.
......
This source diff could not be displayed because it is too large. You can view the blob instead.
...@@ -630,7 +630,7 @@ admin.editors.KindEditor = { ...@@ -630,7 +630,7 @@ admin.editors.KindEditor = {
* *
* @author <a href="http://vanessa.b3log.org">Liyuan Li</a> * @author <a href="http://vanessa.b3log.org">Liyuan Li</a>
* @author <a href="http://88250.b3log.org">Liang Ding</a> * @author <a href="http://88250.b3log.org">Liang Ding</a>
* @version 1.5.0.0, Mar 15, 2018 * @version 1.5.1.0, Jul 8, 2018
*/ */
Util.processClipBoard = function (text, cm) { Util.processClipBoard = function (text, cm) {
...@@ -877,6 +877,7 @@ admin.editors.CodeMirror = { ...@@ -877,6 +877,7 @@ admin.editors.CodeMirror = {
}, },
success: function (result, textStatus) { success: function (result, textStatus) {
$('#' + conf.id).parent().find('.CodeMirror-preview').html(result.html); $('#' + conf.id).parent().find('.CodeMirror-preview').html(result.html);
Util.parseMarkdown('content-reset');
hljs.initHighlighting.called = false; hljs.initHighlighting.called = false;
hljs.initHighlighting(); hljs.initHighlighting();
} }
......
This source diff could not be displayed because it is too large. You can view the blob instead.
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