Skip to content

Commit

Permalink
Merge pull request #11 from artisonian/master
Browse files Browse the repository at this point in the history
Update dependencies
  • Loading branch information
jashkenas committed Aug 28, 2014
2 parents ae0109e + a82a5f2 commit c88e4f7
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 13 deletions.
4 changes: 2 additions & 2 deletions journo.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 2 additions & 6 deletions journo.litcoffee
Expand Up @@ -142,7 +142,7 @@ the site and **rysnc** it up to the server.
rsync 'site/', shared.config.publish
A helper function for **rsync**ing, with logging, and the ability to wait for
the rsync to continue before proceeding. This is useful for ensuring that any
the rsync to continue before proceeding. This is useful for ensuring that any
new photos have finished uploading (very slowly) before the update to the feed
is syndicated out.

Expand Down Expand Up @@ -218,7 +218,7 @@ what you're coding in.
marked.setOptions
highlight: (code, lang) ->
if highlight.LANGUAGES[lang]?
if highlight.getLanguage lang
highlight.highlight(lang, code, true).value
else
highlight.highlightAuto(code).value
Expand Down Expand Up @@ -463,7 +463,3 @@ the site build.
fatal = (message) ->
console.error message
process.exit 1



10 changes: 5 additions & 5 deletions package.json
Expand Up @@ -5,11 +5,11 @@
"bin": {"journo": "./bin/journo"},
"main": "journo.js",
"dependencies": {
"underscore": ">= 1.4.3",
"marked": ">= 0.2.6",
"mime": ">= 1.2.7",
"highlight.js": ">= 7.3.0",
"rss": ">= 0.0.4"
"underscore": "^1.7.0",
"marked": "^0.3.2",
"mime": "^1.2.11",
"highlight.js": "^8.2.0",
"rss": "^0.3.2"
},
"devDependencies": {},
"repository": "",
Expand Down

0 comments on commit c88e4f7

Please sign in to comment.