Skip to content

S
solo
Commit 0ee86c0b authored by Van's avatar Van
Browse files
Options

Merge remote-tracking branch 'origin/master'

parents 2c6174de f5f183b8
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 85 additions and 93 deletions
nb-configuration.xml deleted 100644 → 0
View file @ 2c6174de
<?xml version="1.0" encoding="UTF-8"?>
<project-shared-configuration>
<!--
This file contains additional configuration written by modules in the NetBeans IDE.
The configuration is intended to be shared among all the users of project and
therefore it is assumed to be part of version control checkout.
Without this configuration present, some functionality in the IDE may be limited or fail altogether.
-->
<spellchecker-wordlist xmlns="http://www.netbeans.org/ns/spellchecker-wordlist/1">
<word>admin</word>
<word>Favicon</word>
<word>servlet</word>
</spellchecker-wordlist>
</project-shared-configuration>
src/main/webapp/WEB-INF/static-resources.xml
View file @ 0ee86c0b
...@@ -19,83 +19,88 @@ ...@@ -19,83 +19,88 @@
<!-- <!--
Description: Static resources definition. Description: Static resources definition.
Version: 2.7.5.6, Aug 26, 2016 Version: 2.7.6.6, Dec 10, 2016
Author: Liang Ding Author: Liang Ding
--> -->
<static-files> <static-files>
<!-- Uses the STANDARD Ant Path Pattern to configure these paths! --> <!-- Uses the STANDARD Ant Path Pattern to configure these paths! -->
<include path="/favicon.ico" />
<include path="/favicon.png" />
<include path="/robots.txt" />
<include path="/js/**.js" />
<include path="/js/**/*.js" />
<include path="/js/**.css" />
<include path="/js/**/*.css" />
<include path="/js/**.htm" />
<include path="/js/**/*.htm" />
<include path="/js/**.html" />
<include path="/js/**/*.html" />
<include path="/js/**.gif" />
<include path="/js/**/*.gif" />
<include path="/js/**.png" />
<include path="/js/**/*.png" />
<include path="/js/**.jpg" />
<include path="/js/**/*.jpg" />
<include path="/skins/**.css" />
<include path="/skins/**.css.map" />
<include path="/skins/**/*.css" />
<include path="/skins/**/*.css.map" />
<include path="/skins/**.js" />
<include path="/skins/**/*.js" />
<include path="/skins/**.png" />
<include path="/skins/**/*.png" />
<include path="/skins/**.jpg" />
<include path="/skins/**/*.jpg" />
<include path="/skins/**.swf" />
<include path="/skins/**/*.swf" />
<include path="/skins/**.gif" />
<include path="/skins/**/*.gif" />
<include path="/skins/**/*.eot" />
<include path="/skins/**/*.svg" />
<include path="/skins/**/*.ttf" />
<include path="/skins/**/*.woff" />
<include path="/css/**.css" /> <include path="/favicon.ico"/>
<include path="/css/**/*.css" /> <include path="/favicon.png"/>
<include path="/css/fonts/*.eot" /> <include path="/robots.txt"/>
<include path="/css/fonts/*.svg" />
<include path="/css/fonts/*.ttf" /> <include path="/js/**.js"/>
<include path="/css/fonts/*.woff" /> <include path="/js/**/*.js"/>
<include path="/js/**.css"/>
<include path="/images/**.png" /> <include path="/js/**/*.css"/>
<include path="/images/**/*.png" /> <include path="/js/**.htm"/>
<include path="/images/**.jpg" /> <include path="/js/**/*.htm"/>
<include path="/images/**/*.jpg" /> <include path="/js/**.html"/>
<include path="/images/**.gif" /> <include path="/js/**/*.html"/>
<include path="/images/**/*.gif" /> <include path="/js/**.gif"/>
<include path="/js/**/*.gif"/>
<include path="/plugins/**.css" /> <include path="/js/**.png"/>
<include path="/plugins/**/*.css" /> <include path="/js/**/*.png"/>
<include path="/plugins/**.js" /> <include path="/js/**.jpg"/>
<include path="/plugins/**/*.js" /> <include path="/js/**/*.jpg"/>
<include path="/plugins/**.png" /> <include path="/js/**/*.swf"/>
<include path="/plugins/**/*.png" /> <include path="/js/**/*.eot"/>
<include path="/plugins/**.jpg" /> <include path="/js/**/*.svg"/>
<include path="/plugins/**/*.jpg" /> <include path="/js/**/*.ttf"/>
<include path="/plugins/**.swf" /> <include path="/js/**/*.woff"/>
<include path="/plugins/**/*.swf" />
<include path="/plugins/**.gif" /> <include path="/skins/**.css"/>
<include path="/plugins/**/*.gif" /> <include path="/skins/**.css.map"/>
<include path="/plugins/**.html" /> <include path="/skins/**/*.css"/>
<include path="/plugins/**/*.html" /> <include path="/skins/**/*.css.map"/>
<include path="/plugins/**.htm" /> <include path="/skins/**.js"/>
<include path="/plugins/**/*.htm" /> <include path="/skins/**/*.js"/>
<include path="/skins/**.png"/>
<include path="/CHANGE_LOGS.html" /> <include path="/skins/**/*.png"/>
<include path="/README.txt" /> <include path="/skins/**.jpg"/>
<include path="/LICENSE.txt" /> <include path="/skins/**/*.jpg"/>
<include path="/skins/**.swf"/>
<include path="/skins/**/*.swf"/>
<include path="/skins/**.gif"/>
<include path="/skins/**/*.gif"/>
<include path="/skins/**/*.eot"/>
<include path="/skins/**/*.svg"/>
<include path="/skins/**/*.ttf"/>
<include path="/skins/**/*.woff"/>
<include path="/css/**.css"/>
<include path="/css/**/*.css"/>
<include path="/css/fonts/*.eot"/>
<include path="/css/fonts/*.svg"/>
<include path="/css/fonts/*.ttf"/>
<include path="/css/fonts/*.woff"/>
<include path="/images/**.png"/>
<include path="/images/**/*.png"/>
<include path="/images/**.jpg"/>
<include path="/images/**/*.jpg"/>
<include path="/images/**.gif"/>
<include path="/images/**/*.gif"/>
<include path="/plugins/**.css"/>
<include path="/plugins/**/*.css"/>
<include path="/plugins/**.js"/>
<include path="/plugins/**/*.js"/>
<include path="/plugins/**.png"/>
<include path="/plugins/**/*.png"/>
<include path="/plugins/**.jpg"/>
<include path="/plugins/**/*.jpg"/>
<include path="/plugins/**.swf"/>
<include path="/plugins/**/*.swf"/>
<include path="/plugins/**.gif"/>
<include path="/plugins/**/*.gif"/>
<include path="/plugins/**.html"/>
<include path="/plugins/**/*.html"/>
<include path="/plugins/**.htm"/>
<include path="/plugins/**/*.htm"/>
<include path="/CHANGE_LOGS.html"/>
<include path="/README.txt"/>
<include path="/LICENSE.txt"/>
</static-files> </static-files>
src/main/webapp/js/admin/article.js
View file @ 0ee86c0b
...@@ -444,7 +444,7 @@ admin.article = { ...@@ -444,7 +444,7 @@ admin.article = {
var filename = ""; var filename = "";
$('#articleUpload').fileupload({ $('#articleUpload').fileupload({
multipart: true, multipart: true,
url: "http://upload.qiniu.com/", url: "https://up.qbox.me",
add: function (e, data) { add: function (e, data) {
filename = data.files[0].name; filename = data.files[0].name;
...@@ -469,6 +469,7 @@ admin.article = { ...@@ -469,6 +469,7 @@ admin.article = {
return; return;
} }
$('#articleUpload').after('<div>![' + data.files[0].name + '](http://' $('#articleUpload').after('<div>![' + data.files[0].name + '](http://'
+ qiniu.qiniuDomain + qiniuKey + ')</div>'); + qiniu.qiniuDomain + qiniuKey + ')</div>');
}, },
......
src/main/webapp/js/admin/latkeAdmin.js
View file @ 0ee86c0b
...@@ -1356,7 +1356,7 @@ admin.article = { ...@@ -1356,7 +1356,7 @@ admin.article = {
var filename = ""; var filename = "";
$('#articleUpload').fileupload({ $('#articleUpload').fileupload({
multipart: true, multipart: true,
url: "http://upload.qiniu.com/", url: "https://up.qbox.me",
add: function (e, data) { add: function (e, data) {
filename = data.files[0].name; filename = data.files[0].name;
......
src/main/webapp/js/admin/latkeAdmin.min.js
View file @ 0ee86c0b
This source diff could not be displayed because it is too large. You can view the blob instead.
src/main/webapp/js/page.js
View file @ 0ee86c0b
...@@ -499,7 +499,7 @@ $.extend(Page.prototype, { ...@@ -499,7 +499,7 @@ $.extend(Page.prototype, {
var tips = this.tips; var tips = this.tips;
try { try {
$.ajax({ $.ajax({
url: "http://rhythm.b3log.org:80/get-articles-by-tags.do?tags=" + tags url: "https://rhythm.b3log.org/get-articles-by-tags.do?tags=" + tags
+ "&blogHost=" + tips.blogHost + "&paginationPageSize=" + tips.externalRelevantArticlesDisplayCount, + "&blogHost=" + tips.blogHost + "&paginationPageSize=" + tips.externalRelevantArticlesDisplayCount,
type: "GET", type: "GET",
cache: true, cache: true,
......
src/main/webapp/js/page.min.js
View file @ 0ee86c0b
This diff is collapsed.
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