Merge pull request #5198 from ErisDS/bower-update

Updating bower dependencies
This commit is contained in:
Matt Enlow 2015-05-01 22:00:57 +01:00
commit 8efd0cb4b5
2 changed files with 15 additions and 14 deletions

View File

@ -42,7 +42,7 @@ app.import('bower_components/showdown-ghost/src/extensions/footnotes.js');
app.import('bower_components/showdown-ghost/src/extensions/highlight.js');
app.import('bower_components/moment/moment.js');
app.import('bower_components/keymaster/keymaster.js');
app.import('bower_components/device/lib/device.js');
app.import('bower_components/devicejs/lib/device.js');
app.import('bower_components/jquery-ui/ui/jquery-ui.js');
app.import('bower_components/jquery-file-upload/js/jquery.fileupload.js');
app.import('bower_components/fastclick/lib/fastclick.js');

View File

@ -1,35 +1,36 @@
{
"name": "ghost",
"dependencies": {
"Countable": "2.0.2",
"device": "git://github.com/matthewhudson/device.js#5347a275b66020a0d4dfe9aad81a488f8cce448d",
"ember": "1.11.1",
"codemirror": "5.2.0",
"Countable": "2.1.0",
"devicejs": "0.2.7",
"ember": "1.11.3",
"ember-data": "1.0.0-beta.16.1",
"ember-load-initializers": "ember-cli/ember-load-initializers#0.0.2",
"ember-resolver": "~0.1.15",
"ember-resolver": "0.1.15",
"ember-simple-auth": "0.7.2",
"fastclick": "1.0.0",
"fastclick": "1.0.6",
"google-caja": "5669.0.0",
"ic-ajax": "1.0.1",
"ic-ajax": "2.0.2",
"jquery": "1.11.2",
"jquery-file-upload": "9.5.6",
"jquery-hammerjs": "1.0.1",
"jquery-ui": "1.10.4",
"jqueryui-touch-punch": "furf/jquery-ui-touch-punch",
"keymaster": "git://github.com/madrobby/keymaster#564ea42e07de40da8113a571f17ceae8802672ff",
"loader.js": "ember-cli/loader.js#3.2.0",
"moment": "2.8.3",
"keymaster": "1.6.3",
"loader.js": "3.2.1",
"moment": "2.10.2",
"nanoscroller": "0.8.4",
"normalize-scss": "3.0.2",
"nprogress": "0.1.2",
"nprogress": "0.1.6",
"rangyinputs": "1.2.0",
"showdown-ghost": "0.3.6",
"validator-js": "3.28.0",
"codemirror": "~5.1.0"
"validator-js": "3.39.0"
},
"devDependencies": {
"ember-cli-shims": "ember-cli/ember-cli-shims#0.0.3",
"ember-cli-test-loader": "ember-cli/ember-cli-test-loader#0.1.3",
"ember-cli-test-loader": "0.1.3",
"ember-mocha": "0.6.0"
}
}