From aa6ae15d4065633b640dd29cc854404e36557a57 Mon Sep 17 00:00:00 2001 From: terakilobyte Date: Thu, 28 May 2015 11:21:18 -0400 Subject: [PATCH 1/5] Fixes typo, closed #700 --- seed_data/challenges/basic-html5-and-css.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/seed_data/challenges/basic-html5-and-css.json b/seed_data/challenges/basic-html5-and-css.json index 8626a0e7b10..45b7257cde8 100644 --- a/seed_data/challenges/basic-html5-and-css.json +++ b/seed_data/challenges/basic-html5-and-css.json @@ -1103,7 +1103,7 @@ ], "tests": [ "expect($('a').children('img').length, 'Wrap your image element inside an anchor element that has its href attribute set to \"#\"').to.equal(1);", - "expect(new RegExp('#').test($('a').children('img').parent().attr('href')), 'Make sure to specify the \"src\" attritube as \"#\"').to.be.true;" + "expect(new RegExp('#').test($('a').children('img').parent().attr('href')), 'Make sure to specify the \"src\" attribute as \"#\"').to.be.true;" ], "challengeSeed": [ "", From 731cd57e8e15d66f36dc6b43e0a7e74ec45f1c90 Mon Sep 17 00:00:00 2001 From: terakilobyte Date: Thu, 28 May 2015 11:32:41 -0400 Subject: [PATCH 2/5] closes #702 --- seed_data/challenges/basic-html5-and-css.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/seed_data/challenges/basic-html5-and-css.json b/seed_data/challenges/basic-html5-and-css.json index 45b7257cde8..ece940fd01e 100644 --- a/seed_data/challenges/basic-html5-and-css.json +++ b/seed_data/challenges/basic-html5-and-css.json @@ -1425,7 +1425,7 @@ "name": "Waypoint: Add Placeholder Text to a Text Field", "difficulty": 0.039, "description": [ - "Add the placeholder text \"type a cat photo URL here\" to your text field.", + "Add the placeholder text \"cat photo URL\" to your text field.", "Placeholder text will appear in your text field before your user has inputed anything.", "For example: <input type='text' placeholder='this is placeholder text'>" ], From cb4c572591563ec94c0b8bd2c1e260e2178c02f4 Mon Sep 17 00:00:00 2001 From: Quincy Larson Date: Thu, 28 May 2015 10:07:03 -0700 Subject: [PATCH 3/5] remove slashes from BR tags and correct Spanish sentence --- seed_data/challenges/basic-html5-and-css.json | 8 ++++---- views/challengeMap/show.jade | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/seed_data/challenges/basic-html5-and-css.json b/seed_data/challenges/basic-html5-and-css.json index e1e4a582dc3..2eaeddd6aa1 100644 --- a/seed_data/challenges/basic-html5-and-css.json +++ b/seed_data/challenges/basic-html5-and-css.json @@ -143,7 +143,7 @@ "", "

CatPhotoApp

", "", - "
", + "
", "", "

Hello Paragraph

", "-->" @@ -180,7 +180,7 @@ "", "

CatPhotoApp

", "", - "
", + "
", "", "

Hello Paragraph

", "-->" @@ -216,7 +216,7 @@ "", "

CatPhotoApp

", "", - "
", + "
", "", "

Hello Paragraph

" ], @@ -252,7 +252,7 @@ "", "

CatPhotoApp

", "", - "
", + "
", "", "

Kitty ipsum dolor sit amet, shed everywhere shed everywhere stretching attack your ankles chase the red dot, hairball run catnip eat the grass sniff.

