diff --git a/client/main.js b/client/main.js index 256b37765b..e38789ac6c 100644 --- a/client/main.js +++ b/client/main.js @@ -358,7 +358,7 @@ $(document).ready(function() { mapAside.attr({ src: '/map-aside', scrolling: 'yes' - }); + }); $('.map-aside .iframeWrapper').append(mapAside); main.isMapAsideLoad = true; } diff --git a/seed/challenges/01-front-end-development-certification/basic-ziplines.json b/seed/challenges/01-front-end-development-certification/basic-ziplines.json index 7089cbee93..6a0cbbabe9 100644 --- a/seed/challenges/01-front-end-development-certification/basic-ziplines.json +++ b/seed/challenges/01-front-end-development-certification/basic-ziplines.json @@ -102,7 +102,7 @@ "description": [ "Objective: Build a CodePen.io app that is functionally similar to this: http://codepen.io/FreeCodeCamp/full/wMQrXV.", "Rule #1: Don't look at the example project's code. Figure it out for yourself.", - "Rule #2: Fulfill the below user stories. Use whichever libraries or APIs you need. Give it your own personal style.", + "Rule #2: Fulfill the below user stories. Use whichever libraries you need. Give it your own personal style.", "User Story: I can view a tribute page with an image and text.", "User Story: I can click on a link that will take me to an external website with further information on the topic.", "Remember to use Read-Search-Ask if you get stuck.", @@ -138,7 +138,7 @@ "description": [ "Objective: Build a CodePen.io app that is functionally similar to this: http://codepen.io/FreeCodeCamp/full/VemmoX/.", "Rule #1: Don't look at the example project's code. Figure it out for yourself.", - "Rule #2: Fulfill the below user stories. Use whichever libraries or APIs you need. Give it your own personal style.", + "Rule #2: Fulfill the below user stories. Use whichever libraries you need. Give it your own personal style.", "User Story: I can access all of the portfolio webpage's content just by scrolling.", "User Story: I can click different buttons that will take me to the portfolio creator's different social media pages.", "User Story: I can see thumbnail images of different projects the portfolio creator has built (if you haven't built any websites before, use placeholders.)", diff --git a/server/boot/about.js b/server/boot/about.js index 852b5e2bf8..e310bc4566 100644 --- a/server/boot/about.js +++ b/server/boot/about.js @@ -25,7 +25,7 @@ export default function about(app) { About our Open Source Community, our social media presence, and how to contact us`.split('\n').join(' '), globalCompletedCount: numberWithCommas( - 5612952 + (Math.floor((Date.now() - 1446268581061) / 2000)) + 5612952 + (Math.floor((Date.now() - 1446268581061) / 1800)) ) }); }) diff --git a/server/boot/randomAPIs.js b/server/boot/randomAPIs.js index a83a0dbd1e..eeb01d084a 100644 --- a/server/boot/randomAPIs.js +++ b/server/boot/randomAPIs.js @@ -37,6 +37,8 @@ module.exports = function(app) { router.get('/terms', terms); router.get('/privacy', privacy); router.get('/code-of-conduct', codeOfConduct); + router.get('/academic-honesty', academicHonesty); + router.get( '/the-fastest-web-page-on-the-internet', theFastestWebPageOnTheInternet @@ -175,7 +177,7 @@ module.exports = function(app) { function privacy(req, res) { res.render('resources/privacy', { - title: 'Privacy' + title: 'Privacy policy' }); } @@ -185,6 +187,12 @@ module.exports = function(app) { }); } + function academicHonesty(req, res) { + res.render('resources/academic-honesty', { + title: 'Academic Honesty policy' + }); + } + function theFastestWebPageOnTheInternet(req, res) { res.render('resources/the-fastest-web-page-on-the-internet', { title: 'This is the fastest web page on the internet' diff --git a/server/middlewares/csp.js b/server/middlewares/csp.js index 36829f2f14..b64036275b 100644 --- a/server/middlewares/csp.js +++ b/server/middlewares/csp.js @@ -66,7 +66,7 @@ export default function csp() { '*.twitter.com', '*.ghbtns.com', '*.freecatphotoapp.com', - 'freecodecamp.github.io' + 'freecodecamp.github.io' ].concat(trusted) }, // set to true if you only want to report errors diff --git a/server/views/resources/about.jade b/server/views/resources/about.jade index 3ee7ee52e0..8f5bdbd5e8 100644 --- a/server/views/resources/about.jade +++ b/server/views/resources/about.jade @@ -17,6 +17,10 @@ block content span.tag Completed: span.text-primary #{globalCompletedCount} | challenges + li.nowrap + span.tag Donated: + span.text-primary $800,000 + | in pro-bono code .spacer .row .col-xs-12.col-sm-10.col-sm-offset-1.col-md-6.col-md-offset-3 @@ -27,37 +31,37 @@ block content td.text-center i.fa.fa-medium td - a(href='//medium.freecodecamp.com', target='_blank') Our Medium Publication + a(href='//medium.freecodecamp.com', target='_blank') Our Medium publication tr td.text-center - i.fa.fa-github + i.fa.fa-twitch td - a(href="//github.com/freecodecamp", target='_blank') Our GitHub Repository + a(href="//twitch.tv/freecodecamp", target='_blank') Our Twitch.tv channel tr td.text-center i.fa.fa-reddit td a(href="//www.reddit.com/r/freecodecamp", target='_blank') Our Subreddit + tr + td.text-center + i.fa.fa-github + td + a(href="//github.com/freecodecamp", target='_blank') Our GitHub repository tr td.text-center i.fa.fa-linkedin td - a(href="//www.linkedin.com/edu/school?id=166029", target='_blank') Our LinkedIn University Page + a(href="//www.linkedin.com/edu/school?id=166029", target='_blank') Our LinkedIn university page tr td.text-center i.fa.fa-twitter td - a(href="//twitter.com/freecodecamp", target='_blank') Our Twitter Feed - tr - td.text-center - i.fa.fa-twitch - td - a(href="//twitch.tv/freecodecamp", target='_blank') Our Twitch.tv Channel + a(href="//twitter.com/freecodecamp", target='_blank') Our Twitter feed tr td.text-center i.fa.fa-facebook td - a(href="//facebook.com/freecodecamp") Our Facebook Page + a(href="//facebook.com/freecodecamp") Our Facebook page tr td.text-center i.fa.fa-lock @@ -68,6 +72,11 @@ block content i.fa.fa-balance-scale td a(href="/code-of-conduct") Our code of conduct + tr + td.text-center + i.fa.fa-university + td + a(href="/academic-honesty") Our academic honesty policy tr td.text-center i.fa.fa-book @@ -82,7 +91,7 @@ block content td.text-center i.fa.fa-comment td - a(href="/stories") Stories from campers who've become professional developers + a(href="/stories") Stories from campers who've become professional software engineers .spacer .row .col-xs-12.col-sm-10.col-sm-offset-1.col-md-6.col-md-offset-3 diff --git a/server/views/resources/academic-honesty.jade b/server/views/resources/academic-honesty.jade new file mode 100644 index 0000000000..e903b42a6c --- /dev/null +++ b/server/views/resources/academic-honesty.jade @@ -0,0 +1,13 @@ +extends ../layout +block content + .col-xs-12.col-sm-8.col-sm-offset-2.col-md-6.col-md-offset-3 + html. +

Academic Honesty Policy

+
+

Before we issue our verified certification to a camper, he or she must accept our Academic Honesty Pledge, which reads:

+

"I understand that plagiarism means copying someone else’s work and presenting the work as if it were my own, without clearly attributing the original author.

+

"I understand that plagiarism is an act of intellectual dishonesty, and that people usually get kicked out of university or fired from their jobs if they get caught plagiarizing.

+

"Aside from using open source libraries such as jQuery and Bootstrap, and short snippets of code which are clearly attributed to their original author, 100% of the code in my projects was written by me, or along with another camper with whom I was pair programming in real time.

+

"I pledge that I did not plagiarize any of my Free Code Camp work. I understand that Free Code Camp’s team will audit my projects to confirm this."

+

In the situations where we discover instances of unambiguous plagiarism, we will replace the camper in question’s certification with a message that "Upon review, this account has been flagged for academic dishonesty."

+

As an academic institution that grants achievement-based certifications, we take academic honesty very seriously. If you have any questions about this policy, or suspect that someone has violated it, you can email team@freecodecamp.com and we will investigate.

\ No newline at end of file