Skip to content

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

Merge branch '3.3.0-dev' of https://github.com/b3log/solo into 3.3.0-dev

parents 09c41fad 819b4873
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 72 additions and 26 deletions
package-lock.json
View file @ 24698e3d
...@@ -30,9 +30,9 @@ ...@@ -30,9 +30,9 @@
}, },
"dependencies": { "dependencies": {
"acorn": { "acorn": {
"version": "6.1.0", "version": "6.1.1",
"resolved": "https://registry.npmjs.org/acorn/-/acorn-6.1.0.tgz", "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.1.1.tgz",
"integrity": "sha512-MW/FjM+IvU9CgBzjO3UIPCE2pyEwUsoFl+VGdczOPEdxfGFjuKny/gN54mOuX7Qxmb9Rg9MCn2oKiSUeW+pjrw==" "integrity": "sha512-jPTiwtOxaHNaAPg/dmrJ/beuzLRnXtB0kQPQ8JpotKJgTB6rX6c8mlf315941pyjBSaPg8NHXS9fhP4u17DpGA=="
} }
} }
}, },
...@@ -1649,7 +1649,8 @@ ...@@ -1649,7 +1649,8 @@
"ansi-regex": { "ansi-regex": {
"version": "2.1.1", "version": "2.1.1",
"bundled": true, "bundled": true,
"dev": true "dev": true,
"optional": true
}, },
"aproba": { "aproba": {
"version": "1.2.0", "version": "1.2.0",
...@@ -1670,12 +1671,14 @@ ...@@ -1670,12 +1671,14 @@
"balanced-match": { "balanced-match": {
"version": "1.0.0", "version": "1.0.0",
"bundled": true, "bundled": true,
"dev": true "dev": true,
"optional": true
}, },
"brace-expansion": { "brace-expansion": {
"version": "1.1.11", "version": "1.1.11",
"bundled": true, "bundled": true,
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"balanced-match": "^1.0.0", "balanced-match": "^1.0.0",
"concat-map": "0.0.1" "concat-map": "0.0.1"
...@@ -1690,17 +1693,20 @@ ...@@ -1690,17 +1693,20 @@
"code-point-at": { "code-point-at": {
"version": "1.1.0", "version": "1.1.0",
"bundled": true, "bundled": true,
"dev": true "dev": true,
"optional": true
}, },
"concat-map": { "concat-map": {
"version": "0.0.1", "version": "0.0.1",
"bundled": true, "bundled": true,
"dev": true "dev": true,
"optional": true
}, },
"console-control-strings": { "console-control-strings": {
"version": "1.1.0", "version": "1.1.0",
"bundled": true, "bundled": true,
"dev": true "dev": true,
"optional": true
}, },
"core-util-is": { "core-util-is": {
"version": "1.0.2", "version": "1.0.2",
...@@ -1817,7 +1823,8 @@ ...@@ -1817,7 +1823,8 @@
"inherits": { "inherits": {
"version": "2.0.3", "version": "2.0.3",
"bundled": true, "bundled": true,
"dev": true "dev": true,
"optional": true
}, },
"ini": { "ini": {
"version": "1.3.5", "version": "1.3.5",
...@@ -1829,6 +1836,7 @@ ...@@ -1829,6 +1836,7 @@
"version": "1.0.0", "version": "1.0.0",
"bundled": true, "bundled": true,
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"number-is-nan": "^1.0.0" "number-is-nan": "^1.0.0"
} }
...@@ -1843,6 +1851,7 @@ ...@@ -1843,6 +1851,7 @@
"version": "3.0.4", "version": "3.0.4",
"bundled": true, "bundled": true,
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"brace-expansion": "^1.1.7" "brace-expansion": "^1.1.7"
} }
...@@ -1850,12 +1859,14 @@ ...@@ -1850,12 +1859,14 @@
"minimist": { "minimist": {
"version": "0.0.8", "version": "0.0.8",
"bundled": true, "bundled": true,
"dev": true "dev": true,
"optional": true
}, },
"minipass": { "minipass": {
"version": "2.2.4", "version": "2.2.4",
"bundled": true, "bundled": true,
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"safe-buffer": "^5.1.1", "safe-buffer": "^5.1.1",
"yallist": "^3.0.0" "yallist": "^3.0.0"
...@@ -1874,6 +1885,7 @@ ...@@ -1874,6 +1885,7 @@
"version": "0.5.1", "version": "0.5.1",
"bundled": true, "bundled": true,
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"minimist": "0.0.8" "minimist": "0.0.8"
} }
...@@ -1954,7 +1966,8 @@ ...@@ -1954,7 +1966,8 @@
"number-is-nan": { "number-is-nan": {
"version": "1.0.1", "version": "1.0.1",
"bundled": true, "bundled": true,
"dev": true "dev": true,
"optional": true
}, },
"object-assign": { "object-assign": {
"version": "4.1.1", "version": "4.1.1",
...@@ -1966,6 +1979,7 @@ ...@@ -1966,6 +1979,7 @@
"version": "1.4.0", "version": "1.4.0",
"bundled": true, "bundled": true,
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"wrappy": "1" "wrappy": "1"
} }
...@@ -2051,7 +2065,8 @@ ...@@ -2051,7 +2065,8 @@
"safe-buffer": { "safe-buffer": {
"version": "5.1.1", "version": "5.1.1",
"bundled": true, "bundled": true,
"dev": true "dev": true,
"optional": true
}, },
"safer-buffer": { "safer-buffer": {
"version": "2.1.2", "version": "2.1.2",
...@@ -2087,6 +2102,7 @@ ...@@ -2087,6 +2102,7 @@
"version": "1.0.2", "version": "1.0.2",
"bundled": true, "bundled": true,
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"code-point-at": "^1.0.0", "code-point-at": "^1.0.0",
"is-fullwidth-code-point": "^1.0.0", "is-fullwidth-code-point": "^1.0.0",
...@@ -2106,6 +2122,7 @@ ...@@ -2106,6 +2122,7 @@
"version": "3.0.1", "version": "3.0.1",
"bundled": true, "bundled": true,
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"ansi-regex": "^2.0.0" "ansi-regex": "^2.0.0"
} }
...@@ -2149,12 +2166,14 @@ ...@@ -2149,12 +2166,14 @@
"wrappy": { "wrappy": {
"version": "1.0.2", "version": "1.0.2",
"bundled": true, "bundled": true,
"dev": true "dev": true,
"optional": true
}, },
"yallist": { "yallist": {
"version": "3.0.2", "version": "3.0.2",
"bundled": true, "bundled": true,
"dev": true "dev": true,
"optional": true
} }
} }
}, },
...@@ -3687,9 +3706,9 @@ ...@@ -3687,9 +3706,9 @@
"dev": true "dev": true
}, },
"nwsapi": { "nwsapi": {
"version": "2.1.0", "version": "2.1.1",
"resolved": "https://registry.npmjs.org/nwsapi/-/nwsapi-2.1.0.tgz", "resolved": "https://registry.npmjs.org/nwsapi/-/nwsapi-2.1.1.tgz",
"integrity": "sha512-ZG3bLAvdHmhIjaQ/Db1qvBxsGvFMLIRpQszyqbg31VJ53UP++uZX1/gf3Ut96pdwN9AuDwlMqIYLm0UPCdUeHg==" "integrity": "sha512-T5GaA1J/d34AC8mkrFD2O0DR17kwJ702ZOtJOsS8RpbsQZVOC2/xYFb1i/cw+xdM54JIlMuojjDOYct8GIWtwg=="
}, },
"oauth-sign": { "oauth-sign": {
"version": "0.8.2", "version": "0.8.2",
...@@ -5324,9 +5343,9 @@ ...@@ -5324,9 +5343,9 @@
"dev": true "dev": true
}, },
"vditor": { "vditor": {
"version": "0.2.5", "version": "0.3.0",
"resolved": "https://registry.npmjs.org/vditor/-/vditor-0.2.5.tgz", "resolved": "https://registry.npmjs.org/vditor/-/vditor-0.3.0.tgz",
"integrity": "sha512-dzpCDZzEu6kxcNqcPvB5t5PKF2k/BEFMajzGPBImPy2Yif0IPEFc8YhuR3twI3E+WCf8z/pBGczRP5uATMj//g==", "integrity": "sha512-+sh+w1lsAh5UQ5/l0puuALO1MMpI+kgHCueKG6WQAh9sxmlJtxVAIiuQwS+Qb3+uGCbWKOIBI37+Z2Bc6fCVSA==",
"requires": { "requires": {
"turndown": "^5.0.3", "turndown": "^5.0.3",
"turndown-plugin-gfm": "^1.0.2" "turndown-plugin-gfm": "^1.0.2"
......
package.json
View file @ 24698e3d
...@@ -36,6 +36,6 @@ ...@@ -36,6 +36,6 @@
"gulp-uglify": "^3.0.1" "gulp-uglify": "^3.0.1"
}, },
"dependencies": { "dependencies": {
"vditor": "^0.2.5" "vditor": "^0.3.0"
} }
} }
src/main/webapp/admin/admin-index.ftl
View file @ 24698e3d
...@@ -167,7 +167,7 @@ ...@@ -167,7 +167,7 @@
</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/vditor-0.2.5/index.min.js"></script> <script src="${staticServePath}/js/lib/vditor-0.3.0/index.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/js/page.js
View file @ 24698e3d
...@@ -105,7 +105,7 @@ $.extend(Page.prototype, { ...@@ -105,7 +105,7 @@ $.extend(Page.prototype, {
if (typeof Vditor === 'undefined') { if (typeof Vditor === 'undefined') {
$.ajax({ $.ajax({
method: 'GET', method: 'GET',
url: latkeConfig.staticServePath + '/js/lib/vditor-0.2.5/index.min.js', url: latkeConfig.staticServePath + '/js/lib/vditor-0.3.0/index.min.js',
dataType: 'script', dataType: 'script',
cache: true, cache: true,
async: false, async: false,
......
src/main/webapp/js/page.min.js
View file @ 24698e3d
This diff is collapsed.
src/main/webapp/scss/admin.css
View file @ 24698e3d
This diff is collapsed.
skins @ 0d85dfbf
Subproject commit 571c8f37e4a37e2ffe130bf10ebbcc0adf08ca7d Subproject commit 0d85dfbfd153ee8e70ce17257c649ad3e2c064f4
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