status-im
/
codimd
mirror of https://github.com/status-im/codimd.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Update npm and bower dependencies with related patch

This commit is contained in:
Wu Cheng-Han 2016-10-10 21:14:28 +08:00
parent b734eb9c85
commit fb5d7e4359
8 changed files with 39 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
bower.json
View File

@ -16,24 +16,24 @@
], ],
"dependencies": { "dependencies": {
"bootstrap": "~3.3.7", "bootstrap": "~3.3.7",
"jquery": "~3.1.0", "jquery": "~3.1.1",
"font-awesome": "~4.6.3", "font-awesome": "~4.6.3",
"Ionicons": "ionicons#~2.0.1", "Ionicons": "ionicons#~2.0.1",
"reveal.js": "~3.3.0", "reveal.js": "~3.3.0",
"jquery-mousewheel": "~3.1.13", "jquery-mousewheel": "~3.1.13",
"spin.js": "~2.3.2", "spin.js": "~2.3.2",
"moment": "~2.14.1", "moment": "~2.15.1",
"handlebars": "~4.0.5", "handlebars": "~4.0.5",
"js-url": "~2.3.0", "js-url": "~2.3.0",
"socket.io-client": "~1.4.8", "socket.io-client": "~1.5.0",
"viz.js": "~1.3.0", "viz.js": "~1.3.0",
"js-yaml": "~3.6.1", "js-yaml": "~3.6.1",
"to-markdown": "~3.0.1", "to-markdown": "~3.0.1",
"lz-string": "~1.4.4", "lz-string": "~1.4.4",
"raphael": "~2.2.1", "raphael": "~2.2.6",
"flowchart": "~1.6.3", "flowchart": "~1.6.3",
"xss": "~0.2.13", "xss": "~0.2.13",
"markdown-it": "^7.0.0", "markdown-it": "^8.0.0",
"markdown-it-abbr": "^1.0.4", "markdown-it-abbr": "^1.0.4",
"markdown-it-footnote": "^3.0.1", "markdown-it-footnote": "^3.0.1",
"markdown-it-deflist": "^2.0.1", "markdown-it-deflist": "^2.0.1",
@ -45,23 +45,23 @@
"mermaid": "^6.0.0", "mermaid": "^6.0.0",
"MathJax": "^2.6.1", "MathJax": "^2.6.1",
"octicons": "~3.5.0", "octicons": "~3.5.0",
"velocity": "^1.2.3", "velocity": "^1.3.1",
"highlightjs": "^9.5.0", "highlightjs": "^9.7.0",
"lodash": "^4.14.1", "lodash": "^4.16.4",
"randomcolor": "randomColor#^0.4.4", "randomcolor": "randomColor#^0.4.4",
"file-saver": "FileSaver#^1.3.1", "file-saver": "FileSaver#^1.3.1",
"Idle.Js": "idle.js#^1.0.0", "Idle.Js": "idle.js#^1.0.0",
"js-cookie": "^2.1.2", "js-cookie": "^2.1.3",
"list.js": "^1.2.0", "list.js": "^1.2.0",
"store-js": "store.js#^1.3.20", "store-js": "store.js#^1.3.20",
"string": "^3.3.1", "string": "^3.3.1",
"visibilityjs": "^1.2.3", "visibilityjs": "^1.2.4",
"pdfobject": "pdfobject2#*", "pdfobject": "pdfobject2#*",
"gist-embed": "*", "gist-embed": "*",
"keymaster": "^1.6.3", "keymaster": "^1.6.3",
"prism": "^1.5.1" "prism": "^1.5.1"
}, },
"resolutions": { "resolutions": {
"jquery": "~3.1.0" "jquery": "~3.1.1"
} }
} }

28
package.json
View File

