Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
solo-1
Project overview
Project overview
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Administrator
solo-1
Commits
cb90a05e
Unverified
Commit
cb90a05e
authored
Jan 22, 2020
by
Van
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/dev' into dev
parents
7597fe61
c42ca19d
Changes
5
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
111 additions
and
150 deletions
+111
-150
.github/workflows/dockerimage.yml
.github/workflows/dockerimage.yml
+15
-0
package-lock.json
package-lock.json
+92
-111
src/main/java/org/b3log/solo/util/Markdowns.java
src/main/java/org/b3log/solo/util/Markdowns.java
+4
-2
src/main/resources/skins/Pinghsu/footer.ftl
src/main/resources/skins/Pinghsu/footer.ftl
+0
-1
src/test/resources/latke.properties
src/test/resources/latke.properties
+0
-36
No files found.
.github/workflows/dockerimage.yml
0 → 100644
View file @
cb90a05e
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
package-lock.json
View file @
cb90a05e
This diff is collapsed.
Click to expand it.
src/main/java/org/b3log/solo/util/Markdowns.java
View file @
cb90a05e
...
...
@@ -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.1
2, Jan 18
, 2020
* @version 2.3.1.1
3, 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"
);
/**
...
...
src/main/resources/skins/Pinghsu/footer.ftl
View file @
cb90a05e
...
...
@@ -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"
...
...
src/test/resources/latke.properties
deleted
100644 → 0
View file @
7597fe61
#
# 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
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment