Infrastructure/ghost
0
Fork 0
mirror of https://github.com/TryGhost/Ghost.git synced 2025-01-13 22:41:32 -05:00
Code Issues Activity

Merge pull request #4458 from ErisDS/showdown-update

Browse source 
Update showdown to showdown-ghost 0.3.4
This commit is contained in:
Jason Williams 2014-11-15 11:55:35 -06:00
commit 2d213212e7
5 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Gruntfile.js
View file

@ -529,7 +529,7 @@ var _ = require('lodash'),
'bower_components/codemirror/addon/mode/overlay.js', 'bower_components/codemirror/addon/mode/overlay.js',
'bower_components/codemirror/mode/markdown/markdown.js', 'bower_components/codemirror/mode/markdown/markdown.js',
'bower_components/codemirror/mode/gfm/gfm.js', 'bower_components/codemirror/mode/gfm/gfm.js',
'bower_components/showdown/src/showdown.js', 'bower_components/showdown-ghost/src/showdown.js',
'bower_components/moment/moment.js', 'bower_components/moment/moment.js',
'bower_components/keymaster/keymaster.js', 'bower_components/keymaster/keymaster.js',
'bower_components/device/lib/device.js', 'bower_components/device/lib/device.js',
@ -564,7 +564,7 @@ var _ = require('lodash'),
'bower_components/codemirror/addon/mode/overlay.js', 'bower_components/codemirror/addon/mode/overlay.js',
'bower_components/codemirror/mode/markdown/markdown.js', 'bower_components/codemirror/mode/markdown/markdown.js',
'bower_components/codemirror/mode/gfm/gfm.js', 'bower_components/codemirror/mode/gfm/gfm.js',
'bower_components/showdown/src/showdown.js', 'bower_components/showdown-ghost/src/showdown.js',
'bower_components/moment/moment.js', 'bower_components/moment/moment.js',
'bower_components/keymaster/keymaster.js', 'bower_components/keymaster/keymaster.js',
'bower_components/device/lib/device.js', 'bower_components/device/lib/device.js',

2
bower.json
View file

@ -22,7 +22,7 @@
"nanoscroller": "0.8.4", "nanoscroller": "0.8.4",
"normalize-scss": "~3.0.1", "normalize-scss": "~3.0.1",
"nprogress": "0.1.2", "nprogress": "0.1.2",
"showdown": "git://github.com/ErisDS/showdown.git#v0.3.2-ghost", "showdown-ghost": "0.3.4",
"validator-js": "3.22.1", "validator-js": "3.22.1",
"google-caja": "5669.0.0" "google-caja": "5669.0.0"
} }

2
core/server/models/post.js
View file

@ -3,7 +3,7 @@ var _ = require('lodash'),
uuid = require('node-uuid'), uuid = require('node-uuid'),
Promise = require('bluebird'), Promise = require('bluebird'),
errors = require('../errors'), errors = require('../errors'),
Showdown = require('showdown'), Showdown = require('showdown-ghost'),
ghostgfm = require('../../shared/lib/showdown/extensions/ghostgfm'), ghostgfm = require('../../shared/lib/showdown/extensions/ghostgfm'),
converter = new Showdown.converter({extensions: [ghostgfm]}), converter = new Showdown.converter({extensions: [ghostgfm]}),
ghostBookshelf = require('./base'), ghostBookshelf = require('./base'),

2
core/test/unit/showdown_client_integrated_spec.js
View file

@ -9,7 +9,7 @@
var should = require('should'), var should = require('should'),
// Stuff we are testing // Stuff we are testing
Showdown = require('showdown'), Showdown = require('showdown-ghost'),
ghostgfm = require('../../shared/lib/showdown/extensions/ghostgfm'), ghostgfm = require('../../shared/lib/showdown/extensions/ghostgfm'),
ghostimagepreview = require('../../shared/lib/showdown/extensions/ghostimagepreview'), ghostimagepreview = require('../../shared/lib/showdown/extensions/ghostimagepreview'),

2
package.json
View file

@ -58,7 +58,7 @@
"request": "2.47.0", "request": "2.47.0",
"rss": "1.0.0", "rss": "1.0.0",
"semver": "4.1.0", "semver": "4.1.0",
"showdown": "https://github.com/ErisDS/showdown/archive/v0.3.2-ghost.tar.gz", "showdown-ghost": "0.3.4",
"sqlite3": "3.0.2", "sqlite3": "3.0.2",
"unidecode": "0.1.3", "unidecode": "0.1.3",
"validator": "3.22.1", "validator": "3.22.1",