Skip to content

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

Merge remote-tracking branch 'refs/remotes/origin/2.0.0-dev'

parents 6093d4be e19fb72f
Hide whitespace changes
Inline Side-by-side
Showing with 29 additions and 15 deletions
CHANGE_LOGS.html
View file @ a6356478
...@@ -5,6 +5,13 @@ ...@@ -5,6 +5,13 @@
<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 2.0.0 - Apr 14, 2017</h2>
<ul>
<li><a href="https://github.com/b3log/solo/issues/12256">12256 支持文章分类</a>&nbsp;<span style='background: #02e10c !important;color:#FFFFFF !important;padding: 1px 4px;'>feature</span></li>
<li><a href="https://github.com/b3log/solo/issues/12251">12251 部分皮肤的作者文章列表页摘要转义</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/12258">12258 NeoEase 图片样式</a>&nbsp;<span style='background: #fc2929 !important;color:#FFFFFF !important;padding: 1px 4px;'>bug</span>&nbsp;<span style='background: #eb6420 !important;color:#FFFFFF !important;padding: 1px 4px;'>skin</span></li>
<li><a href="https://github.com/b3log/solo/issues/12255">12255 皮肤修改</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/12264">12264 文章页面 SEO 优化</a>&nbsp;<span style='background: #84b6eb !important;color:#FFFFFF !important;padding: 1px 4px;'>enhancement</span></li>
</ul>
<h2>Release 1.9.0 - Feb 21, 2017</h2> <h2>Release 1.9.0 - Feb 21, 2017</h2>
<ul> <ul>
<li><a href="https://github.com/b3log/solo/issues/12248">12248 回复提醒邮件模版丢失</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/12248">12248 回复提醒邮件模版丢失</a>&nbsp;<span style='background: #fc2929 !important;color:#FFFFFF !important;padding: 1px 4px;'>bug</span></li>
...@@ -73,11 +80,11 @@ ...@@ -73,11 +80,11 @@
<li><a href="https://github.com/b3log/solo/issues/12040">12040 调整升级机制</a>&nbsp;<span style='background: #e102d8 !important;color:#FFFFFF !important;padding: 1px 4px;'>development</span></li> <li><a href="https://github.com/b3log/solo/issues/12040">12040 调整升级机制</a>&nbsp;<span style='background: #e102d8 !important;color:#FFFFFF !important;padding: 1px 4px;'>development</span></li>
</ul> </ul>
<h2>Release 1.1.0 - Oct 1, 2015</h2> <h2>Release 1.1.0 - Oct 1, 2015</h2>
<ul> <ul>
<li><a href="https://github.com/b3log/solo/issues/12031" rel="nofollow" target="_blank">12031 Bruce 皮肤细节</a></li> <li><a href="https://github.com/b3log/solo/issues/12031" rel="nofollow" target="_blank">12031 Bruce 皮肤细节</a></li>
<li><a href="https://github.com/b3log/solo/issues/12032" rel="nofollow" target="_blank">12032 七牛配置增强</a></li> <li><a href="https://github.com/b3log/solo/issues/12032" rel="nofollow" target="_blank">12032 七牛配置增强</a></li>
<li><a href="https://github.com/b3log/solo/issues/12030" rel="nofollow" target="_blank">12030 项目结构调整</a></li> <li><a href="https://github.com/b3log/solo/issues/12030" rel="nofollow" target="_blank">12030 项目结构调整</a></li>
<li><a href="https://github.com/b3log/solo/issues/12033" rel="nofollow" target="_blank">12033 默认订阅输出 RSS</a></li> <li><a href="https://github.com/b3log/solo/issues/12033" rel="nofollow" target="_blank">12033 默认订阅输出 RSS</a></li>
</ul> </ul>
<h2>Release 1.0.0 - Sep 16, 2015</h2> <h2>Release 1.0.0 - Sep 16, 2015</h2>
<ul> <ul>
......
src/main/webapp/CHANGE_LOGS.html
View file @ a6356478
...@@ -5,6 +5,13 @@ ...@@ -5,6 +5,13 @@
<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 2.0.0 - Apr 14, 2017</h2>
<ul>
<li><a href="https://github.com/b3log/solo/issues/12256">12256 支持文章分类</a>&nbsp;<span style='background: #02e10c !important;color:#FFFFFF !important;padding: 1px 4px;'>feature</span></li>
<li><a href="https://github.com/b3log/solo/issues/12251">12251 部分皮肤的作者文章列表页摘要转义</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/12258">12258 NeoEase 图片样式</a>&nbsp;<span style='background: #fc2929 !important;color:#FFFFFF !important;padding: 1px 4px;'>bug</span>&nbsp;<span style='background: #eb6420 !important;color:#FFFFFF !important;padding: 1px 4px;'>skin</span></li>
<li><a href="https://github.com/b3log/solo/issues/12255">12255 皮肤修改</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/12264">12264 文章页面 SEO 优化</a>&nbsp;<span style='background: #84b6eb !important;color:#FFFFFF !important;padding: 1px 4px;'>enhancement</span></li>
</ul>
<h2>Release 1.9.0 - Feb 21, 2017</h2> <h2>Release 1.9.0 - Feb 21, 2017</h2>
<ul> <ul>
<li><a href="https://github.com/b3log/solo/issues/12248">12248 回复提醒邮件模版丢失</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/12248">12248 回复提醒邮件模版丢失</a>&nbsp;<span style='background: #fc2929 !important;color:#FFFFFF !important;padding: 1px 4px;'>bug</span></li>
......
src/main/webapp/admin-index.ftl
View file @ a6356478
...@@ -133,7 +133,7 @@ ...@@ -133,7 +133,7 @@
</div> </div>
<div class="clear"></div> <div class="clear"></div>
<div class="footer"> <div class="footer">
Powered by <a href="http://b3log.org" target="_blank">B3log 开源</a> • <a href="http://b3log.org/services/#solo" target="_blank">Solo</a> ${version} Powered by <a href="http://b3log.org" target="_blank">B3log 开源</a> • <a href="https://hacpai.com/tag/solo" target="_blank">Solo</a> ${version}
</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>
......
src/main/webapp/article-pwd.ftl
View file @ a6356478
...@@ -52,7 +52,7 @@ ...@@ -52,7 +52,7 @@
<div class="footerWrapper"> <div class="footerWrapper">
<div class="footer"> <div class="footer">
&copy; ${year} - <a href="${servePath}">${blogTitle}</a><br/> &copy; ${year} - <a href="${servePath}">${blogTitle}</a><br/>
Powered by <a href="http://b3log.org" target="_blank">B3log 开源</a> • <a href="http://b3log.org/services/#solo" target="_blank">Solo</a> ${version} Powered by <a href="http://b3log.org" target="_blank">B3log 开源</a> • <a href="https://hacpai.com/tag/solo" target="_blank">Solo</a> ${version}
</div> </div>
</div> </div>
</div> </div>
......
src/main/webapp/init.ftl
View file @ a6356478
...@@ -122,7 +122,7 @@ ...@@ -122,7 +122,7 @@
<div class="footerWrapper"> <div class="footerWrapper">
<div class="footer"> <div class="footer">
&copy; ${year} &copy; ${year}
Powered by <a href="http://b3log.org" target="_blank">B3log 开源</a> • <a href="http://b3log.org/services/#solo" target="_blank">Solo</a> ${version} Powered by <a href="http://b3log.org" target="_blank">B3log 开源</a> • <a href="https://hacpai.com/tag/solo" target="_blank">Solo</a> ${version}
</div> </div>
</div> </div>
</div> </div>
......
src/main/webapp/login.ftl
View file @ a6356478
...@@ -50,7 +50,7 @@ ...@@ -50,7 +50,7 @@
<div class="footerWrapper"> <div class="footerWrapper">
<div class="footer"> <div class="footer">
&copy; ${year} - <a href="${servePath}">${blogTitle}</a><br/> &copy; ${year} - <a href="${servePath}">${blogTitle}</a><br/>
Powered by <a href="http://b3log.org" target="_blank">B3log 开源</a> • <a href="http://b3log.org/services/#solo" target="_blank">Solo</a> ${version} Powered by <a href="http://b3log.org" target="_blank">B3log 开源</a> • <a href="https://hacpai.com/tag/solo" target="_blank">Solo</a> ${version}
</div> </div>
</div> </div>
</div> </div>
......
src/main/webapp/register.ftl
View file @ a6356478
...@@ -57,7 +57,7 @@ ...@@ -57,7 +57,7 @@
<div class="footerWrapper"> <div class="footerWrapper">
<div class="footer"> <div class="footer">
&copy; ${year} - <a href="${servePath}">${blogTitle}</a><br/> &copy; ${year} - <a href="${servePath}">${blogTitle}</a><br/>
Powered by <a href="http://b3log.org" target="_blank">B3log 开源</a> • <a href="http://b3log.org/services/#solo" target="_blank">Solo</a> ${version} Powered by <a href="http://b3log.org" target="_blank">B3log 开源</a> • <a href="https://hacpai.com/tag/solo" target="_blank">Solo</a> ${version}
</div> </div>
</div> </div>
</div> </div>
......
src/main/webapp/reset-pwd.ftl
View file @ a6356478
...@@ -61,7 +61,7 @@ ...@@ -61,7 +61,7 @@
<div class="footerWrapper"> <div class="footerWrapper">
<div class="footer"> <div class="footer">
&copy; ${year} - <a href="${servePath}">${blogTitle}</a><br/> &copy; ${year} - <a href="${servePath}">${blogTitle}</a><br/>
Powered by <a href="http://b3log.org" target="_blank">B3log 开源</a> • <a href="http://b3log.org/services/#solo" target="_blank">Solo</a> ${version} Powered by <a href="http://b3log.org" target="_blank">B3log 开源</a> • <a href="https://hacpai.com/tag/solo" target="_blank">Solo</a> ${version}
</div> </div>
</div> </div>
</div> </div>
......
src/main/webapp/skins/9IPHP/footer.ftl
View file @ a6356478
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
&copy; ${year} &copy; ${year}
${footerContent} ${footerContent}
<a href="${servePath}">${blogTitle}</a> &nbsp; • &nbsp; <a href="${servePath}">${blogTitle}</a> &nbsp; • &nbsp;
<a href="http://b3log.org/services/#solo" target="_blank">Solo</a> ${version} <br/> <a href="https://hacpai.com/tag/solo" target="_blank">Solo</a> ${version} <br/>
Powered by <a href="http://b3log.org" target="_blank">B3log</a> 开源 &nbsp; Powered by <a href="http://b3log.org" target="_blank">B3log</a> 开源 &nbsp;
<span class="ft-warn">&heartsuit;</span> <span class="ft-warn">&heartsuit;</span>
......
src/main/webapp/skins/9IPHP/skin.properties
View file @ a6356478
...@@ -22,5 +22,5 @@ ...@@ -22,5 +22,5 @@
name=9IPHP name=9IPHP
version=1.0.0 version=1.0.0
forSolo=1.9.0 forSolo=2.0.0
memo=https://github.com/9IPHP memo=https://github.com/9IPHP
src/main/webapp/skins/mobile/footer.ftl
View file @ a6356478
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
<script type="text/javascript">function switch_delayer() { location.reload();}</script>${mobileLabel} <a id="switch-link" onclick="wptouch_switch_confirmation('normal');" href="javascript:void(0)"></a> </div> <script type="text/javascript">function switch_delayer() { location.reload();}</script>${mobileLabel} <a id="switch-link" onclick="wptouch_switch_confirmation('normal');" href="javascript:void(0)"></a> </div>
</center> </center>
<p><span style="color: gray;">&copy; ${year}</span> - <a href="${servePath}">${blogTitle}</a>${footerContent}</p> <p><span style="color: gray;">&copy; ${year}</span> - <a href="${servePath}">${blogTitle}</a>${footerContent}</p>
<p>Powered by <a href="http://b3log.org" target="_blank">B3log 开源</a> • <a href="http://b3log.org/services/#solo" target="_blank">Solo</a> ${version}, <p>Powered by <a href="http://b3log.org" target="_blank">B3log 开源</a> • <a href="https://hacpai.com/tag/solo" target="_blank">Solo</a> ${version},
Theme by <a rel="friend" href="http://vanessa.b3log.org" target="_blank">Vanessa</a></p> Theme by <a rel="friend" href="http://vanessa.b3log.org" target="_blank">Vanessa</a></p>
</div> </div>
<script type="text/javascript" src="${staticServePath}/js/lib/jquery/jquery.min.js" charset="utf-8"></script> <script type="text/javascript" src="${staticServePath}/js/lib/jquery/jquery.min.js" charset="utf-8"></script>
......
src/main/webapp/skins/mobile/skin.properties
View file @ a6356478
...@@ -22,5 +22,5 @@ ...@@ -22,5 +22,5 @@
name=Mobile name=Mobile
version=0.1.5 version=0.1.5
forSolo=1.9.0 forSolo=2.0.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
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