@ -6,30 +6,30 @@
"license": "MIT", "license": "MIT",
"dependencies": { "dependencies": {
"async": "^2.0.1", "async": "^2.0.1",
"blueimp-md5": "^2.3.0", "blueimp-md5": "^2.4.0",
"body-parser": "^1.15.2", "body-parser": "^1.15.2",
"chance": "^1.0.4", "chance": "^1.0.4",
"cheerio": "^0.20.0", "cheerio": "^0.22.0",
"compression": "^1.6.2", "compression": "^1.6.2",
"connect-session-sequelize": "^3.1.0", "connect-session-sequelize": "^3.2.0",
"cookie": "0.3.1", "cookie": "0.3.1",
"cookie-parser": "1.4.3", "cookie-parser": "1.4.3",
"diff-match-patch": "git+https://github.com/hackmdio/diff-match-patch.git", "diff-match-patch": "git+https://github.com/hackmdio/diff-match-patch.git",
"ejs": "^2.5.1", "ejs": "^2.5.2",
"emojify.js": "^1.1.0", "emojify.js": "^1.1.0",
"express": ">=4.14", "express": ">=4.14",
"express-session": "^1.14.0", "express-session": "^1.14.1",
"formidable": "^1.0.17", "formidable": "^1.0.17",
"helmet": "^2.1.2", "helmet": "^2.3.0",
"i18n": "^0.8.3", "i18n": "^0.8.3",
"imgur": "git+https://github.com/hackmdio/node-imgur.git", "imgur": "git+https://github.com/hackmdio/node-imgur.git",
"jsdom-nogyp": "^0.8.3", "jsdom-nogyp": "^0.8.3",
"lz-string": "1.4.4", "lz-string": "1.4.4",
"markdown-it": "^7.0.0", "markdown-it": "^8.0.0",
"markdown-pdf": "^7.0.0", "markdown-pdf": "^7.0.0",
"meta-marked": "^0.4.1", "meta-marked": "^0.4.2",
"method-override": "^2.3.6", "method-override": "^2.3.6",
"moment": "^2.14.1", "moment": "^2.15.1",
"morgan": "^1.7.0", "morgan": "^1.7.0",
"mysql": "^2.11.1", "mysql": "^2.11.1",
"node-uuid": "^1.4.7", "node-uuid": "^1.4.7",
@ -41,16 +41,16 @@
"passport-google-oauth20": "^1.0.0", "passport-google-oauth20": "^1.0.0",
"passport-twitter": "^1.0.4", "passport-twitter": "^1.0.4",
"passport.socketio": "^3.6.2", "passport.socketio": "^3.6.2",
"pg": "^6.0.3", "pg": "^6.1.0",
"pg-hstore": "^2.3.2", "pg-hstore": "^2.3.2",
"randomcolor": "^0.4.4", "randomcolor": "^0.4.4",
"request": "^2.74.0", "request": "^2.75.0",
"reveal.js": "3.3.0", "reveal.js": "3.3.0",
"sequelize": "^3.23.6", "sequelize": "^3.24.3",
"sequelize-cli": "^2.4.0", "sequelize-cli": "^2.4.0",
"shortid": "2.2.6", "shortid": "2.2.6",
"socket.io": "1.4.8", "socket.io": "1.5.0",
"sqlite3": "^3.1.4", "sqlite3": "^3.1.6",
"string": "^3.3.1", "string": "^3.3.1",
"tedious": "^1.14.0", "tedious": "^1.14.0",
"toobusy-js": "^0.5.1", "toobusy-js": "^0.5.1",

2
public/js/index.js
View File

@ -2262,8 +2262,6 @@ socket.on('connect', function (data) {
personalInfo['id'] = socket.id; personalInfo['id'] = socket.id;
showStatus(statusType.connected); showStatus(statusType.connected);
socket.emit('version'); socket.emit('version');
if (socket.id.indexOf('/') == -1)
socket.id = socket.nsp + '#' + socket.id;
}); });
socket.on('version', function (data) { socket.on('version', function (data) {
if (version != data.version) { if (version != data.version) {

8
public/views/foot.ejs
View File

@ -3,14 +3,14 @@
</script> </script>
<% if(useCDN) { %> <% if(useCDN) { %>
<script src="//cdnjs.cloudflare.com/ajax/libs/spin.js/2.3.2/spin.min.js" defer></script> <script src="//cdnjs.cloudflare.com/ajax/libs/spin.js/2.3.2/spin.min.js" defer></script>
<script src="//ajax.googleapis.com/ajax/libs/jquery/3.1.0/jquery.min.js"></script> <script src="//ajax.googleapis.com/ajax/libs/jquery/3.1.1/jquery.min.js"></script>
<script src="//cdn.jsdelivr.net/velocity/1.2.3/velocity.min.js" defer></script> <script src="//cdn.jsdelivr.net/velocity/1.3.1/velocity.min.js" defer></script>
<script src="//cdnjs.cloudflare.com/ajax/libs/jquery-mousewheel/3.1.13/jquery.mousewheel.min.js" defer></script> <script src="//cdnjs.cloudflare.com/ajax/libs/jquery-mousewheel/3.1.13/jquery.mousewheel.min.js" defer></script>
<script src="//maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js" defer></script> <script src="//maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js" defer></script>
<script src="//cdnjs.cloudflare.com/ajax/libs/socket.io/1.4.8/socket.io.min.js" defer></script> <script src="//cdnjs.cloudflare.com/ajax/libs/socket.io/1.5.0/socket.io.min.js" defer></script>
<script src="//cdnjs.cloudflare.com/ajax/libs/js-yaml/3.6.1/js-yaml.min.js" defer></script> <script src="//cdnjs.cloudflare.com/ajax/libs/js-yaml/3.6.1/js-yaml.min.js" defer></script>
<script type="text/javascript" src="//cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML" defer></script> <script type="text/javascript" src="//cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML" defer></script>
<script src="//cdnjs.cloudflare.com/ajax/libs/moment.js/2.14.1/moment-with-locales.min.js" defer></script> <script src="//cdnjs.cloudflare.com/ajax/libs/moment.js/2.15.1/moment-with-locales.min.js" defer></script>
<script src="//cdnjs.cloudflare.com/ajax/libs/mermaid/6.0.0/mermaid.min.js" defer></script> <script src="//cdnjs.cloudflare.com/ajax/libs/mermaid/6.0.0/mermaid.min.js" defer></script>
<% } else { %> <% } else { %>
<script src="<%- url %>/vendor/spin.js/spin.min.js" defer></script> <script src="<%- url %>/vendor/spin.js/spin.min.js" defer></script>

4
public/views/html.hbs
View File

@ -19,7 +19,7 @@
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/font-awesome/4.6.3/css/font-awesome.min.css"> <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/font-awesome/4.6.3/css/font-awesome.min.css">
<link rel="stylesheet" href="https://cdn.jsdelivr.net/ionicons/2.0.1/css/ionicons.min.css"> <link rel="stylesheet" href="https://cdn.jsdelivr.net/ionicons/2.0.1/css/ionicons.min.css">
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/octicons/3.5.0/octicons.min.css"> <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/octicons/3.5.0/octicons.min.css">
<link rel="stylesheet" href="https://cdn.jsdelivr.net/highlight.js/9.5.0/styles/github-gist.min.css"> <link rel="stylesheet" href="https://cdn.jsdelivr.net/highlight.js/9.7.0/styles/github-gist.min.css">
<style> <style>
{{{css}}} {{{css}}}
</style> </style>
@ -47,7 +47,7 @@
<div id="ui-toc-affix" class="ui-affix-toc ui-toc-dropdown unselectable hidden-print" data-spy="affix" style="top:17px;display:none;" {{{lang}}} {{{dir}}}> <div id="ui-toc-affix" class="ui-affix-toc ui-toc-dropdown unselectable hidden-print" data-spy="affix" style="top:17px;display:none;" {{{lang}}} {{{dir}}}>
{{{ui-toc-affix}}} {{{ui-toc-affix}}}
</div> </div>
<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.1.0/jquery.min.js"></script> <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.1.1/jquery.min.js"></script>
<script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js" defer></script> <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js" defer></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/gist-embed/2.5/gist-embed.min.js" defer></script> <script src="https://cdnjs.cloudflare.com/ajax/libs/gist-embed/2.5/gist-embed.min.js" defer></script>
<script> <script>

6
public/views/index.ejs
View File

@ -193,11 +193,11 @@
================================================== --> ================================================== -->
<!-- Placed at the end of the document so the pages load faster --> <!-- Placed at the end of the document so the pages load faster -->
<% if(useCDN) { %> <% if(useCDN) { %>
<script src="//ajax.googleapis.com/ajax/libs/jquery/3.1.0/jquery.min.js" defer></script> <script src="//ajax.googleapis.com/ajax/libs/jquery/3.1.1/jquery.min.js" defer></script>
<script src="//cdn.jsdelivr.net/velocity/1.2.3/velocity.min.js" defer></script> <script src="//cdn.jsdelivr.net/velocity/1.3.1/velocity.min.js" defer></script>
<script src="//maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js" defer></script> <script src="//maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js" defer></script>
<script src="//cdnjs.cloudflare.com/ajax/libs/select2/3.5.2/select2.min.js" defer></script> <script src="//cdnjs.cloudflare.com/ajax/libs/select2/3.5.2/select2.min.js" defer></script>
<script src="//cdnjs.cloudflare.com/ajax/libs/moment.js/2.14.1/moment-with-locales.min.js" defer></script> <script src="//cdnjs.cloudflare.com/ajax/libs/moment.js/2.15.1/moment-with-locales.min.js" defer></script>
<script src="//cdnjs.cloudflare.com/ajax/libs/js-url/2.3.0/url.min.js" defer></script> <script src="//cdnjs.cloudflare.com/ajax/libs/js-url/2.3.0/url.min.js" defer></script>
<% } else { %> <% } else { %>
<script src="<%- url %>/vendor/jquery/dist/jquery.min.js" defer></script> <script src="<%- url %>/vendor/jquery/dist/jquery.min.js" defer></script>

4
public/views/pretty.ejs
View File

@ -92,11 +92,11 @@
MathJax.Hub.Config({ messageStyle: "none", skipStartupTypeset: true ,tex2jax: {inlineMath: [['$','$'], ['\\(','\\)']], processEscapes: true }}); MathJax.Hub.Config({ messageStyle: "none", skipStartupTypeset: true ,tex2jax: {inlineMath: [['$','$'], ['\\(','\\)']], processEscapes: true }});
</script> </script>
<% if(useCDN) { %> <% if(useCDN) { %>
<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.1.0/jquery.min.js"></script> <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.1.1/jquery.min.js"></script>
<script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js" defer></script> <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js" defer></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/js-yaml/3.6.1/js-yaml.min.js" defer></script> <script src="https://cdnjs.cloudflare.com/ajax/libs/js-yaml/3.6.1/js-yaml.min.js" defer></script>
<script type="text/javascript" src="//cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML" defer></script> <script type="text/javascript" src="//cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML" defer></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/moment.js/2.14.1/moment-with-locales.min.js" defer></script> <script src="https://cdnjs.cloudflare.com/ajax/libs/moment.js/2.15.1/moment-with-locales.min.js" defer></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/mermaid/6.0.0/mermaid.min.js" defer></script> <script src="https://cdnjs.cloudflare.com/ajax/libs/mermaid/6.0.0/mermaid.min.js" defer></script>
<% } else { %> <% } else { %>
<script src="<%- url %>/vendor/jquery/dist/jquery.min.js"></script> <script src="<%- url %>/vendor/jquery/dist/jquery.min.js"></script>

6
public/views/slide.ejs
View File

@ -87,11 +87,11 @@
MathJax.Hub.Config({ messageStyle: "none", skipStartupTypeset: true ,tex2jax: {inlineMath: [['$','$'], ['\\(','\\)']], processEscapes: true }}); MathJax.Hub.Config({ messageStyle: "none", skipStartupTypeset: true ,tex2jax: {inlineMath: [['$','$'], ['\\(','\\)']], processEscapes: true }});
</script> </script>
<% if(useCDN) { %> <% if(useCDN) { %>
<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.1.0/jquery.min.js"></script> <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.1.1/jquery.min.js"></script>
<script src="//cdn.jsdelivr.net/velocity/1.2.3/velocity.min.js" defer></script> <script src="//cdn.jsdelivr.net/velocity/1.3.1/velocity.min.js" defer></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/js-yaml/3.6.1/js-yaml.min.js" defer></script> <script src="https://cdnjs.cloudflare.com/ajax/libs/js-yaml/3.6.1/js-yaml.min.js" defer></script>
<script type="text/javascript" src="//cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML" defer></script> <script type="text/javascript" src="//cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML" defer></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/moment.js/2.14.1/moment-with-locales.min.js" defer></script> <script src="https://cdnjs.cloudflare.com/ajax/libs/moment.js/2.15.1/moment-with-locales.min.js" defer></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/mermaid/6.0.0/mermaid.min.js" defer></script> <script src="https://cdnjs.cloudflare.com/ajax/libs/mermaid/6.0.0/mermaid.min.js" defer></script>
<% } else { %> <% } else { %>
<script src="<%- url %>/vendor/jquery/dist/jquery.min.js"></script> <script src="<%- url %>/vendor/jquery/dist/jquery.min.js"></script>