f.weber/homebrewery
0
0
Fork 0
mirror of https://github.com/naturalcrit/homebrewery.git synced 2026-01-05 03:42:38 +00:00
Code Wiki Activity

Merge branch 'master' into update-Marked-renderer

Browse Source
This commit is contained in:
Trevor Buckner
2020-05-09 13:33:33 -04:00
committed by GitHub
parent dab716a9e0 4ad63d5bce
commit fcbd117784
4 changed files with 24 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
package-lock.json generated
View File

@@ -1768,9 +1768,9 @@
"integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=" "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c="
}, },
"codemirror": { "codemirror": {
"version": "5.52.2", "version": "5.53.2",
"resolved": "https://registry.npmjs.org/codemirror/-/codemirror-5.52.2.tgz", "resolved": "https://registry.npmjs.org/codemirror/-/codemirror-5.53.2.tgz",
"integrity": "sha512-WCGCixNUck2HGvY8/ZNI1jYfxPG5cRHv0VjmWuNzbtCLz8qYA5d+je4QhSSCtCaagyeOwMi/HmmPTjBgiTm2lQ==" "integrity": "sha512-wvSQKS4E+P8Fxn/AQ+tQtJnF1qH5UOlxtugFLpubEZ5jcdH2iXTVinb+Xc/4QjshuOxRm4fUsU2QPF1JJKiyXA=="
}, },
"collection-visit": { "collection-visit": {
"version": "1.0.0", "version": "1.0.0",
@@ -5295,17 +5295,17 @@
} }
}, },
"moment": { "moment": {
"version": "2.24.0", "version": "2.25.3",
"resolved": "https://registry.npmjs.org/moment/-/moment-2.24.0.tgz", "resolved": "https://registry.npmjs.org/moment/-/moment-2.25.3.tgz",
"integrity": "sha512-bV7f+6l2QigeBBZSM/6yTNq4P2fNpSWj/0e7jQcy87A8e7o2nAfP/34/2ky5Vw4B9S446EtIhodAzkFCcR4dQg==" "integrity": "sha512-PuYv0PHxZvzc15Sp8ybUCoQ+xpyPWvjOuK72a5ovzp2LI32rJXOiIfyoFoYvG3s6EwwrdkMyWuRiEHSZRLJNdg=="
}, },
"mongodb": { "mongodb": {
"version": "3.5.5", "version": "3.5.7",
"resolved": "https://registry.npmjs.org/mongodb/-/mongodb-3.5.5.tgz", "resolved": "https://registry.npmjs.org/mongodb/-/mongodb-3.5.7.tgz",
"integrity": "sha512-GCjDxR3UOltDq00Zcpzql6dQo1sVry60OXJY3TDmFc2SWFY6c8Gn1Ardidc5jDirvJrx2GC3knGOImKphbSL3A==", "integrity": "sha512-lMtleRT+vIgY/JhhTn1nyGwnSMmJkJELp+4ZbrjctrnBxuLbj6rmLuJFz8W2xUzUqWmqoyVxJLYuC58ZKpcTYQ==",
"requires": { "requires": {
"bl": "^2.2.0", "bl": "^2.2.0",
"bson": "^1.1.1", "bson": "^1.1.4",
"denque": "^1.4.1", "denque": "^1.4.1",
"require_optional": "^1.0.1", "require_optional": "^1.0.1",
"safe-buffer": "^5.1.2", "safe-buffer": "^5.1.2",
@@ -5320,13 +5320,13 @@
} }
}, },
"mongoose": { "mongoose": {
"version": "5.9.9", "version": "5.9.12",
"resolved": "https://registry.npmjs.org/mongoose/-/mongoose-5.9.9.tgz", "resolved": "https://registry.npmjs.org/mongoose/-/mongoose-5.9.12.tgz",
"integrity": "sha512-pLkIkM7XQwfbQ+xK1l57Zv0DYPH190/I6Cv5+PbJGfAU0HvX0atMlp+vly8zcjNTEvTkVM80qA5eBYBvZyLYXw==", "integrity": "sha512-bP01WSvh64yuHJ7XsGRwj/91j1V3iE3PcvYI6fAhMmNU9SBMHoMf/jy7hZm275zfocFiyTV9MfKLWrXh7VK9ig==",
"requires": { "requires": {
"bson": "~1.1.1", "bson": "^1.1.4",
"kareem": "2.3.1", "kareem": "2.3.1",
"mongodb": "3.5.5", "mongodb": "3.5.7",
"mongoose-legacy-pluralize": "1.0.2", "mongoose-legacy-pluralize": "1.0.2",
"mpath": "0.7.0", "mpath": "0.7.0",
"mquery": "3.2.2", "mquery": "3.2.2",

7
package.json
View File

@@ -40,15 +40,16 @@
"babel-preset-react": "^6.24.1", "babel-preset-react": "^6.24.1",
"body-parser": "^1.19.0", "body-parser": "^1.19.0",
"classnames": "^2.2.6", "classnames": "^2.2.6",
"codemirror": "^5.52.2", "codemirror": "^5.53.2",
"cookie-parser": "^1.4.5", "cookie-parser": "^1.4.5",
"create-react-class": "^15.6.3", "create-react-class": "^15.6.3",
"express": "^4.17.1", "express": "^4.17.1",
"jwt-simple": "^0.5.6", "jwt-simple": "^0.5.6",
"lodash": "^4.17.15", "lodash": "^4.17.15",
"marked": "^1.0.0", "marked": "^1.0.0",
"moment": "^2.24.0", "marked": "^0.3.19",
"mongoose": "^5.9.9", "moment": "^2.25.3",
"mongoose": "^5.9.12",
"nconf": "^0.10.0", "nconf": "^0.10.0",
"pico-router": "^2.1.0", "pico-router": "^2.1.0",
"react": "^16.13.1", "react": "^16.13.1",

5
robots.txt
View File

@@ -1,5 +1,2 @@
# Disallow crawling brew edit and share pages # Notes
User-agent: * User-agent: *
Disallow: /edit/
Disallow: /share/
Disallow: /print/

8
shared/homebrewery/renderWarnings/renderWarnings.jsx
View File

@@ -25,10 +25,10 @@ const RenderWarnings = createClass({
if(!isChrome){ if(!isChrome){
return <li key='chrome'> return <li key='chrome'>
<em>Built for Chrome </em> <br /> <em>Built for Chrome </em> <br />
Other browsers do not support &nbsp; Other browsers have not been tested for compatiblilty. If you
<a target='_blank' href='https://developer.mozilla.org/en-US/docs/Web/CSS/column-span#Browser_compatibility'> experience issues with your document not rendering or printing
key features properly, please try using the latest version of Chrome before
</a> this site uses. submitting a bug report.
</li>; </li>;
} }
}, },