Skip to content

S
solo-1
Commit 40577927 authored by D's avatar D Committed by GitHub
Browse files
Options

Merge pull request #12205 from b3log/1.7.0-dev 

1.7.0 dev
parents c1209b5e 8ae050ce
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 56 additions and 41 deletions
CHANGE_LOGS.html
View file @ 40577927
...@@ -5,6 +5,16 @@ ...@@ -5,6 +5,16 @@
<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.7.0 - Nov 9, 2016</h2>
<ul>
<li><a href="https://github.com/b3log/solo/issues/12182">12182 Windows 上 404 页面 404</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/12202">12202 使用 CDN 后编辑器图片框加载失败</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/12159">12159 新版 Markdown 编辑器</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/12160">12160 CDN 字体库加载慢</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/12164">12164 同步摘要时移除标签</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/12186">12186 移除 B3log 公告插件</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/12188">12188 完善单元测试</a>&nbsp;<span style='background: #e102d8 !important;color:#FFFFFF !important;padding: 1px 4px;'>development</span></li>
</ul>
<h2>Release 1.6.0 - Sep 8, 2016</h2> <h2>Release 1.6.0 - Sep 8, 2016</h2>
<ul> <ul>
<li><a href="https://github.com/b3log/solo/issues/12147">12147 用户管理翻页失败</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/12147">12147 用户管理翻页失败</a>&nbsp;<span style='background: #fc2929 !important;color:#FFFFFF !important;padding: 1px 4px;'>bug</span></li>
......
README.md
View file @ 40577927
...@@ -47,6 +47,7 @@ Solo 沉淀至今的**每一个功能你应该都会用到**。我们不会将 ...@@ -47,6 +47,7 @@ Solo 沉淀至今的**每一个功能你应该都会用到**。我们不会将
* Atom / RSS 订阅 * Atom / RSS 订阅
* Sitemap * Sitemap
* MetaWeblog API * MetaWeblog API
* CDN 静态资源分离
如果有新版可用，升级过程也是非常简单的，只需要重新部署新版本就可以，不用运行额外的任何脚本。 如果有新版可用，升级过程也是非常简单的，只需要重新部署新版本就可以，不用运行额外的任何脚本。
...@@ -67,9 +68,8 @@ JDK 环境准备好之后[下载](http://pan.baidu.com/share/link?shareid=541735 ...@@ -67,9 +68,8 @@ JDK 环境准备好之后[下载](http://pan.baidu.com/share/link?shareid=541735
## 技术 ## 技术
为了尽量降低服务器的内存占用，顺带尝试[一些技术构想](https://hacpai.com/article/1403847528022)，我们开发了 [Latke](https://github.com/b3log/latke) 框架，并在此基础上构建了 Solo、Sym、XiaoV 等产品。这些产品反过来也会对框架提出需求，这是一个相互促进，共同演化的良性发展过程。 * 后端框架：为了尽量降低服务器的内存占用，顺带尝试[一些技术构想](https://hacpai.com/article/1403847528022)，我们开发了 [Latke](https://github.com/b3log/latke) 框架，并在此基础上构建了 Solo、Sym、XiaoV 等产品。这些产品反过来也会对框架提出需求，这是一个相互促进，共同演化的良性发展过程
* 前端框架：Solo 的前端部分为了降低复杂度， 只依赖于 jQuery、编辑器、代码高亮等组件。管理后台的 SPA 框架、皮肤响应式 UI 都是我们自己实现的
Solo 的前端部分为了降低复杂度， 只依赖于 jQuery、编辑器、代码高亮等组件。管理后台的 SPA 框架、皮肤响应式 UI 都是我们自己实现的。
**没有最好的轮子，只有最适合的轮子。** BTW，如果你想研究如何制造 Web 轮子，Solo 是一个不错的入口。 **没有最好的轮子，只有最适合的轮子。** BTW，如果你想研究如何制造 Web 轮子，Solo 是一个不错的入口。
......
gulpfile.js
View file @ 40577927
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
* @file frontend tool. * @file frontend tool.
* *
* @author <a href="mailto:liliyuan@fangstar.net">Liyuan Li</a> * @author <a href="mailto:liliyuan@fangstar.net">Liyuan Li</a>
* @version 1.3.2.0, Oct 8, 2016 * @version 1.3.2.0, Nov 9, 2016
*/ */
'use strict'; 'use strict';
...@@ -43,8 +43,6 @@ gulp.task('build', function () { ...@@ -43,8 +43,6 @@ gulp.task('build', function () {
'./src/main/webapp/js/lib/jquery/file-upload-9.10.1/jquery.iframe-transport.js', './src/main/webapp/js/lib/jquery/file-upload-9.10.1/jquery.iframe-transport.js',
'./src/main/webapp/js/lib/jquery/file-upload-9.10.1/jquery.fileupload.js', './src/main/webapp/js/lib/jquery/file-upload-9.10.1/jquery.fileupload.js',
'./src/main/webapp/js/lib/jquery/jquery.bowknot.min.js', './src/main/webapp/js/lib/jquery/jquery.bowknot.min.js',
'./src/main/webapp/js/lib/tiny_mce/tiny_mce.js',
'./src/main/webapp/js/lib/KindEditor/kindeditor-min.js',
// codemirror // codemirror
'./src/main/webapp/js/lib/CodeMirrorEditor/codemirror.js', './src/main/webapp/js/lib/CodeMirrorEditor/codemirror.js',
'./src/main/webapp/js/lib/editor/placeholder.js', './src/main/webapp/js/lib/editor/placeholder.js',
......
pom.xml
View file @ 40577927
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!-- <!--
Description: Solo POM. Description: Solo POM.
Version: 3.15.1.28, Nov 8, 2016 Version: 3.15.1.28, Nov 9, 2016
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.6.0</version> <version>1.7.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 @ 40577927
...@@ -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.16, Sep 13, 2016 * @version 1.9.2.17, Nov 9, 2016
* @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.6.0"; public static final String VERSION = "1.7.0";
/** /**
* Logger. * Logger.
......
src/main/java/org/b3log/solo/service/UpgradeService.java
View file @ 40577927
...@@ -46,7 +46,7 @@ import org.json.JSONObject; ...@@ -46,7 +46,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.7, Sep 8, 2016 * @version 1.2.0.8, Nov 9, 2016
* @since 1.2.0 * @since 1.2.0
*/ */
@Service @Service
...@@ -111,7 +111,7 @@ public class UpgradeService { ...@@ -111,7 +111,7 @@ public class UpgradeService {
/** /**
* Old version. * Old version.
*/ */
private static final String FROM_VER = "1.5.0"; private static final String FROM_VER = "1.6.0";
/** /**
* New version. * New version.
......
src/main/webapp/CHANGE_LOGS.html
View file @ 40577927
...@@ -5,6 +5,16 @@ ...@@ -5,6 +5,16 @@
<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.7.0 - Nov 9, 2016</h2>
<ul>
<li><a href="https://github.com/b3log/solo/issues/12182">12182 Windows 上 404 页面 404</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/12202">12202 使用 CDN 后编辑器图片框加载失败</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/12159">12159 新版 Markdown 编辑器</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/12160">12160 CDN 字体库加载慢</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/12164">12164 同步摘要时移除标签</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/12186">12186 移除 B3log 公告插件</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/12188">12188 完善单元测试</a>&nbsp;<span style='background: #e102d8 !important;color:#FFFFFF !important;padding: 1px 4px;'>development</span></li>
</ul>
<h2>Release 1.6.0 - Sep 8, 2016</h2> <h2>Release 1.6.0 - Sep 8, 2016</h2>
<ul> <ul>
<li><a href="https://github.com/b3log/solo/issues/12147">12147 用户管理翻页失败</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/12147">12147 用户管理翻页失败</a>&nbsp;<span style='background: #fc2929 !important;color:#FFFFFF !important;padding: 1px 4px;'>bug</span></li>
......
src/main/webapp/admin-index.ftl
View file @ 40577927
...@@ -131,7 +131,8 @@ ...@@ -131,7 +131,8 @@
</div> </div>
</div> </div>
<script src="${staticServePath}/js/lib/compress/admin-lib.min.js"></script> <script src="${staticServePath}/js/lib/compress/admin-lib.min.js"></script>
<script src="${staticServePath}/js/lib/tiny_mce/tiny_mce.js"></script> <script src="${servePath}/js/lib/tiny_mce/tiny_mce.js"></script>
<script src="${servePath}/js/lib/KindEditor/kindeditor-min.js"></script>
<script src="${staticServePath}/js/common${miniPostfix}.js"></script> <script src="${staticServePath}/js/common${miniPostfix}.js"></script>
<#if "" == miniPostfix> <#if "" == miniPostfix>
<script src="${staticServePath}/js/admin/admin.js"></script> <script src="${staticServePath}/js/admin/admin.js"></script>
......
src/main/webapp/css/default-admin.css
View file @ 40577927
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
* admin style * admin style
* *
* @author <a href="http://vanessa.b3log.org">Liyuan Li</a> * @author <a href="http://vanessa.b3log.org">Liyuan Li</a>
* @version 2.1.6.3, Nov 8, 2016 * @version 2.1.6.4, Nov 9, 2016
*/ */
/* start resset */ /* start resset */
...@@ -633,7 +633,7 @@ a[class*=" icon-"]:hover { ...@@ -633,7 +633,7 @@ a[class*=" icon-"]:hover {
font-weight: 400; font-weight: 400;
text-align: center; text-align: center;
white-space: nowrap; white-space: nowrap;
vertical-align: middle; vertical-align: baseline;
cursor: pointer; cursor: pointer;
user-select: none; user-select: none;
background-image: none; background-image: none;
...@@ -643,6 +643,7 @@ a[class*=" icon-"]:hover { ...@@ -643,6 +643,7 @@ a[class*=" icon-"]:hover {
color: #fff; color: #fff;
height: auto; height: auto;
outline: none; outline: none;
line-height: 18px;
} }
.form button:hover { .form button:hover {
...@@ -823,35 +824,41 @@ button#submitArticle:hover, ...@@ -823,35 +824,41 @@ button#submitArticle:hover,
margin: 2px 12px 0 0; margin: 2px 12px 0 0;
} }
.completed-panel { .completed-panel {
background-color: #ECECEC; background-color: #fff;
border: 1px solid #CCCCCC; border: 1px solid #ddd;
color: #0000CC; color: #0000CC;
display: none; display: none;
overflow: auto; overflow: auto;
padding: 2px; padding: 2px;
position: absolute; position: absolute;
z-index: 10; z-index: 10;
width: 50%;
border-top: 0;
} }
.completed-panel a { .completed-panel a {
display: block; display: block;
text-decoration: none; text-decoration: none;
line-height: 26px;
padding: 0 5px;
} }
.completed-panel a.selected { .completed-panel a.selected {
background-color: #FFFFFF; background-color: #f5f5f5;
color: #D54121; color: #fa8564;
} }
.completed-ck { .completed-ck {
margin-top: 9px; margin-top: 9px;
} }
.completed-ck span { .completed-ck span,
.signs button {
margin: 5px 10px 5px 0; margin: 5px 10px 5px 0;
display: inline-block; display: inline-block;
background-color: #c7cbd6; background-color: #c7cbd6;
border-color: #c7cbd6; border-color: #c7cbd6;
} }
.completed-ck span:hover { .completed-ck span:hover,
.signs button:hover {
background-color: #b0b5b9; background-color: #b0b5b9;
border-color: #b0b5b9; border-color: #b0b5b9;
} }
......
src/main/webapp/js/admin/article.js
View file @ 40577927
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
* *
* @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.3.4.5, Nov 8, 2016 * @version 1.3.5.5, Nov 9, 2016
*/ */
admin.article = { admin.article = {
currentEditorType: '', currentEditorType: '',
...@@ -415,7 +415,7 @@ admin.article = { ...@@ -415,7 +415,7 @@ admin.article = {
height: 160, height: 160,
buttonText: Label.selectLabel, buttonText: Label.selectLabel,
data: tags data: tags
}); }).width($("#tag").parent().width() - 68);
$("#loadMsg").text(""); $("#loadMsg").text("");
} }
......
src/main/webapp/js/lib/compress/admin-lib.min.js
View file @ 40577927
This source diff could not be displayed because it is too large. You can view the blob instead.
src/main/webapp/skins/mobile/skin.properties
View file @ 40577927
...@@ -22,5 +22,5 @@ ...@@ -22,5 +22,5 @@
name=Mobile name=Mobile
version=0.1.5 version=0.1.5
forSolo=1.6.0 forSolo=1.7.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
src/main/webapp/skins/next/css/next.css
View file @ 40577927
/** /*!
* Copyright (c) 2010-2016, b3log.org & hacpai.com * Copyright (c) 2010-2016, b3log.org & hacpai.com
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
......
src/main/webapp/skins/next/css/next.min.css
View file @ 40577927
This diff is collapsed.
src/main/webapp/skins/next/skin.properties
View file @ 40577927
...@@ -22,5 +22,5 @@ ...@@ -22,5 +22,5 @@
name=next name=next
version=1.0.0 version=1.0.0
forSolo=1.6.0 forSolo=1.7.0
memo=https://github.com/iissnan/hexo-theme-next memo=https://github.com/iissnan/hexo-theme-next
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