" ], diff --git a/views/challengeMap/show.jade b/views/challengeMap/show.jade index 7b2d97385ec..551b7857d25 100644 --- a/views/challengeMap/show.jade +++ b/views/challengeMap/show.jade @@ -64,7 +64,7 @@ block content a(href='https://freecode.slack.com/messages/chinese') 請按這裡來參觀我們的中文聊天室 | . h4.text-left Estamos trabajando a traducir Free Code Camp en español!   - a(href='https://freecode.slack.com/messages/espanol') Haz clic aquí para ir a nuestra sala de chat españal + a(href='https://freecode.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!   a(href='https://freecode.slack.com/messages/portugues') Clique aqui para visitar nossa sala de bate-papo em Português From e7b9a90fbe071b4d23af258096a7901cdf210046 Mon Sep 17 00:00:00 2001 From: Quincy Larson Date: Thu, 28 May 2015 10:24:49 -0700 Subject: [PATCH 4/5] add back omitted cities - sorry everyone! --- seed_data/field-guides.json | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/seed_data/field-guides.json b/seed_data/field-guides.json index ef19bb24a14..ebd3384f7a2 100644 --- a/seed_data/field-guides.json +++ b/seed_data/field-guides.json @@ -292,13 +292,16 @@ "
  • Baltimore
    • ", "
  • Bandung
    • ", "
  • Belgrade
    • ", + "
  • Bellingham
    • ", "
  • Bengaluru
    • ", "
  • Berkeley
    • ", "
  • Berlin
    • ", "
  • Bhaktapur
    • ", "
  • Bismarck, ND
    • ", + "
  • Bogota
    • ", "
  • Boston
    • ", "
  • Boulder
    • ", + "
  • Bratislava
    • ", "
  • Brussels
    • ", "
  • Buenos Aires
    • ", "
  • Bucharest
    • ", @@ -307,6 +310,7 @@ "
  • Calgary
    • ", "
  • Campinas
    • ", "
  • Cape Town
    • ", + "
  • Caracas
    • ", "
  • Charlotte
    • ", "
  • Chennai
    • ", "
  • Chicago
    • ", @@ -318,6 +322,7 @@ "
  • Dallas
    • ", "
  • Delhi
    • ", "
  • Denver
    • ", + "
  • Dhaka
    • ", "
  • Doha
    • ", "
  • Dubai
    • ", "
  • Edmonton
    • ", @@ -336,9 +341,12 @@ "
  • Iasi
    • ", "
  • Irkutsk
    • ", "
  • Islamabad
    • ", + "
  • Hampton Roads
    • ", "
  • Ho Chi Minh City
    • ", "
  • Hyderabad
    • ", + "
  • Kaduna
    • ", "
  • Kalamazoo
    • ", + "
  • Kansas City
    • ", "
  • Karachi
    • ", "
  • Kathmandu
    • ", "
  • Kemerovo
    • ", @@ -346,6 +354,7 @@ "
  • Kolkata
    • ", "
  • Krasnodar
    • ", "
  • Kryvyi Rih
    • ", + "
  • Lagos
    • ", "
  • Lahore
    • ", "
  • Limassol
    • ", "
  • London
    • ", @@ -355,6 +364,7 @@ "
  • Minneapolis
    • ", "
  • Missoula
    • ", "
  • Montreal
    • ", + "
  • Moscow
    • ", "
  • Munich
    • ", "
  • Mysore
    • ", "
  • Nairobi
    • ", From 131b9ad1b7761e98b2eea83d7171b71456dd21ad Mon Sep 17 00:00:00 2001 From: terakilobyte Date: Thu, 28 May 2015 14:13:31 -0400 Subject: [PATCH 5/5] bump version numbers to force fresh browser fetch and suppress "editor is not defined". closes # --- ...HCJQFramework_0.1.5.js => coursewaresHCJQFramework_0.1.6.js} | 2 +- .../{iFrameScripts_0.0.3.js => iFrameScripts_0.0.4.js} | 0 views/coursewares/showHTML.jade | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) rename public/js/lib/coursewares/{coursewaresHCJQFramework_0.1.5.js => coursewaresHCJQFramework_0.1.6.js} (99%) rename public/js/lib/coursewares/{iFrameScripts_0.0.3.js => iFrameScripts_0.0.4.js} (100%) diff --git a/public/js/lib/coursewares/coursewaresHCJQFramework_0.1.5.js b/public/js/lib/coursewares/coursewaresHCJQFramework_0.1.6.js similarity index 99% rename from public/js/lib/coursewares/coursewaresHCJQFramework_0.1.5.js rename to public/js/lib/coursewares/coursewaresHCJQFramework_0.1.6.js index 050a9fbc543..c4a84715fd9 100644 --- a/public/js/lib/coursewares/coursewaresHCJQFramework_0.1.5.js +++ b/public/js/lib/coursewares/coursewaresHCJQFramework_0.1.6.js @@ -51,7 +51,7 @@ var libraryIncludes = ""; +var iFrameScript = ""; var delay; // Initialize CodeMirror editor with a nice html5 canvas demo. diff --git a/public/js/lib/coursewares/iFrameScripts_0.0.3.js b/public/js/lib/coursewares/iFrameScripts_0.0.4.js similarity index 100% rename from public/js/lib/coursewares/iFrameScripts_0.0.3.js rename to public/js/lib/coursewares/iFrameScripts_0.0.4.js diff --git a/views/coursewares/showHTML.jade b/views/coursewares/showHTML.jade index 2e61cdb927a..d01f48929c1 100644 --- a/views/coursewares/showHTML.jade +++ b/views/coursewares/showHTML.jade @@ -91,4 +91,4 @@ block content .animated.zoomInDown.delay-half span.completion-icon.ion-checkmark-circled.text-primary a.animated.fadeIn.btn.btn-lg.signup-btn.btn-block(href='/login') Sign in so you can save your progress - script(src="/js/lib/coursewares/coursewaresHCJQFramework_0.1.5.js") + script(src="/js/lib/coursewares/coursewaresHCJQFramework_0.1.6.js")