Skip to content

Commit

Permalink
Fixed clone from embed & update copy
Browse files Browse the repository at this point in the history
  • Loading branch information
remy committed Jul 20, 2014
1 parent 89cbea5 commit 7dc92f9
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 6 deletions.
3 changes: 3 additions & 0 deletions config.default.json
Expand Up @@ -91,6 +91,7 @@
"blog", "blog",
"bugs", "bugs",
"business", "business",
"clone",
"contacts", "contacts",
"collection", "collection",
"collections", "collections",
Expand Down Expand Up @@ -144,6 +145,7 @@
"rules", "rules",
"runner", "runner",
"scripts", "scripts",
"save",
"search", "search",
"sent", "sent",
"settings", "settings",
Expand All @@ -158,6 +160,7 @@
"translate", "translate",
"trends", "trends",
"unarchive", "unarchive",
"update",
"upgrade", "upgrade",
"user", "user",
"users", "users",
Expand Down
8 changes: 4 additions & 4 deletions lib/data/welcome-panel.json
Expand Up @@ -27,19 +27,19 @@
"data": [ "data": [
{ {
"title": "Private bins", "title": "Private bins",
"link": "http://jsbin.com/help/features" "link": "http://jsbin.com/help/private-bins"
}, },
{ {
"title": "Vanity URLs", "title": "Vanity URLs",
"link": "http://jsbin.com/help/features" "link": "http://jsbin.com/help/pro#vanityurls"
}, },
{ {
"title": "SSL", "title": "SSL",
"link": "http://jsbin.com/help/ssl#enablingsslforallofjsbin" "link": "http://jsbin.com/help/ssl-opt-in"
}, },
{ {
"title": "Dropbox", "title": "Dropbox",
"link": "http://jsbin.com/help/features" "link": "http://jsbin.com/help/dropbox"
} }
] ]
}, },
Expand Down
2 changes: 1 addition & 1 deletion lib/handlers/upgrade.js
Expand Up @@ -230,7 +230,7 @@ upgrade.processPayment = function (req, res, next) {
}).then(function () { }).then(function () {
metrics.increment('upgrade.success'); metrics.increment('upgrade.success');
req.session.user.pro = true; req.session.user.pro = true;
req.flash(req.flash.NOTIFICATION, 'Welcome to the pro user lounge. Your seat is waiting'); req.flash(req.flash.NOTIFICATION, 'Welcome to the pro user lounge. Your seat is waiting. In the mean time, <a target="_blank" href="http://jsbin.com/help/pro">find out more about Pro accounts</a>');
res.redirect('/'); res.redirect('/');
}).catch(function (error) { }).catch(function (error) {
// there was something wrong with the customer create process, so let's // there was something wrong with the customer create process, so let's
Expand Down
2 changes: 1 addition & 1 deletion lib/routes.js
Expand Up @@ -62,7 +62,7 @@ module.exports = function (app) {


var r = root; var r = root;
if (features('sslForAll', req)) { if (features('sslForAll', req)) {
r = r.replace(/http:/, 'https:'); //r = r.replace(/http:/, 'https:');
} }


// only allow cloning via url if it came from jsbin // only allow cloning via url if it came from jsbin
Expand Down

0 comments on commit 7dc92f9

Please sign in to comment.