From bfe3c96ba991c751b59448e1b1ef5b2c3662aecf Mon Sep 17 00:00:00 2001 From: Quincy Larson Date: Mon, 11 May 2015 17:56:36 -0700 Subject: [PATCH 1/8] 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 2/8] 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 3/8] 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 4/8] 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 5/8] 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 6/8] 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 7/8] 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 8/8] 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. ",