From 2a449b2eb157613b89704343810bd7f9a6393467 Mon Sep 17 00:00:00 2001 From: Quincy Larson Date: Sun, 10 May 2015 23:25:55 -0700 Subject: [PATCH 01/16] add code school angular back in --- seed_data/coursewares.json | 37 ++++++++++++++++++++++--------------- seed_data/field-guides.json | 3 +++ 2 files changed, 25 insertions(+), 15 deletions(-) diff --git a/seed_data/coursewares.json b/seed_data/coursewares.json index d1dd9eb3c1..724af142fb 100644 --- a/seed_data/coursewares.json +++ b/seed_data/coursewares.json @@ -493,11 +493,11 @@ "_id": "bd7154d8c441eddfaeb5bdef", "name": "Get Started with Angular.js", "difficulty": 0.34, - "challengeSeed": "125671736", + "challengeSeed": "114684726", "description": [ - "Angular.js is a popular client-side JavaScript framework. It will help you create buttery smooth browser-based interactions.", - "Codecademy has a fun, interactive Angular.js course. This will give us a quick tour of Angular.js's mechanics and features.", - "Complete Unit 1 of http://www.codecademy.com/learn/learn-angularjs" + "Code School has a short, free Angular.js course. This will give us a quick tour of Angular.js's mechanics and features.", + "In this course, we'll build a virtual shop entirely in Angular.js.", + "Go to http://campus.codeschool.com/courses/shaping-up-with-angular-js/level/1/section/1/video/1 and complete the section." ], "challengeType": 2, "tests": [] @@ -506,42 +506,49 @@ "_id": "bd7155d8c441eddfaeb5bdef", "name": "Apply Angular.js Directives", "difficulty": 0.35, - "challengeSeed": "125671736", + "challengeSeed": "114684727", "description": [ - "Complete Unit 2 of http://www.codecademy.com/learn/learn-angularjs" + "Directives serve as markers in your HTML. When Angular.js compiles your HTML, it will can alter the behavior of DOM elements based on the directives you've used.", + "Let's learn how these powerful directives work, and how to use them to make your web apps more dynamic", + "Go to http://campus.codeschool.com/courses/shaping-up-with-angular-js/level/2/section/1/video/1 and complete the section." ], "challengeType": 2, "tests": [] }, { "_id": "bd7156d8c441eddfaeb5bdef", - "name": "Create Angular.js Services", + "name": "Power Forms with Angular.js", "difficulty": 0.36, - "challengeSeed": "125671736", + "challengeSeed": "114684729", "description": [ - "Complete Unit 3 of http://www.codecademy.com/learn/learn-angularjs" + "One area where Angular.js really shines is its powerful web forms.", + "Learn how to create reactive Angular.js forms, including real-time form validation.", + "Go to http://campus.codeschool.com/courses/shaping-up-with-angular-js/level/3/section/1/video/1 and complete the section." ], "challengeType": 2, "tests": [] }, { "_id": "bd7157d8c441eddfaeb5bdef", - "name": "Structure Angular.js Routes", + "name": "Customize Angular.js Directives", "difficulty": 0.37, - "challengeSeed": "125671736", + "challengeSeed": "114685062", "description": [ - "Complete Unit 4 of http://www.codecademy.com/learn/learn-angularjs" + "Now we'll learn how to modify existing Angular.js directives, and even build directives of your own.", + "Go to http://campus.codeschool.com/courses/shaping-up-with-angular-js/level/4/section/1/video/1 and complete the section." ], "challengeType": 2, "tests": [] }, { "_id": "bd7158d8c441eddfaeb5bdef", - "name": "Build a Geolocation Angular App", + "name": "Create Angular.js Services", "difficulty": 0.38, - "challengeSeed": "125671736", + "challengeSeed": "114685060", "description": [ - "Complete Unit 5 of http://www.codecademy.com/learn/learn-angularjs" + "Services are functions that you can use and reuse throughout your Angular.js app to get things done.", + "We'll learn how to use services in this final Code School Angular.js challenge.", + "Go to http://campus.codeschool.com/courses/shaping-up-with-angular-js/level/5/section/1/video/1 and complete the section." ], "challengeType": 2, "tests": [] diff --git a/seed_data/field-guides.json b/seed_data/field-guides.json index e0761835bc..d639772eb6 100644 --- a/seed_data/field-guides.json +++ b/seed_data/field-guides.json @@ -287,8 +287,10 @@ "
  • Berkeley
    • ", "
  • Berlin
    • ", "
  • Cincinnati
    • ", + "
  • Delhi
    • ", "
  • Denver
    • ", "
  • Dubai
    • ", + "
  • Hong Kong
    • ", "
  • Hyderabad
    • ", "
  • Kalamazoo
    • ", "
  • Karachi
    • ", @@ -299,6 +301,7 @@ "
  • Minneapolis
    • ", "
  • Missoula
    • ", "
  • Nashville
    • ", + "
  • New Orleans
    • ", "
  • New York City
    • ", "
  • Oxford, Alabama
    • ", "
  • Paris
    • ", From 385573a36ff05070b9bc2c5ab006abf1a9624508 Mon Sep 17 00:00:00 2001 From: Quincy Larson Date: Mon, 11 May 2015 11:45:16 -0700 Subject: [PATCH 02/16] add local groups --- seed_data/field-guides.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/seed_data/field-guides.json b/seed_data/field-guides.json index d639772eb6..8ef58424d3 100644 --- a/seed_data/field-guides.json +++ b/seed_data/field-guides.json @@ -285,6 +285,7 @@ "
  • Atlanta
    • ", "
  • Bandung
    • ", "
  • Berkeley
    • ", + "
  • Chicago
    • ", "
  • Berlin
    • ", "
  • Cincinnati
    • ", "
  • Delhi
    • ", @@ -304,6 +305,7 @@ "
  • New Orleans
    • ", "
  • New York City
    • ", "
  • Oxford, Alabama
    • ", + "
  • Oakland
    • ", "
  • Paris
    • ", "
  • Philadelphia
    • ", "
  • Pittsburgh
    • ", @@ -317,6 +319,7 @@ "
  • San Jose
    • ", "
  • Scottsdale
    • ", "
  • Seattle
    • ", + "
  • Solo
    • ", "
  • Taipei
    • ", "
  • Tampa
    • ", "
  • Tempe
    • ", From bfe3c96ba991c751b59448e1b1ef5b2c3662aecf Mon Sep 17 00:00:00 2001 From: Quincy Larson Date: Mon, 11 May 2015 17:56:36 -0700 Subject: [PATCH 03/16] add more local groups --- seed_data/field-guides.json | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/seed_data/field-guides.json b/seed_data/field-guides.json index 8ef58424d3..7e11226c09 100644 --- a/seed_data/field-guides.json +++ b/seed_data/field-guides.json @@ -285,6 +285,10 @@ "
  • Atlanta
    • ", "
  • Bandung
    • ", "
  • Berkeley
    • ", + "
  • Bellingham
    • ", + "
  • Boston
    • ", + "
  • Buenos Aires
    • ", + "
  • Calgary
    • ", "
  • Chicago
    • ", "
  • Berlin
    • ", "
  • Cincinnati
    • ", @@ -294,6 +298,7 @@ "
  • Hong Kong
    • ", "
  • Hyderabad
    • ", "
  • Kalamazoo
    • ", + "
  • Kansas City
    • ", "
  • Karachi
    • ", "
  • London
    • ", "
  • Los Angeles
    • ", From ab187f821abc9cdb8133fb0ff45e30a6ecac8869 Mon Sep 17 00:00:00 2001 From: Quincy Larson Date: Mon, 11 May 2015 18:36:39 -0700 Subject: [PATCH 04/16] add another local group --- seed_data/field-guides.json | 1 + 1 file changed, 1 insertion(+) diff --git a/seed_data/field-guides.json b/seed_data/field-guides.json index 7e11226c09..810108f4db 100644 --- a/seed_data/field-guides.json +++ b/seed_data/field-guides.json @@ -295,6 +295,7 @@ "
  • Delhi
    • ", "
  • Denver
    • ", "
  • Dubai
    • ", + "
  • Hermosillo
    • ", "
  • Hong Kong
    • ", "
  • Hyderabad
    • ", "
  • Kalamazoo
    • ", From 06a92202beed25f063d7f6014489dfe69a40546c Mon Sep 17 00:00:00 2001 From: Quincy Larson Date: Mon, 11 May 2015 23:46:38 -0700 Subject: [PATCH 05/16] hotfix to fix #440 --- views/account/show.jade | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/views/account/show.jade b/views/account/show.jade index 6f031d1ec3..f202664703 100644 --- a/views/account/show.jade +++ b/views/account/show.jade @@ -46,7 +46,7 @@ block content .col-xs-12.col-sm-12.col-md-3.text-center .background-svg.img-center .points-on-top - = "[ " + (user ? progressTimestamps.length : 0) + " ]" + = "[ " + (progressTimestamps.length) + " ]" .row From 682146b3f5ade5a39dfae636959405d7aca0697d Mon Sep 17 00:00:00 2001 From: Quincy Larson Date: Tue, 12 May 2015 00:05:08 -0700 Subject: [PATCH 06/16] fix #443 --- app.js | 4 ++-- seed_data/coursewares.json | 2 +- seed_data/field-guides.json | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app.js b/app.js index 1121d0510d..10e269fda9 100755 --- a/app.js +++ b/app.js @@ -183,7 +183,7 @@ app.use(helmet.csp({ '*.twitter.com' ].concat(trusted), frameSrc: [ - + '*.gitter.im', '*.gitter.im https:', '*.vimeo.com', @@ -332,7 +332,7 @@ app.post( ); app.get('/privacy', function(req, res) { - res.redirect(301, '/field-guide/what-is-free-code-camp\'s-privacy-policy'); + res.redirect(301, '/field-guide/what-is-the-free-code-camp-privacy-policy?'); }); app.get('/api/slack', function(req, res) { diff --git a/seed_data/coursewares.json b/seed_data/coursewares.json index 724af142fb..fffdab5fbb 100644 --- a/seed_data/coursewares.json +++ b/seed_data/coursewares.json @@ -29,7 +29,7 @@ "Now check your email and click the link in the email from Slack", "Complete the sign up process, then update your biographical information and upload an image. A picture of your face works best. This is how people will see you in the chat room, so put your best foot forward.", "Now enter the general chat room and introduce yourself to our chat room by typing: \"hello world!\".", - "Note that you're expected to follow our Code of Conduct: http://freecodecamp.com/field-guide/what-is-free-code-camp's-code-of-conduct.", + "Note that you're expected to follow our Code of Conduct: http://freecodecamp.com/field-guide/what-is-the-free-code-camp-code-of-conduct?", "Tell your fellow campers how you found Free Code Camp. Also tell us why you want to learn to code.", "Keep the chat room open while you work through the other challenges. That way you ask for help if you get stuck on a challenge. You can also socialize when you feel like taking a break.", "You can also access this chat room by clicking the \"Chat\" button in the upper right hand corner." diff --git a/seed_data/field-guides.json b/seed_data/field-guides.json index 810108f4db..bc74b149cd 100644 --- a/seed_data/field-guides.json +++ b/seed_data/field-guides.json @@ -586,7 +586,7 @@ }, { "_id": "bd7158d9c451eddfaeb5bdee", - "name": "What is Free Code Camp's Code of Conduct?", + "name": "What is the Free Code Camp Code of Conduct?", "description": [ "
    ", "

    Free Code Camp is friendly place to learn to code. We're committed to keeping it that way.

    ", @@ -610,7 +610,7 @@ }, { "_id": "bd7158d9c451eddfaeb5bdef", - "name": "What is Free Code Camp's Privacy Policy?", + "name": "What is the Free Code Camp Privacy Policy?", "description": [ "
    ", "

    Free Code Camp is committed to respecting the privacy of visitors to our web sites and web applications. The guidelines below explain how we protect the privacy of visitors to FreeCodeCamp.com and its features.

    ", From 39a23c133e6e4a1d4cf3002991473c2040ae1f77 Mon Sep 17 00:00:00 2001 From: Quincy Larson Date: Tue, 12 May 2015 14:54:51 -0700 Subject: [PATCH 07/16] add local groups --- seed_data/field-guides.json | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/seed_data/field-guides.json b/seed_data/field-guides.json index bc74b149cd..8ae1170331 100644 --- a/seed_data/field-guides.json +++ b/seed_data/field-guides.json @@ -285,19 +285,25 @@ "
  • Atlanta
    • ", "
  • Bandung
    • ", "
  • Berkeley
    • ", + "
  • Berlin
    • ", "
  • Bellingham
    • ", "
  • Boston
    • ", + "
  • Bratislava
    • ", + "
  • Budapest
    • ", "
  • Buenos Aires
    • ", "
  • Calgary
    • ", + "
  • Caracas
    • ", "
  • Chicago
    • ", - "
  • Berlin
    • ", "
  • Cincinnati
    • ", + "
  • Dallas
    • ", "
  • Delhi
    • ", "
  • Denver
    • ", "
  • Dubai
    • ", + "
  • Hampton Roads
    • ", "
  • Hermosillo
    • ", "
  • Hong Kong
    • ", "
  • Hyderabad
    • ", + "
  • Kaduna
    • ", "
  • Kalamazoo
    • ", "
  • Kansas City
    • ", "
  • Karachi
    • ", @@ -307,11 +313,11 @@ "
  • Miami
    • ", "
  • Minneapolis
    • ", "
  • Missoula
    • ", + "
  • Moscow
    • ", "
  • Nashville
    • ", "
  • New Orleans
    • ", "
  • New York City
    • ", "
  • Oxford, Alabama
    • ", - "
  • Oakland
    • ", "
  • Paris
    • ", "
  • Philadelphia
    • ", "
  • Pittsburgh
    • ", From 5cd87bc2a57aee899eb304e411977c256f454e7c Mon Sep 17 00:00:00 2001 From: Quincy Larson Date: Tue, 12 May 2015 18:19:37 -0700 Subject: [PATCH 08/16] add new local groups --- seed_data/field-guides.json | 1 + 1 file changed, 1 insertion(+) diff --git a/seed_data/field-guides.json b/seed_data/field-guides.json index 8ae1170331..7a4f96cfdb 100644 --- a/seed_data/field-guides.json +++ b/seed_data/field-guides.json @@ -307,6 +307,7 @@ "
  • Kalamazoo
    • ", "
  • Kansas City
    • ", "
  • Karachi
    • ", + "
  • Lagos
    • ", "
  • London
    • ", "
  • Los Angeles
    • ", "
  • Manila
    • ", From 5b21f71f6466753b5345e9c74407680dec1000f8 Mon Sep 17 00:00:00 2001 From: Quincy Larson Date: Tue, 12 May 2015 22:36:57 -0700 Subject: [PATCH 09/16] add additional cities --- seed_data/field-guides.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/seed_data/field-guides.json b/seed_data/field-guides.json index 7a4f96cfdb..bac06a8ad9 100644 --- a/seed_data/field-guides.json +++ b/seed_data/field-guides.json @@ -282,11 +282,11 @@ "

    Find your city below and join their group. This is a great way to hang out with other coders, share insights, and pair program.

    ", "

    ", "
      ", - "
    1. Atlanta
      2. ", "
    2. Bandung
      3. ", "
    3. Berkeley
      4. ", "
    4. Berlin
      5. ", "
    5. Bellingham
      6. ", + "
    6. Bogota
      7. ", "
    7. Boston
      8. ", "
    8. Bratislava
      9. ", "
    9. Budapest
      10. ", @@ -298,6 +298,7 @@ "
    10. Dallas
      11. ", "
    11. Delhi
      12. ", "
    12. Denver
      13. ", + "
    13. Dhaka
      14. ", "
    14. Dubai
      15. ", "
    15. Hampton Roads
      16. ", "
    16. Hermosillo
      17. ", From f6697394b95475a83e702ce652e035e308c9f6b1 Mon Sep 17 00:00:00 2001 From: Quincy Larson Date: Wed, 13 May 2015 12:46:05 -0700 Subject: [PATCH 10/16] add more local groups and India group --- seed_data/field-guides.json | 34 ++++++++++++++++------------------ 1 file changed, 16 insertions(+), 18 deletions(-) diff --git a/seed_data/field-guides.json b/seed_data/field-guides.json index bac06a8ad9..f0da941f3c 100644 --- a/seed_data/field-guides.json +++ b/seed_data/field-guides.json @@ -282,49 +282,41 @@ "

      Find your city below and join their group. This is a great way to hang out with other coders, share insights, and pair program.

      ", "

      ", "
        ", + "
      1. Atlanta
        2. ", "
      2. Bandung
        3. ", + "
      3. Belgrade
        4. ", + "
      4. Bengaluru
        5. ", "
      5. Berkeley
        6. ", - "
      6. Berlin
        7. ", - "
      7. Bellingham
        8. ", - "
      8. Bogota
        9. ", - "
      9. Boston
        10. ", - "
      10. Bratislava
        11. ", - "
      11. Budapest
        12. ", - "
      12. Buenos Aires
        13. ", - "
      13. Calgary
        14. ", - "
      14. Caracas
        15. ", + "
      15. Cape Town
        16. ", "
      16. Chicago
        17. ", + "
      17. Berlin
        18. ", "
      18. Cincinnati
        19. ", - "
      19. Dallas
        20. ", "
      20. Delhi
        21. ", "
      21. Denver
        22. ", - "
      22. Dhaka
        23. ", "
      23. Dubai
        24. ", - "
      24. Hampton Roads
        25. ", - "
      25. Hermosillo
        26. ", "
      26. Hong Kong
        27. ", "
      27. Hyderabad
        28. ", - "
      28. Kaduna
        29. ", "
      29. Kalamazoo
        30. ", - "
      30. Kansas City
        31. ", "
      31. Karachi
        32. ", - "
      32. Lagos
        33. ", "
      33. London
        34. ", "
      34. Los Angeles
        35. ", "
      35. Manila
        36. ", "
      36. Miami
        37. ", "
      37. Minneapolis
        38. ", "
      38. Missoula
        39. ", - "
      39. Moscow
        40. ", + "
      40. Mysore
        41. ", "
      41. Nashville
        42. ", "
      42. New Orleans
        43. ", "
      43. New York City
        44. ", "
      44. Oxford, Alabama
        45. ", + "
      45. Oakland
        46. ", "
      46. Paris
        47. ", "
      47. Philadelphia
        48. ", "
      48. Pittsburgh
        49. ", "
      49. Phoenix
        50. ", + "
      50. Portland
        51. ", "
      51. Providence
        52. ", + "
      52. Raleigh
        53. ", "
      53. Richmond
        54. ", "
      54. Rio de Janeiro
        55. ", "
      55. San Bernardino
        56. ", @@ -340,7 +332,13 @@ "
      56. Washington, DC
        57. ", "
      ", "

      ", - "

      If you didn't see your city on this list, you should create your own Facebook group for your city. Please follow these steps:

      ", + "

      We also have larger groups for the following regions:

      ", + "

      ", + "
        ", + "
      1. India
        2. ", + "
      ", + "

      ", + "

      If you didn't see your city on this list, you should create your own Facebook group for your city. Please follow these steps:

      ", "

      ", "
        ", "
      1. Sign in to Facebook.
        2. ", From e58507f20457785d4e7fe6f6bedd3296d4b91f4f Mon Sep 17 00:00:00 2001 From: Quincy Larson Date: Wed, 13 May 2015 13:48:02 -0700 Subject: [PATCH 11/16] add local groups --- seed_data/field-guides.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/seed_data/field-guides.json b/seed_data/field-guides.json index f0da941f3c..85de2e0b69 100644 --- a/seed_data/field-guides.json +++ b/seed_data/field-guides.json @@ -308,8 +308,8 @@ "
      2. Nashville
        3. ", "
      3. New Orleans
        4. ", "
      4. New York City
        5. ", + "
      5. Orlando
        6. ", "
      6. Oxford, Alabama
        7. ", - "
      7. Oakland
        8. ", "
      8. Paris
        9. ", "
      9. Philadelphia
        10. ", "
      10. Pittsburgh
        11. ", @@ -319,6 +319,7 @@ "
      11. Raleigh
        12. ", "
      12. Richmond
        13. ", "
      13. Rio de Janeiro
        14. ", + "
      14. Sacramento
        15. ", "
      15. San Bernardino
        16. ", "
      16. San Diego
        17. ", "
      17. San Francisco
        18. ", From f85e14079d32aef0c79e15e46b20fbbfa3457fac Mon Sep 17 00:00:00 2001 From: Quincy Larson Date: Wed, 13 May 2015 13:49:36 -0700 Subject: [PATCH 12/16] remove India region that is non functioanl --- seed_data/field-guides.json | 6 ------ 1 file changed, 6 deletions(-) diff --git a/seed_data/field-guides.json b/seed_data/field-guides.json index 85de2e0b69..a365d8ae96 100644 --- a/seed_data/field-guides.json +++ b/seed_data/field-guides.json @@ -333,12 +333,6 @@ "
      18. Washington, DC
        19. ", "
      ", "

      ", - "

      We also have larger groups for the following regions:

      ", - "

      ", - "
        ", - "
      1. India
        2. ", - "
      ", - "

      ", "

      If you didn't see your city on this list, you should create your own Facebook group for your city. Please follow these steps:

      ", "

      ", "
        ", From 0e75d251b5a68559afd0d477084d0fd953b5e5f2 Mon Sep 17 00:00:00 2001 From: Quincy Larson Date: Wed, 13 May 2015 15:31:32 -0700 Subject: [PATCH 13/16] improvements to fieldguide with alex-dixon --- seed_data/field-guides.json | 59 +++++++++++++++++++++++-------------- 1 file changed, 37 insertions(+), 22 deletions(-) diff --git a/seed_data/field-guides.json b/seed_data/field-guides.json index a365d8ae96..141c1700f6 100644 --- a/seed_data/field-guides.json +++ b/seed_data/field-guides.json @@ -4,7 +4,7 @@ "name": "How do I use this guide?", "description": [ "
        ", - "

        This guide will answer many of your questions about learning to code and getting a coding job.

        ", + "

        This guide strives to provide clear answers to common questions about Free Code Camp, learning to code, and getting a coding job.

        ", "

        If you're logged in, you can click the \"Next article\" button to go to your next article.

        ", "

        You can also click the \"Show me all articles\" button to browse all the questions we answer.

        ", "
        " @@ -222,10 +222,10 @@ }, { "_id": "bd7158d9c436eddfaeb5bd3f", - "name": "Can I jump around in this Field Guide?", + "name": "Can I jump around in this guide?", "description": [ "
        ", - "

        This Field Guide was designed as a reference for you. You shouldn't try to read it all today.

        ", + "

        This guide was designed as a reference for you. You shouldn't try to read it all today.

        ", "

        Feel free to come back any time and jump around, reading any articles that seem interesting to you at the time.

        ", "

        If you're currently doing our \"Browse our Field Guide\" Waypoint, go ahead and mark that challenge complete and move on to your next Waypoint.

        ", "
        " @@ -373,24 +373,6 @@ "

    " ] }, - { - "_id": "bd7158d9c436eddfaeb5bd3c", - "name": "How can I reach Free Code Camp's team to interview them for my publication?", - "description": [ - "
    ", - "

    We're happy to do a quick interview for your publication or show. Here's whom you should contact about what, and how to best reach them:

    ", - "

    ", - "
      ", - "
    1. Want to talk to about Free Code Camp's curriculum or long-term vision? Reach out to Quincy Larson. He's @ossia on Twitter and @quincylarson on Slack.
      2. ", - "
    2. Want to talk about Free Code Camp's open source codebase, infrastructure, or JavaScript in general? Talk to Nathan Leniz. He's @terakilobyte on Twitter and @terakilobyte on Slack.
      3. ", - "
    3. Want to explore our efforts to empower nonprofits with code? Michael D. Johnson eats, sleeps and breathes that. He's @figitalboy on Twitter and @codenonprofit on Slack.
      4. ", - "
    4. Want to get a camper's perspective on our community? Talk with Bianca Mihai (@biancamihai on Slack and @bubuslubu on Twitter) or Suzanne Atkinson (@adventurebear on Slack and @steelcitycoach on Twitter).", - "
    ", - "

    ", - "

    We strive to be helpful and transparent in everything we do. We'll do what we can to help you share our community with your audience.

    ", - "
    " - ] - }, { "_id": "bd7158d9c442eddfaeb5bdef", "name": "How do I best use the Global Control Shortcuts for Mac?", @@ -417,7 +399,7 @@ }, { "_id": "bd7158d9c445eddfaeb5bdef", - "name": "How can I get to Inbox Zero with Gmail Shortcuts?", + "name": "How can I get to Inbox Zero with Gmail shortcuts?", "description": [ "
    ", "

    These Gmail Shortcuts will save you hours and help you get to Inbox Zero.


    ", @@ -649,5 +631,38 @@ "

    If you have any questions or concerns, please send an email to team@freecodecamp.com.

    ", "
    " ] + }, + { + "_id": "bd7158d9c436eddfaeb5bd3c", + "name": "How can I reach the Free Code Camp team to interview them for my publication?", + "description": [ + "
    ", + "

    We're happy to do a quick interview for your publication or show. Here's whom you should contact about what, and how to best reach them:

    ", + "

    ", + "
      ", + "
    1. Want to talk to about Free Code Camp's curriculum or long-term vision? Reach out to Quincy Larson. He's @ossia on Twitter and @quincylarson on Slack.
      2. ", + "
    2. Want to talk about Free Code Camp's open source codebase, infrastructure, or JavaScript in general? Talk to Nathan Leniz. He's @terakilobyte on Twitter and @terakilobyte on Slack.
      3. ", + "
    3. Want to explore our efforts to empower nonprofits with code? Michael D. Johnson eats, sleeps and breathes that. He's @figitalboy on Twitter and @codenonprofit on Slack.
      4. ", + "
    4. Want to get a camper's perspective on our community? Talk with Bianca Mihai (@biancamihai on Slack and @bubuslubu on Twitter) or Suzanne Atkinson (@adventurebear on Slack and @steelcitycoach on Twitter).", + "
    ", + "

    ", + "

    We strive to be helpful and transparent in everything we do. We'll do what we can to help you share our community with your audience.

    ", + "
    " + ] + }, + { + "_id": "bd7158d9c436eddfadb5bd3e", + "name": "How can I contribute to this guide?", + "description": [ + "
    ", + "

    Contributing to our field guide is a great way to establish your history on GitHub, add to your portfolio, and help other campers. If you have a question about JavaScript or programming in general that you'd like us to add to the field guide, here are two ways to get it into the guide:

    ", + "

    ", + "
      ", + "
    1. You can message @alex-dixon in Slack with your question.
      2. ", + "
    2. You can also contribute to this field guide directly via GitHub pull request, by cloning Free Code Camp's main repository and modifying field-guides.json.
      3. ", + "
    ", + "

    ", + "
    " + ] } ] From f0d545d8b9c44a782abd6eab0141e54b55af685c Mon Sep 17 00:00:00 2001 From: terakilobyte Date: Thu, 14 May 2015 18:01:35 -0400 Subject: [PATCH 14/16] Add License --- LICENSE.md | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 LICENSE.md diff --git a/LICENSE.md b/LICENSE.md new file mode 100644 index 0000000000..a79d0bc7f1 --- /dev/null +++ b/LICENSE.md @@ -0,0 +1,21 @@ +The MIT License (MIT) + +Copyright (c) 2015 Free Code Camp + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. \ No newline at end of file From 9f7e6530c10122d389f7ed89c1d29db3a02dda1a Mon Sep 17 00:00:00 2001 From: terakilobyte Date: Thu, 14 May 2015 18:14:16 -0400 Subject: [PATCH 15/16] update license to bsd-3-clause and update package.json to reflect license and contributors --- LICENSE.md | 23 ++++++----------------- package.json | 11 +++++++++++ 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/LICENSE.md b/LICENSE.md index a79d0bc7f1..313995e5ad 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -1,21 +1,10 @@ -The MIT License (MIT) +Copyright (c) 2015 Free Code Camp . All rights reserved. +Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: -Copyright (c) 2015 Free Code Camp +1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: +2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. +3. Neither the name of Free Code Camp nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -THE SOFTWARE. \ No newline at end of file +THIS SOFTWARE IS PROVIDED BY FREE CODE CAMP AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. \ No newline at end of file diff --git a/package.json b/package.json index 06ac013149..a73ad3fc48 100644 --- a/package.json +++ b/package.json @@ -13,6 +13,17 @@ "start": "node app.js", "test": "mocha" }, + "license": "BSD-3-Clause", + "contributors" : [ + { + "name": "Quincy Larson", + "url" : "https://github.com/QuincyLarson" + }, + { + "name": "Nathan Leniz", + "url": "https://github.com/terakilobyte" + } + ], "dependencies": { "accepts": "~1.2.5", "async": "~0.9.0", From 294f0810469ece58f326feec7e2729a8f2dcbdb5 Mon Sep 17 00:00:00 2001 From: terakilobyte Date: Thu, 14 May 2015 18:22:38 -0400 Subject: [PATCH 16/16] update license text --- LICENSE.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/LICENSE.md b/LICENSE.md index 313995e5ad..30e4120732 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -7,4 +7,4 @@ Redistribution and use in source and binary forms, with or without modification, 3. Neither the name of Free Code Camp nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. -THIS SOFTWARE IS PROVIDED BY FREE CODE CAMP AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. \ No newline at end of file +THIS SOFTWARE IS PROVIDED BY FREE CODE CAMP AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL FREE CODE CAMP OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. \ No newline at end of file