From f6031009b3a76098c7a8b90ca551483815f63e29 Mon Sep 17 00:00:00 2001 From: Kirushna Date: Fri, 1 Jul 2016 22:59:44 +0530 Subject: [PATCH 1/4] Fixed flyer dismiss issue on firefox Fixed flyer dismiss issue on firefox --- server/views/partials/flyer.jade | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/server/views/partials/flyer.jade b/server/views/partials/flyer.jade index 07cb9471b2..a435be14bb 100644 --- a/server/views/partials/flyer.jade +++ b/server/views/partials/flyer.jade @@ -3,6 +3,6 @@ if (user && user.points > 5) .row.flashMessage.negative-30 .col-xs-12 #bill-board.alert.alert-info.fade.in(style='display: none;') - button.close(type='button', data-dismiss='alert') - span.ion-close-circled#dismiss-bill + button.close(type='button', data-dismiss='alert', id='dismiss-bill') + span.ion-close-circled #bill-content From fdea4c7bbbbbfba9ad5facabf17a9c0de082e5c1 Mon Sep 17 00:00:00 2001 From: Jonathan Date: Thu, 7 Jul 2016 09:41:05 +0100 Subject: [PATCH 2/4] Fixed grammar mistake --- seed/challenges/00-getting-started/getting-started.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/seed/challenges/00-getting-started/getting-started.json b/seed/challenges/00-getting-started/getting-started.json index 8ec7a379cc..1050dbbb8c 100644 --- a/seed/challenges/00-getting-started/getting-started.json +++ b/seed/challenges/00-getting-started/getting-started.json @@ -391,7 +391,7 @@ ], [ "//i.imgur.com/pYk0wOk.gif", - "A gif showing how you Free Code Camp's GitHub repo.", + "A gif showing you Free Code Camp's GitHub repo.", "Open Free Code Camp's open-source repository. This is where our volunteer team collaborates on building Free Code Camp.", "https://github.com/freecodecamp/freecodecamp" ], From 91c0ee0f1bb62aae047aee793ad7b54ab06a9d5e Mon Sep 17 00:00:00 2001 From: Josh Ghent Date: Thu, 7 Jul 2016 00:26:50 +0100 Subject: [PATCH 3/4] Updated spamming definition in code of conduct. --- server/views/resources/code-of-conduct.jade | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/views/resources/code-of-conduct.jade b/server/views/resources/code-of-conduct.jade index 31a91592a0..3b2a0748da 100644 --- a/server/views/resources/code-of-conduct.jade +++ b/server/views/resources/code-of-conduct.jade @@ -9,7 +9,7 @@ block content ul li Harassment includes sexual language and imagery, deliberate intimidation, stalking, unwelcome sexual attention, libel and any malicious hacking or social engineering. Free Code Camp should be a harassment-free experience for everyone, regardless of gender, gender identity and expression, age, sexual orientation, disability, physical appearance, body size, race, national origin, or religion (or lack thereof). li Trolling includes posting inflammatory comments to provoke an emotional response or disrupt discussions. - li Spamming includes posting off-topic messages to disrupt discussions or promote a product. + li Spamming includes posting off-topic messages to disrupt discussions, promote a product, or solicit donations. p If you see someone harass, troll, or spam anywhere on Free Code Camp's online media (Gitter, YouTube, Facebook, etc.), notify us in our   a(href='https://gitter.im/freecodecamp/admin' target='_blank') Admin room in Gitter |   - preferably with a screen shot of the offense. Our team will take any action we deem appropriate, up to and including banning the offender from Free Code Camp. From b6c8b52465e7d910c4ddfba85ca97ebe0460a756 Mon Sep 17 00:00:00 2001 From: Quincy Larson Date: Thu, 7 Jul 2016 23:50:55 -0700 Subject: [PATCH 4/4] add optimizely and expand shop offerings --- server/middlewares/csp.js | 2 +- server/views/partials/footer.jade | 1 + server/views/resources/shop.jade | 24 +++++++++++++++++++----- 3 files changed, 21 insertions(+), 6 deletions(-) diff --git a/server/middlewares/csp.js b/server/middlewares/csp.js index bfec39dbac..da71631824 100644 --- a/server/middlewares/csp.js +++ b/server/middlewares/csp.js @@ -11,7 +11,7 @@ if (process.env.NODE_ENV !== 'production') { export default function csp() { return helmet.contentSecurityPolicy({ directives: { - defaultSrc: trusted, + defaultSrc: trusted.concat('*.optimizely.com'), scriptSrc: [ "'unsafe-eval'", "'unsafe-inline'", diff --git a/server/views/partials/footer.jade b/server/views/partials/footer.jade index f67b64325b..a138bc4dba 100644 --- a/server/views/partials/footer.jade +++ b/server/views/partials/footer.jade @@ -1,5 +1,6 @@ // scripts should be moved here script(src="https://sidecar.gitter.im/dist/sidecar.v1.js" async defer) +script(src="https://cdn.optimizely.com/js/999692993.js") aside.map-aside.is-collapsed .map-aside-action-bar a.map-aside-action-item.map-aside-action-pop-out(href='/map' target='_blank' aria-label='open map in new tab') diff --git a/server/views/resources/shop.jade b/server/views/resources/shop.jade index 86a2bf9643..ca66cf348f 100644 --- a/server/views/resources/shop.jade +++ b/server/views/resources/shop.jade @@ -1,17 +1,31 @@ extends ../layout block content - h1.text-center Shop + h2.text-center Buy cool things and support our open source community hr .row .col-xs-12.col-sm-8.col-sm-offset-2.col-md-6.col-md-offset-3.text-center - img.img-responsive.img-center(src='//i.imgur.com/MH1CvwY.jpg') - h3 Free Code Camp laptop stickers are here! - h4 Get two for only $5, with free shipping anywhere! + img.img-responsive.img-center(src='//i.imgur.com/FNFqn9Tg.jpg') + h3 Free Code Camp laptop stickers + h4 Get 2 for only $5, with free shipping anywhere! p These durable 2" (5 cm) stickers sport a matte finish, and look great anywhere - especially on your laptop. html. -
+
+ hr + .row + .col-xs-12.col-sm-8.col-sm-offset-2.col-md-6.col-md-offset-3.text-center + img.img-responsive.img-center(src='//i.imgur.com/BTtb8P0g.jpg') + h3 Get a $10 credit your own Digital Ocean server. + p After you spend $25, our community gets a $25 credit. + a.btn.btn-cta.signup-btn.btn-block#digital-ocean-cta(href="//m.do.co/c/ba8a71773373" target='_blank' onClick="ga('send', 'event', 'SHOP', 'SHOP-DIGITAL-OCEAN', 'Digital Ocean affiliate button clicked');") Claim your $10 credit + hr + .row + .col-xs-12.col-sm-8.col-sm-offset-2.col-md-6.col-md-offset-3.text-center + img.img-responsive.img-center(src='http://i.imgur.com/YqZqTN6g.jpg') + h3 Buy some affordable domain names. + p Our community gets a 15% of your first purchase. + a.btn.btn-cta.signup-btn.btn-block#namecheap-cta(href="//www.namecheap.com/?aff=102130" onClick="ga('send', 'event', 'SHOP', 'SHOP-NAMECHEAP', 'Namecheap affiliate button clicked');") Claim your domain names \ No newline at end of file