Skip to content

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

Release 0.6.9

parent 5ac528b3
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 269 additions and 251 deletions
CHANGE_LOGS.html
View file @ f0681b52
......@@ -5,6 +5,15 @@
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
</head>
<body>
<h2>Release 0.6.9 - Jun 28, 2015</h2>
<ul>
<li><a href="https://github.com/b3log/solo/issues/12019">12019 新皮肤 - Finding</a>&nbsp;<span style='background: #eb6420 !important;color:#FFFFFF !important;padding: 1px 4px;'>skin</span></li> <li><a href="https://github.com/b3log/solo/issues/12020">12020 加入开发者、贡献者名单</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/12015">12015 Gravatar 默认配置</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/12013">12013 搜索引擎优化</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/12012">12012 编辑器类型切换</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/12009">12009 可以使用中文逗号分割标签</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/12014">12014 项目重命名</a>&nbsp;<span style='background: #e102d8 !important;color:#FFFFFF !important;padding: 1px 4px;'>development</span></li>
</ul>
<h2>Release 0.6.8 - Mar 24, 2015</h2>
<ul>
<li><a href="https://github.com/b3log/b3log-solo/issues/11992">11992 可配置 favicon 获取</a>&nbsp;<span style='background: #02e10c !important;color:#FFFFFF !important;padding: 1px 4px;'>feature</span></li>
......
core/pom.xml
View file @ f0681b52
This diff is collapsed.
core/src/main/java/org/b3log/solo/SoloServletListener.java
View file @ f0681b52
......@@ -15,7 +15,6 @@
*/
package org.b3log.solo;
import java.util.ResourceBundle;
import javax.servlet.ServletContextEvent;
import javax.servlet.ServletRequestEvent;
......@@ -50,12 +49,11 @@ import org.b3log.solo.service.StatisticMgmtService;
import org.b3log.solo.util.Skins;
import org.json.JSONObject;
/**
* Solo servlet listener.
*
* @author <a href="http://88250.b3log.org">Liang Ding</a>
* @version 1.2.0.7, Jun 18, 2015
* @version 1.3.0.7, Jun 28, 2015
* @since 0.3.1
*/
public final class SoloServletListener extends AbstractServletListener {
......@@ -63,7 +61,7 @@ public final class SoloServletListener extends AbstractServletListener {
/**
* Solo version.
*/
public static final String VERSION = "0.6.8";
public static final String VERSION = "0.6.9";
/**
* Logger.
......@@ -155,11 +153,13 @@ public final class SoloServletListener extends AbstractServletListener {
}
@Override
public void sessionCreated(final HttpSessionEvent httpSessionEvent) {}
public void sessionCreated(final HttpSessionEvent httpSessionEvent) {
}
// Note: This method will never invoked on GAE production environment
@Override
public void sessionDestroyed(final HttpSessionEvent httpSessionEvent) {}
public void sessionDestroyed(final HttpSessionEvent httpSessionEvent) {
}
@Override
public void requestInitialized(final ServletRequestEvent servletRequestEvent) {
......@@ -179,7 +179,7 @@ public final class SoloServletListener extends AbstractServletListener {
final HttpSession session = httpServletRequest.getSession();
LOGGER.log(Level.DEBUG, "Gets a session[id={0}, remoteAddr={1}, User-Agent={2}, isNew={3}]", session.getId(),
httpServletRequest.getRemoteAddr(), httpServletRequest.getHeader("User-Agent"), session.isNew());
httpServletRequest.getRemoteAddr(), httpServletRequest.getHeader("User-Agent"), session.isNew());
// Online visitor count
final StatisticMgmtService statisticMgmtService = beanManager.getReference(StatisticMgmtService.class);
......@@ -203,7 +203,8 @@ public final class SoloServletListener extends AbstractServletListener {
* Loads preference.
*
* <p>
* Loads preference from repository, loads skins from skin directory then sets it into preference if the skins changed.
* Loads preference from repository, loads skins from skin directory then sets it into preference if the skins
* changed.
* </p>
*/
private void loadPreference() {
......
core/src/main/java/org/b3log/solo/processor/UpgradeProcessor.java
View file @ f0681b52
......@@ -15,7 +15,6 @@
*/
package org.b3log.solo.processor;
import java.io.IOException;
import javax.inject.Inject;
import org.b3log.latke.Keys;
......@@ -41,13 +40,12 @@ import org.json.JSONArray;
import org.json.JSONException;
import org.json.JSONObject;
/**
* Upgrader.
*
* @author <a href="http://88250.b3log.org">Liang Ding</a>
* @author <a href="mailto:dongxu.wang@acm.org">Dongxu Wang</a>
* @version 1.1.1.14, Mar 24, 2015
* @version 1.2.1.14, Jun 28, 2015
* @since 0.3.1
*/
@RequestProcessor
......@@ -106,7 +104,7 @@ public class UpgradeProcessor {
/**
* Old version.
*/
private static final String FROM_VER = "0.6.7";
private static final String FROM_VER = "0.6.8";
/**
* New version.
......@@ -158,9 +156,9 @@ public class UpgradeProcessor {
} catch (final Exception e) {
LOGGER.log(Level.ERROR, e.getMessage(), e);
renderer.setContent(
"Upgrade failed [" + e.getMessage() + "], please contact the Solo developers or reports this "
+ "issue directly (<a href='https://github.com/b3log/solo/issues/new'>"
+ "https://github.com/b3log/solo/issues/new</a>) ");
"Upgrade failed [" + e.getMessage() + "], please contact the Solo developers or reports this "
+ "issue directly (<a href='https://github.com/b3log/solo/issues/new'>"
+ "https://github.com/b3log/solo/issues/new</a>) ");
}
}
......@@ -200,11 +198,11 @@ public class UpgradeProcessor {
/**
* Upgrades users.
*
*
* <p>
* Password hashing.
* </p>
*
*
* @throws Exception exception
*/
private void upgradeUsers() throws Exception {
......@@ -275,7 +273,7 @@ public class UpgradeProcessor {
/**
* Send an email to the user who upgrades Solo with a discontinuous version.
*
*
* @throws ServiceException ServiceException
* @throws JSONException JSONException
* @throws IOException IOException
......
pom.xml
View file @ f0681b52
<?xml version="1.0" encoding="UTF-8"?>
<!--
Description: Solo parent POM.
Version: 2.3.4.20, May 25, 2015
Version: 2.4.4.20, Jun 28, 2015
Author: Liang Ding
-->
<project xmlns="http://maven.apache.org/POM/4.0.0"
......@@ -11,7 +11,7 @@
<groupId>org.b3log</groupId>
<artifactId>solo</artifactId>
<packaging>pom</packaging>
<version>0.6.8</version>
<version>0.6.9</version>
<name>Solo</name>
<url>https://github.com/b3log/solo</url>
<description>
......
war/gae/pom.xml
View file @ f0681b52
<?xml version="1.0" encoding="UTF-8"?>
<!--
Description: Solo GAE POM.
Version: 2.1.2.7, Mar 24, 2015
Version: 2.2.2.7, Jun 28, 2015
Author: Liang Ding
-->
<project xmlns="http://maven.apache.org/POM/4.0.0"
......@@ -18,7 +18,7 @@
<parent>
<groupId>org.b3log</groupId>
<artifactId>solo-war</artifactId>
<version>0.6.8</version>
<version>0.6.9</version>
</parent>
<properties>
......
war/gae/src/main/resources/latke.properties
View file @ f0681b52
......@@ -16,7 +16,7 @@
#
# Description: B3log Latke configurations. Configures the section "Server" carefully.
# Version: 1.0.1.5, Mar 24, 2015
# Version: 1.1.1.5, Jun 28, 2015
# Author: Liang Ding
#
......@@ -52,4 +52,4 @@ cache=GAE
userService=LOCAL
#### Static resource version ####
staticResourceVersion=201503241200
\ No newline at end of file
staticResourceVersion=201506281200
\ No newline at end of file
war/h2/pom.xml
View file @ f0681b52
<?xml version="1.0" encoding="UTF-8"?>
<!--
Description: Solo (H2) standard Servlet container POM.
Version: 1.1.0.5, Mar 24, 2015
Version: 1.2.0.5, Jun 28, 2015
Author: Liang Ding
-->
<project xmlns="http://maven.apache.org/POM/4.0.0"
......@@ -19,7 +19,7 @@
<parent>
<groupId>org.b3log</groupId>
<artifactId>solo-war</artifactId>
<version>0.6.8</version>
<version>0.6.9</version>
</parent>
<properties>
......
war/h2/src/main/resources/latke.properties
View file @ f0681b52
......@@ -16,7 +16,7 @@
#
# Description: B3log Latke configurations. Configures the section "Server" carefully.
# Version: 1.0.1.5, Mar 24, 2015
# Version: 1.1.1.5, Jun 28, 2015
# Author: Liang Ding
#
......@@ -52,4 +52,4 @@ cache=LOCAL
userService=LOCAL
#### Static resource version ####
staticResourceVersion=201503241200
\ No newline at end of file
staticResourceVersion=201506281200
\ No newline at end of file
war/mysql/pom.xml
View file @ f0681b52
<?xml version="1.0" encoding="UTF-8"?>
<!--
Description: Solo (MySQL) standard Servlet container POM.
Version: 1.1.1.6, Mar 24, 2015
Version: 1.2.1.6, Jun 28, 2015
Author: Liang Ding
-->
<project xmlns="http://maven.apache.org/POM/4.0.0"
......@@ -18,7 +18,7 @@
<parent>
<groupId>org.b3log</groupId>
<artifactId>solo-war</artifactId>
<version>0.6.8</version>
<version>0.6.9</version>
</parent>
<properties>
......
war/mysql/src/main/resources/latke.properties
View file @ f0681b52
......@@ -16,17 +16,17 @@
#
# Description: B3log Latke configurations. Configures the section "Server" carefully.
# Version: 1.0.1.5, Mar 24, 2015
# Version: 1.1.1.5, Jun 28, 2015
# Author: Liang Ding
#
#### Server ####
# Configures the followings before deploy
serverScheme=http
serverHost=192.168.80.11
serverHost=localhost
serverPort=8080
staticServerScheme=http
staticServerHost=192.168.80.11
staticServerHost=localhost
staticServerPort=8080
# Note: The context path and static path should be "" if deploy app on ROOT. For other cases, starts with '/'
# and not ends with '/', for example, /blog
......@@ -52,4 +52,4 @@ cache=LOCAL
userService=LOCAL
#### Static resource version ####
staticResourceVersion=201503241200
\ No newline at end of file
staticResourceVersion=201506281200
\ No newline at end of file
war/pom.xml
View file @ f0681b52
<?xml version="1.0" encoding="UTF-8"?>
<!--
Description: Solo WAR POM.
Version: 2.1.2.11, Mar 24, 2015
Version: 2.2.2.11, Jun 28, 2015
Author: Liang Ding
-->
<project xmlns="http://maven.apache.org/POM/4.0.0"
......@@ -18,7 +18,7 @@
<parent>
<groupId>org.b3log</groupId>
<artifactId>solo</artifactId>
<version>0.6.8</version>
<version>0.6.9</version>
</parent>
<modules>
......
war/src/main/webapp/CHANGE_LOGS.html
View file @ f0681b52
......@@ -5,6 +5,15 @@
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
</head>
<body>
<h2>Release 0.6.9 - Jun 28, 2015</h2>
<ul>
<li><a href="https://github.com/b3log/solo/issues/12019">12019 新皮肤 - Finding</a>&nbsp;<span style='background: #eb6420 !important;color:#FFFFFF !important;padding: 1px 4px;'>skin</span></li> <li><a href="https://github.com/b3log/solo/issues/12020">12020 加入开发者、贡献者名单</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/12015">12015 Gravatar 默认配置</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/12013">12013 搜索引擎优化</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/12012">12012 编辑器类型切换</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/12009">12009 可以使用中文逗号分割标签</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/12014">12014 项目重命名</a>&nbsp;<span style='background: #e102d8 !important;color:#FFFFFF !important;padding: 1px 4px;'>development</span></li>
</ul>
<h2>Release 0.6.8 - Mar 24, 2015</h2>
<ul>
<li><a href="https://github.com/b3log/b3log-solo/issues/11992">11992 可配置 favicon 获取</a>&nbsp;<span style='background: #02e10c !important;color:#FFFFFF !important;padding: 1px 4px;'>feature</span></li>
......
war/src/main/webapp/WEB-INF/appengine-web.xml
View file @ f0681b52
......@@ -20,12 +20,12 @@
Description: Web deployment descriptor on GAE. See
http://code.google.com/intl/en/appengine/docs/java/config/appconfig.html
for more details.
Version: 1.1.5.6, Mar 24, 2015
Version: 1.2.5.6, Jun 28, 2015
Author: Liang Ding
-->
<appengine-web-app xmlns="http://appengine.google.com/ns/1.0">
<application>solo-demo</application>
<version>068</version>
<version>069</version>
<sessions-enabled>true</sessions-enabled>
......
war/src/main/webapp/admin-about.ftl
View file @ f0681b52
......@@ -47,9 +47,10 @@
</div>
<div class="module-body padding12 about-developer">
<div class="about-logo">
<a href="http://b3log.org" target="_blank">
<img src="${staticServePath}/images/developers.jpg" alt="Solo" title="Solo" />
</a>
<!-- <a href="http://b3log.org" target="_blank">
<img src="${staticServePath}/images/developers.jpg" alt="Solo" title="Solo" />
</a>-->
<div style="width: 156px; height: 56px;"></div>
</div>
<div class="about-body">
<div class="left" style="width: 73%">
......
war/src/main/webapp/skins/mobile/skin.properties
View file @ f0681b52
......@@ -16,11 +16,11 @@
#
# Description: Mobile skin.
# Version: 1.0.0.11, Mar 24, 2015
# Version: 1.0.0.12, Jun 28, 2015
# Author: Liang Ding
#
name=Mobile
version=0.1.5
forSolo=0.6.8
forSolo=0.6.9
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
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