Commit cb90a05e authored by Van's avatar Van

Merge remote-tracking branch 'origin/dev' into dev

parents 7597fe61 c42ca19d
name: Docker Image CI
on:
push:
branches:
- master
jobs:
build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@master
- name: Build the Docker image
run: |
docker login --username=${{ secrets.DOCKER_HUB_USER }} --password=${{ secrets.DOCKER_HUB_PWD }}
docker build -t b3log/solo:latest .
docker push b3log/solo
This diff is collapsed.
......@@ -18,6 +18,7 @@
package org.b3log.solo.util;
import com.vladsch.flexmark.ext.autolink.AutolinkExtension;
import com.vladsch.flexmark.ext.footnotes.FootnoteExtension;
import com.vladsch.flexmark.ext.gfm.strikethrough.StrikethroughExtension;
import com.vladsch.flexmark.ext.gfm.tasklist.TaskListExtension;
import com.vladsch.flexmark.ext.tables.TablesExtension;
......@@ -60,7 +61,7 @@ import java.util.concurrent.*;
* </p>
*
* @author <a href="http://88250.b3log.org">Liang Ding</a>
* @version 2.3.1.12, Jan 18, 2020
* @version 2.3.1.13, Jan 20, 2020
* @since 0.4.5
*/
public final class Markdowns {
......@@ -88,7 +89,8 @@ public final class Markdowns {
TablesExtension.create(),
TaskListExtension.create(),
StrikethroughExtension.create(),
AutolinkExtension.create())).
AutolinkExtension.create(),
FootnoteExtension.create())).
set(HtmlRenderer.SOFT_BREAK, "<br />\n");
/**
......
......@@ -83,7 +83,6 @@
</div>
</div>
</footer>
charset="utf-8"></script>
<#include "../../common-template/label.ftl">
<script type="text/javascript" src="${staticServePath}/skins/${skinDirName}/js/headroom.min.js"></script>
<script type="text/javascript"
......
#
# Solo - A small and beautiful blogging system written in Java.
# Copyright (c) 2010-present, b3log.org
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU Affero General Public License for more details.
#
# You should have received a copy of the GNU Affero General Public License
# along with this program. If not, see <https://www.gnu.org/licenses/>.
#
#
# Description: B3log Latke configurations for test.
# Version: 1.0.0.1, Feb 22, 2019
# Author: Liang Ding
#
#### Server ####
serverScheme=http
serverHost=localhost
serverPort=8080
#### Cookie ####
cookieName=solo
cookieSecret=Beyond
#### Runtime Mode ####
#runtimeMode=DEVELOPMENT
runtimeMode=PRODUCTION
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