gaspersic/freeCodeCamp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' into staging

Browse Source
This commit is contained in:
Quincy Larson
2015-06-01 17:07:33 -07:00
parent 207d95e026 16eb003c1f
commit 04de3ecf9b
7 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
README.md
View File

@ -14,7 +14,7 @@ Our campers (students) start by working through our free, self-paced, browser-ba
80% of our campers are over 25, and nearly a fifth of our campers are women. 80% of our campers are over 25, and nearly a fifth of our campers are women.
This code is running live at [FreeCodeCamp.com](http://www.FreeCodeCamp.com). We also have [Slack](http://freecode.slack.com), a [blog](http://blog.freecodecamp.com), and even a [Twitch.tv channel](http://twitch.tv/freecodecamp). This code is running live at [FreeCodeCamp.com](http://www.FreeCodeCamp.com). We also have [Slack](http://freecodecamp.slack.com), a [blog](http://blog.freecodecamp.com), and even a [Twitch.tv channel](http://twitch.tv/freecodecamp).
[Join our community](http://www.freecodecamp.com/signin)! [Join our community](http://www.freecodecamp.com/signin)!
@ -24,7 +24,7 @@ Contributing
We welcome pull requests from Free Code Camp campers (our students) and seasoned JavaScript developers alike! Follow these steps to contribute: We welcome pull requests from Free Code Camp campers (our students) and seasoned JavaScript developers alike! Follow these steps to contribute:
1. Check our [public Waffle Board](https://waffle.io/freecodecamp/freecodecamp). 1. Check our [public Waffle Board](https://waffle.io/freecodecamp/freecodecamp).
2. Pick an issue that nobody has claimed and start working on it. If your issue isn't on the board, open an issue. If you think you can fix it yourself, start working on it. Feel free to ask for help in our [Slack](http://freecode.slack.com). 2. Pick an issue that nobody has claimed and start working on it. If your issue isn't on the board, open an issue. If you think you can fix it yourself, start working on it. Feel free to ask for help in our [Slack](http://freecodecamp.slack.com).
3. Fork the project ([Need help with forking a project?](https://help.github.com/articles/fork-a-repo/)). You'll do all of your work on your forked copy. 3. Fork the project ([Need help with forking a project?](https://help.github.com/articles/fork-a-repo/)). You'll do all of your work on your forked copy.
4. Create a branch specific to the issue or feature you are working on. Push your work to that branch. ([Need help with branching?](https://github.com/Kunena/Kunena-Forum/wiki/Create-a-new-branch-with-git-and-manage-branches)) 4. Create a branch specific to the issue or feature you are working on. Push your work to that branch. ([Need help with branching?](https://github.com/Kunena/Kunena-Forum/wiki/Create-a-new-branch-with-git-and-manage-branches))
5. Name the branch something like `user-xxx` where user is your username and xxx is the issue number you are addressing. 5. Name the branch something like `user-xxx` where user is your username and xxx is the issue number you are addressing.

2
app.js
View File

@ -381,7 +381,7 @@ app.get('/api/slack', function(req, res) {
}; };
var options = { var options = {
url: 'https://freecode.slack.com/api/users.admin.invite', url: 'https://freecodecamp.slack.com/api/users.admin.invite',
method: 'POST', method: 'POST',
headers: headers, headers: headers,
form: invite form: invite

2
controllers/resources.js
View File

@ -227,7 +227,7 @@ module.exports = {
chat: function chat(req, res) { chat: function chat(req, res) {
if (req.user && req.user.progressTimestamps.length > 5) { if (req.user && req.user.progressTimestamps.length > 5) {
res.redirect('http://freecode.slack.com'); res.redirect('http://freecodecamp.slack.com');
} else { } else {
res.render('resources/chat', { res.render('resources/chat', {
title: 'Watch us code live on Twitch.tv' title: 'Watch us code live on Twitch.tv'

6
public/js/main_0.0.2.js
View File

@ -30,7 +30,7 @@ $(document).ready(function() {
}, },
function(res) { function(res) {
if (res) { if (res) {
window.open('https://freecode.slack.com/messages/help/', '_blank') window.open('https://freecodecamp.slack.com/messages/help/', '_blank')
} }
} }
); );
@ -48,7 +48,7 @@ $(document).ready(function() {
}, },
function(res) { function(res) {
if (res) { if (res) {
window.open('https://freecode.slack.com/messages/help/', '_blank') window.open('https://freecodecamp.slack.com/messages/help/', '_blank')
} }
} }
); );
@ -71,7 +71,7 @@ $(document).ready(function() {
}, },
function(res) { function(res) {
if (res) { if (res) {
window.open('https://freecode.slack.com/messages/letspair/', '_blank') window.open('https://freecodecamp.slack.com/messages/letspair/', '_blank')
} }
} }
); );

4
seed_data/challenges/get-set-for-free-code-camp.json
View File

@ -265,7 +265,7 @@
"Any time you get stuck or don't know what to do next, follow this simple algorithm (procedure): RSAP (Read, Search, Ask, Post).", "Any time you get stuck or don't know what to do next, follow this simple algorithm (procedure): RSAP (Read, Search, Ask, Post).",
"First, R - Read the documentation or error message. A key skill that good coders have is the ability to interpret and then follow instructions.", "First, R - Read the documentation or error message. A key skill that good coders have is the ability to interpret and then follow instructions.",
"Next, S - Search Google. Good Google queries take a lot of practice. When you search Google, you usually want to include the language or framework you're using. You also want to limit the results to a recent period.", "Next, S - Search Google. Good Google queries take a lot of practice. When you search Google, you usually want to include the language or framework you're using. You also want to limit the results to a recent period.",
"Then, if you still haven't found an answer to your question, A - Ask your friends. If you have trouble, you can ask your fellow campers. We have a special chat room specifically for getting help with tools you learn through these Free Code Camp Challenges. Go to <a href='https://freecode.slack.com/messages/help/' target='_blank'>https://freecode.slack.com/messages/help/</a>. Keep this chat open while you work on the remaining challenges.", "Then, if you still haven't found an answer to your question, A - Ask your friends. If you have trouble, you can ask your fellow campers. We have a special chat room specifically for getting help with tools you learn through these Free Code Camp Challenges. Go to <a href='https://freecodecamp.slack.com/messages/help/' target='_blank'>https://freecodecamp.slack.com/messages/help/</a>. Keep this chat open while you work on the remaining challenges.",
"Finally, P - Post on Stack Overflow. Before you attempt to do this, read Stack Overflow's guide to asking good questions: <a href='http://stackoverflow.com/help/how-to-ask'>http://stackoverflow.com/help/how-to-ask</a>.", "Finally, P - Post on Stack Overflow. Before you attempt to do this, read Stack Overflow's guide to asking good questions: <a href='http://stackoverflow.com/help/how-to-ask'>http://stackoverflow.com/help/how-to-ask</a>.",
"Here's our detailed field guide on getting help: <a href='/field-guide/how-do-i-get-help-when-i-get-stuck' target='_blank'>http://freecodecamp.com/field-guide/how-do-i-get-help-when-i-get-stuck</a>.", "Here's our detailed field guide on getting help: <a href='/field-guide/how-do-i-get-help-when-i-get-stuck' target='_blank'>http://freecodecamp.com/field-guide/how-do-i-get-help-when-i-get-stuck</a>.",
"Now you have a clear algorithm to follow when you need help! Let's start coding! Move on to your next challenge." "Now you have a clear algorithm to follow when you need help! Let's start coding! Move on to your next challenge."
@ -284,7 +284,7 @@
"Cualquier momento en el que te atasques o no sepas que hacer, sigue este simple algoritmo (procedimiento): RSAP (Read, Search, Ask, Post). Que en español vendría a ser Lee, Busca, Pregunta, Publica.", "Cualquier momento en el que te atasques o no sepas que hacer, sigue este simple algoritmo (procedimiento): RSAP (Read, Search, Ask, Post). Que en español vendría a ser Lee, Busca, Pregunta, Publica.",
"Primero, Lee - Lee la documentación o el mensaje de error. El punto fuerte de un buen programador es la habilidad de interpretar y seguir instrucciones.", "Primero, Lee - Lee la documentación o el mensaje de error. El punto fuerte de un buen programador es la habilidad de interpretar y seguir instrucciones.",
"Luego, Busca - Busca en Google. Buenas búsquedas o queries requieren bastante práctica. Cuando búsques en Google, idealmente tienes que incluir el lenguaje o framework que estés usando. También tendrás que limitar los resultados de búsqueda a un periodo reciente.", "Luego, Busca - Busca en Google. Buenas búsquedas o queries requieren bastante práctica. Cuando búsques en Google, idealmente tienes que incluir el lenguaje o framework que estés usando. También tendrás que limitar los resultados de búsqueda a un periodo reciente.",
"Ahora, en caso no hayas encontrado la respuesta a tu pregunta, Pregunta - Pregunta a tus amigos. En caso estes en problemas, puedes preguntar a otros campers. Tenemos una sala de chat especificamente para obtener ayuda sobre las herramientas que utilizamos en los desafíos de Free Code Camp. Ingresa a <a href='https://freecode.slack.com/messages/help/' target='_blank'>https://freecode.slack.com/messages/help/</a>. Mantén este chat abierto mientras trabajas en los desafíos subsiguientes.", "Ahora, en caso no hayas encontrado la respuesta a tu pregunta, Pregunta - Pregunta a tus amigos. En caso estes en problemas, puedes preguntar a otros campers. Tenemos una sala de chat especificamente para obtener ayuda sobre las herramientas que utilizamos en los desafíos de Free Code Camp. Ingresa a <a href='https://freecodecamp.slack.com/messages/help/' target='_blank'>https://freecodecamp.slack.com/messages/help/</a>. Mantén este chat abierto mientras trabajas en los desafíos subsiguientes.",
"Finalmente, Publica - Publica tu pregunta en Stack Overflow. Antes de hacer esto lee la guía de Stack Overflow para publicar buenas preguntas: <a href='http://stackoverflow.com/help/how-to-ask'>http://stackoverflow.com/help/how-to-ask</a>. Tendrás que hacerlo en inglés, en caso no sepas como, pide que te ayuden a traducir tu pregunta en el canal #espanol de Slack.", "Finalmente, Publica - Publica tu pregunta en Stack Overflow. Antes de hacer esto lee la guía de Stack Overflow para publicar buenas preguntas: <a href='http://stackoverflow.com/help/how-to-ask'>http://stackoverflow.com/help/how-to-ask</a>. Tendrás que hacerlo en inglés, en caso no sepas como, pide que te ayuden a traducir tu pregunta en el canal #espanol de Slack.",
"Aquí está nuestra guia detallada en como obtener ayuda: <a href='/field-guide/how-do-i-get-help-when-i-get-stuck' target='_blank'>http://freecodecamp.com/field-guide/how-do-i-get-help-when-i-get-stuck</a>.", "Aquí está nuestra guia detallada en como obtener ayuda: <a href='/field-guide/how-do-i-get-help-when-i-get-stuck' target='_blank'>http://freecodecamp.com/field-guide/how-do-i-get-help-when-i-get-stuck</a>.",
"Ahora que tienes en claro el procedimiento a seguir cuando necesites ayuda. ¡Empecémos a programar! Continua con el siguiente desafío." "Ahora que tienes en claro el procedimiento a seguir cuando necesites ayuda. ¡Empecémos a programar! Continua con el siguiente desafío."

2
seed_data/field-guides.json
View File

@ -225,7 +225,7 @@
" </p>", " </p>",
" <p class='large-p'>This is the most time-efficient way to handle being stuck, and it's the most respectful of other people's time, too.</p>", " <p class='large-p'>This is the most time-efficient way to handle being stuck, and it's the most respectful of other people's time, too.</p>",
" <p class='large-p'>Most of the time, you'll solve your problem after just one or two steps of this algorithm.</p>", " <p class='large-p'>Most of the time, you'll solve your problem after just one or two steps of this algorithm.</p>",
" <p class='large-p'>We have a special chat room just for getting help: <a href='https://freecode.slack.com/messages/help/' target='_blank'>https://freecode.slack.com/messages/help/</a></p>", " <p class='large-p'>We have a special chat room just for getting help: <a href='https://freecodecamp.slack.com/messages/help/' target='_blank'>https://freecodecamp.slack.com/messages/help/</a></p>",
" <p class='large-p'>Also, if you need to post on Stack Overflow, be sure to read their guide to asking good questions: <a href='http://stackoverflow.com/help/how-to-ask' target='_blank'>http://stackoverflow.com/help/how-to-ask</a>.</p>", " <p class='large-p'>Also, if you need to post on Stack Overflow, be sure to read their guide to asking good questions: <a href='http://stackoverflow.com/help/how-to-ask' target='_blank'>http://stackoverflow.com/help/how-to-ask</a>.</p>",
" <p class='large-p'>Learning to code is hard. But it's a lot easier if you ask for help when you need it!</p>", " <p class='large-p'>Learning to code is hard. But it's a lot easier if you ask for help when you need it!</p>",
"</div>" "</div>"

10
views/challengeMap/show.jade
View File

@ -91,19 +91,19 @@ block content
.modal-body .modal-body
.spacer .spacer
h4.text-left 我們正在研究將Free Code Camp翻成中文! &thinsp; h4.text-left 我們正在研究將Free Code Camp翻成中文! &thinsp;
a(href='https://freecode.slack.com/messages/chinese') 請按這裡來參觀我們的中文聊天室 a(href='https://freecodecamp.slack.com/messages/chinese') 請按這裡來參觀我們的中文聊天室
| . | .
h4.text-left Estamos trabajando a traducir Free Code Camp en español! &thinsp; h4.text-left Estamos trabajando a traducir Free Code Camp en español! &thinsp;
a(href='https://freecode.slack.com/messages/espanol') Haz clic aquí para ir a nuestra sala de chat español a(href='https://freecodecamp.slack.com/messages/espanol') Haz clic aquí para ir a nuestra sala de chat español
| . | .
h4.text-left Nós estamos trabalhando para traduzir o Free Code Camp para o Português! &thinsp; h4.text-left Nós estamos trabalhando para traduzir o Free Code Camp para o Português! &thinsp;
a(href='https://freecode.slack.com/messages/portugues') Clique aqui para visitar nossa sala de bate-papo em Português a(href='https://freecodecamp.slack.com/messages/portugues') Clique aqui para visitar nossa sala de bate-papo em Português
| . | .
h4.text-left Nous travaillons pour traduire Free Code Camp en Français! &thinsp; h4.text-left Nous travaillons pour traduire Free Code Camp en Français! &thinsp;
a(href='https://freecode.slack.com/messages/francais') Cliquez ici pour visiter notre salle de chat Français a(href='https://freecodecamp.slack.com/messages/francais') Cliquez ici pour visiter notre salle de chat Français
| . | .
h4.text-left Мы работаем над переводом Free Code Camp на русский язык! &thinsp; h4.text-left Мы работаем над переводом Free Code Camp на русский язык! &thinsp;
a(href='https://freecode.slack.com/messages/russian') Нажмите здесь, чтобы посетить русский чат a(href='https://freecodecamp.slack.com/messages/russian') Нажмите здесь, чтобы посетить русский чат
| . | .
a.btn.btn-lg.btn-primary.btn-block(href='#', data-dismiss='modal', aria-hidden='true') Thanks for the heads-up! a.btn.btn-lg.btn-primary.btn-block(href='#', data-dismiss='modal', aria-hidden='true') Thanks for the heads-up!
script. script.