diff --git a/.buildpacks b/.buildpacks new file mode 100644 index 0000000000..b57b4bd3b0 --- /dev/null +++ b/.buildpacks @@ -0,0 +1,2 @@ +https://github.com/heroku/heroku-buildpack-nodejs.git +https://github.com/stomita/heroku-buildpack-phantomjs.git diff --git a/public/js/controllers/footerCtrl.js b/public/js/controllers/footerCtrl.js index afd7ca0229..9017602aec 100644 --- a/public/js/controllers/footerCtrl.js +++ b/public/js/controllers/footerCtrl.js @@ -38,8 +38,8 @@ // Scripts only for desktop if (!window.env.IS_MOBILE) { - // Add This - FIXME why isn't this working when here? instead it's now in - //$.getScript("//s7.addthis.com/js/300/addthis_widget.js#pubid=ra-5016f6cc44ad68a4"); + // Add This + //$.getScript("//s7.addthis.com/js/300/addthis_widget.js#pubid=ra-5016f6cc44ad68a4"); //FIXME why isn't this working when here? instead it's now in var addthisServices = 'facebook,twitter,googleplus,tumblr,'+window.env.BASE_URL.replace('https://','').replace('http://',''); window.addthis_config = { services_custom:{ diff --git a/src/controllers/dataexport.js b/src/controllers/dataexport.js index 2b2a5b8d0f..36f3e87fee 100644 --- a/src/controllers/dataexport.js +++ b/src/controllers/dataexport.js @@ -11,7 +11,7 @@ var User = require('../models/user').model; // Avatar screenshot/static-page includes var Pageres = require('pageres'); //https://github.com/sindresorhus/pageres var AWS = require('aws-sdk'); -AWS.config.update({accessKeyId: nconf.get("S3").accessKeyId, secretAccessKey: nconf.get("S3").secretAccessKey}); +AWS.config.update({accessKeyId: nconf.get("S3:accessKeyId"), secretAccessKey: nconf.get("S3:secretAccessKey")}); var s3Stream = require('s3-upload-stream')(new AWS.S3()); //https://github.com/nathanpeck/s3-upload-stream var bucket = 'habitrpg-dev'; var request = require('request');