Commit Graph

487 Commits (b001b8f8f2bd1d560206412be541de02d093db45)

Author SHA1 Message Date
benmcmahon100 095552dbbe Added a more specific example 2015-08-13 21:25:31 +01:00
Quincy Larson 4cdd0e20d9 start adding json challenges 2015-08-13 12:55:50 -07:00
benmcmahon100 299405694b Add some code highlighting 2015-08-13 17:36:02 +01:00
benmcmahon100 c0140a9510 Added some testing and debugging challenges 2015-08-13 17:33:23 +01:00
Quincy Larson 66bd9338ab remove inaccurate copy from jQuery challenge 2015-08-13 00:57:36 -07:00
Quincy Larson 1b7195fbc1 replace RSAP with read-search-ask and replace AWS gifs with Imgur 2015-08-13 00:56:05 -07:00
Quincy Larson bf2db5ff62 Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging 2015-08-12 21:25:11 -07:00
Quincy Larson 99d0a58049 update the look of onboarding and change RSAP to RSA 2015-08-12 21:24:57 -07:00
Berkeley Martinez cc2e7a69f9 fix loopback migration to new auth scheme
closes #1735
2015-08-12 20:30:08 -07:00
Berkeley Martinez 49e9d078f1 fix angular.js typo
closes #1287
2015-08-12 20:05:06 -07:00
benmcmahon100 7ee6a8f888 Merge pull request #1741 from FreeCodeCamp/staging
Final update to OOPF before pr into staging
2015-08-13 00:24:41 +01:00
benmcmahon100 2b654ecd83 Removed the under construction flag 2015-08-13 00:21:52 +01:00
benmcmahon100 7c19d6c0ef First twelve OOP challenges ready to roll 2015-08-13 00:20:15 +01:00
Quincy Larson d138757c52 Merge branch 'staging' into jquery
Conflicts:
	seed/challenges/bootstrap.json
	seed/challenges/jquery.json
2015-08-12 02:06:03 -07:00
Quincy Larson 7a2c2544a4 fix issue discovered by @reddraft 2015-08-12 02:00:24 -07:00
Quincy Larson 5c1b45da2e Fix issues discovered by @eaglecookie and @sonorangirl 2015-08-12 01:39:17 -07:00
Quincy Larson 84c76bcfd0 fix typo discovered by @pieterdeville 2015-08-12 01:35:27 -07:00
Quincy Larson 88b6b8a9d8 make @nickbarry's recommended get-set-for-ziplines copy fixes' 2015-08-12 01:32:16 -07:00
Quincy Larson 096eb0a67e Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging 2015-08-12 01:23:27 -07:00
Quincy Larson ae0175b396 Merge pull request #1643 from Greenheart/greenheart-1628
clarified description for waypoint: make images mobile responsive
2015-08-12 01:23:18 -07:00
Quincy Larson c408bbe20b manually add minor test improvement submitted by @ramadis 2015-08-12 01:21:25 -07:00
Quincy Larson 75b54a395e Merge branch 'staging' of https://github.com/MatiKid/freecodecamp into MatiKid-staging 2015-08-12 01:16:04 -07:00
Quincy Larson 2c623ad78a Merge pull request #1655 from ahstro/ahstro-1647
'Convert HTML Entities' now allows upper and lower case entities
2015-08-12 01:13:14 -07:00
Quincy Larson a9bea09cc9 make changes suggested by @ahstro 2015-08-12 01:11:56 -07:00
Quincy Larson 9e128e2787 manually apply pull requests submitted by @cristianvnica and @kurzninja 2015-08-12 01:04:46 -07:00
Quincy Larson 5830ac2f8a make all single quotes in jquery challenges double quotes 2015-08-12 00:52:40 -07:00
Quincy Larson 82e03b579c Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging 2015-08-11 23:54:15 -07:00
Quincy Larson e42e954517 fix omission in simon zipline 2015-08-11 23:53:30 -07:00
benmcmahon100 1dc66b7671 First four OOP challenges and the final slot machine challenge. 2015-08-12 00:11:56 +01:00
benmcmahon100 9df99eb635 Removed new incomplete JS Challenges and moved to OOPF branch. 2015-08-11 15:39:07 +01:00
benmcmahon100 bfcd36ff88 Merge pull request #1716 from sonorangirl/slot-machine-challenge
Slot machine challenge - Fixed Typos and 4th test
2015-08-11 13:43:00 +01:00
Berkeley Martinez 5f21db457d fix challenge ordering
Now challenges are ordered on map first by top order value of json file
second by index of array
2015-08-10 23:29:32 -07:00
Quincy Larson b4f5f1a81e get everything seeding again 2015-08-10 22:17:49 -07:00
Quincy Larson db6db2e403 Merge branch 'staging' into jquery
Conflicts:
	seed/challenges/bootstrap.json
2015-08-10 22:03:51 -07:00
Berkeley Martinez 34a06f987f Merge pull request #1512 from djordjelacmanovic/djordjelacmanovic-1511
fixed issue #1511 - now checking for words longer than 9 chars
2015-08-10 20:40:39 -07:00
Berkeley Martinez 6691897dbe Merge pull request #1612 from ahstro/ahstro-1467
Improve 'Turn an image to a Link'-waypoint
2015-08-10 20:25:54 -07:00
Berkeley Martinez e7a4ec068c Merge pull request #1614 from ahstro/ahstro-1461
Grammatical error in 'Use Hex Code for Specific Colors'
2015-08-10 20:23:29 -07:00
Berkeley Martinez f67b37ff7b Merge pull request #1616 from ahstro/ahstro-1451
Wrong element in 'Target HTML Elements with Selectors Using jQuery'
2015-08-10 20:21:59 -07:00
Quincy Larson 853c728d9c improve get-started view and fix duplicate bonfire issue 2015-08-10 20:13:13 -07:00
Quincy Larson 8ee3306bee Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into onboarding 2015-08-10 19:58:56 -07:00
sonorangirl fb44b50941 Made some spaces optional for 4th test 2015-08-10 19:32:52 -07:00
sonorangirl 8efe8ee825 Fixed RegEx so that 4th test would pass 2015-08-10 19:22:18 -07:00
Berkeley Martinez d37a1a1a08 Merge pull request #1671 from ahstro/ahstro-1402
Disregard order in 'Symmetric Difference'
2015-08-10 19:11:33 -07:00
Quincy Larson a557f386ed Merge branch 'staging' into onboarding 2015-08-10 18:30:34 -07:00
Quincy Larson 041ef43be3 Merge branch 'staging' into onboarding 2015-08-10 18:30:15 -07:00
sonorangirl 8a16942036 Fixed typos in 1st slot machine challenge 2015-08-10 18:05:07 -07:00
Berkeley Martinez 4b0e95280d fix duplicate id's 2015-08-10 17:40:45 -07:00
Berkeley Martinez 234aa0a5ea fix missing quote escape 2015-08-10 17:35:16 -07:00
Berkeley Martinez c550760b66 Merge pull request #1709 from martinkwan/patch-2
Updated DNA Pairing link
2015-08-10 16:39:13 -07:00
Berkeley Martinez 5b61f15d06 Merge pull request #1706 from kurzninja/patch-3
Fix for incorrect RGB test value
2015-08-10 16:27:15 -07:00
Berkeley Martinez 8f332039af Merge pull request #1697 from martinkwan/patch-1
Updated Pig Latin Link
2015-08-10 15:46:12 -07:00
Quincy Larson a44622af82 Merge branch 'staging' into onboarding 2015-08-10 15:42:07 -07:00
Martin Kwan 81af7a69e6 Updated DNA Pairing link
Updated link so it would open in a new tab instead of the current tab
2015-08-10 14:42:37 -07:00
Martin Kwan 737adf1fac Update intermediate-bonfires.json 2015-08-10 13:42:33 -07:00
Berkeley Martinez 8dabd39950 add to seed script: exit on error
filter challenge blocks that do not have challenges
2015-08-10 12:15:30 -07:00
Brett Guillory 133c91fd16 Fix for incorrect RGB test value
RGB test value was testing for (0,0,255) which is B, should be testing for (0, 255,0), which is green.
2015-08-10 13:20:18 -05:00
Martin Kwan 5c987cbe9a Updated Pig Latin Link
Updated link so it would open in a new tab instead of the current tab
2015-08-10 00:40:12 -07:00
Berkeley Martinez 129ec7c98e Merge pull request #1613 from ahstro/wrong-class
Updated test case comment in 'fluid containers'
2015-08-09 23:06:56 -07:00
Berkeley Martinez 1d724f145e Merge branch 'staging' of https://github.com/FreeCodeCamp/freecodecamp into staging 2015-08-09 22:58:46 -07:00
Berkeley Martinez 967f92e6f4 fix challenge naming scheme 2015-08-09 22:46:44 -07:00
Berkeley Martinez 0c349f9763 Merge pull request #1675 from alanmbarr/alanmbarr-1375
Update bootstrap.json waypoint-line-up-form-elements-responsively-with-bootstrap typo
2015-08-09 22:46:09 -07:00
Berkeley Martinez a551c3ad57 Merge pull request #1692 from royshouvik/patch-1
Update basic-javascript.json to fix #1642
2015-08-09 22:41:58 -07:00
Quincy Larson 13f08bf037 Merge branch 'staging' into onboarding 2015-08-09 22:00:26 -07:00
Quincy Larson 4ed041c0db update curriculum structure again 2015-08-09 21:26:26 -07:00
Shouvik Roy 02717582d8 Update basic-javascript.json to fix #1642
Fixed following issues
#1639 : Fixed ```description``` to have "In JavaScript" instead of "in JavaScript" and added punctuation.
#1640 #1641 Added punctuation and fixed typo to have "perform mathematical functions" instead of "preform mathematical functions".
2015-08-10 07:32:57 +05:30
Quincy Larson e0bd8c6dd2 remove pair programming Bonfire warm up challenge 2015-08-09 17:03:49 -07:00
Isabell Long 76e4fc2d33 Fix typos in the Basic Javascript challenge
- Partially fixes #1519 - looks like some of those typos had already
  been fixed.
2015-08-09 19:32:10 +00:00
Berkeley Martinez 8d680b487d Merge pull request #1704 from ahstro/completion-monitor
Refactored CompletionMonitor() slightly
2015-08-10 11:30:14 -07:00
Berkeley Martinez 97b0ccac8f fix mising type
remove extra bonfire in title
2015-08-10 11:27:12 -07:00
ahstro 9513a8b0e5 Incorrect JSON caused error during seed 2015-08-10 20:11:59 +02:00
ahstro aec8680567 Refactored CompletionMonitor() slightly 2015-08-10 18:44:19 +02:00
Berkeley Martinez 2476f35309 add challenge order to individual challenge 2015-08-09 07:40:16 -07:00
alanmbarr 50db4b9aaa other typo
text input instead of area for clarity
2015-08-08 22:10:07 -07:00
alanmbarr 6d1ddc759d Update bootstrap.json 2015-08-08 21:59:03 -07:00
ahstro 9bed47a763 Disregard order in 'Symmetric Difference' #1402 2015-08-09 02:08:44 +02:00
Quincy Larson 5fb1df0d55 start onboarding page 2015-08-08 16:13:23 -07:00
benmcmahon100 f22672e6c1 Removed new incomplete JS Challenges and moved to OOPF branch. 2015-08-08 17:21:13 +01:00
benmcmahon100 0f81e8465a Update to include OOP & functional programming course layout 2015-08-08 17:11:11 +01:00
Berkeley Martinez b1e34f8cc8 create name/dashName at seed 2015-08-08 07:50:35 -07:00
Berkeley Martinez 26e69c8621 add type to challenges 2015-08-07 23:37:32 -07:00
Berkeley Martinez f241a362d5 rename top level `title` to name 2015-08-07 18:43:45 -07:00
ahstro c5fb8c83f5 Added even more HTML entities and removed ' 2015-08-08 03:43:14 +02:00
ahstro 9d6c5e63ab 'Convert HTML Entities' now allows upper and lower case entities #1647 2015-08-08 03:29:23 +02:00
ahstro e7c8589d08 Everything is horrible 2015-08-08 02:38:16 +02:00
Berkeley Martinez e1fb3856c4 Merge pull request #1637 from Greenheart/staging
fixed small typo
2015-08-07 09:01:44 -07:00
Shouvik Roy 8ff778b358 Fix for #1644
Change challenge description of "Bonfire: Where art thou", to fix issue #1644. Changed description to say "an array" instead of "a list" to make it clear and less confusing.
2015-08-07 21:04:20 +05:30
Samuel Plumppu 93083eb1c9 clarified description for waypoint: make images mobile responsive 2015-08-07 17:03:29 +02:00
Samuel Plumppu 805327ebac fixed small typo 2015-08-07 14:53:24 +02:00
Quincy Larson 350d59a235 revamp onboarding challenges to reflect changes to curriculum and wiki 2015-08-07 00:18:30 -07:00
Quincy Larson c5ad1ad851 Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging 2015-08-06 23:19:18 -07:00
Quincy Larson 629eaa6ef9 restructure curriculum to split jQuery and Ajax into seperate sections 2015-08-06 23:19:05 -07:00
Samuel Plumppu 344b729bce fixed tests to check for lowercase hexadecimal colors 2015-08-07 02:13:11 +02:00
ahstro 42321f5cef Wrong element in jQuery targeting waypoint 2015-08-06 22:41:49 +02:00
Samuel Plumppu 3b14872cbe updated instructions for waypoint: get set for ziplines to fit with new Codepen UI 2015-08-06 22:30:46 +02:00
ahstro fb2599b8fe Grammatical error in 'Use Hex Code for Specific Colors' 2015-08-06 22:27:16 +02:00
ahstro b2d714112f Updated test case comment in 'fluid containers' 2015-08-06 22:23:00 +02:00
ahstro 52300b9648 Changed test order & added <code> in 'img to link' 2015-08-06 22:07:54 +02:00
Samuel Plumppu cf9b981564 fixed typos 2015-08-06 21:31:24 +02:00
Samuel Plumppu 4349d06d16 fixed typos 2015-08-06 20:45:59 +02:00
Dealga McArdle 0993261ebc sputkin -> sputnik 2015-08-06 16:02:20 +02:00
benmcmahon100 e68bc0272d Fix https://github.com/FreeCodeCamp/freecodecamp/issues/1593 2015-08-06 14:54:44 +01:00
benmcmahon100 5eb9c060e1 Fix https://github.com/FreeCodeCamp/freecodecamp/issues/1599 2015-08-06 14:51:26 +01:00
Quincy Larson 61507f575d fix some issues that were breaking seed task 2015-08-06 02:27:56 -07:00
Quincy Larson dfb48fbdad update dashed name 2015-08-06 02:26:09 -07:00
Quincy Larson 2e0e7d5a74 rename all of Ben's JavaScript challenges to be more in line with other waypoints 2015-08-06 02:06:53 -07:00
Quincy Larson e8a3f3ef04 Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging 2015-08-06 01:44:37 -07:00
Quincy Larson 89fffce02d add simon zipline 2015-08-06 01:44:31 -07:00
Berkeley Martinez 8b8d9cab51 Merge pull request #1594 from martinkwan/patch-1
Updated Roman Numeral Challenge link
2015-08-06 00:58:24 -07:00
Berkeley Martinez eeffb7f706 Merge pull request #1595 from flota113/flota113-1585
Fixed a few typos in javascript-basic
2015-08-06 00:57:56 -07:00
Berkeley Martinez 47403e204c Merge pull request #1592 from cristianvnica/cristianvnica-1488
Fixing issue #1488
2015-08-06 00:57:06 -07:00
Marcin Flotyński 5882b9b84f Fixed a few typos in javascript-basic 2015-08-06 09:03:03 +02:00
Martin Kwan 3b94475f9d Updated Roman Numeral Challenge link
Updated link so it would open in a new tab instead of the current tab.
2015-08-06 00:02:15 -07:00
Cristian V. Nica f33ac57984 Fixing issue #1488
Correcting small mistakes in the waypoint instruction.
2015-08-06 09:30:13 +03:00
benmcmahon100 7d04da6c60 Merge pull request #1584 from flota113/flota113-1579
Fixed tests in Waypoint: Use Comments to Clarify Code
2015-08-06 00:21:59 +01:00
Marcin Flotyński c577190e67 Fixed tests
Added check if the object isn't null and escaped quotes because text
enclosed apostrophe
2015-08-06 00:57:55 +02:00
Marcin Flotyński 073456e0de changed to agree with the style -
greater than 0 instead of greater than or eqal to 1
2015-08-06 00:25:11 +02:00
Marcin Flotyński c6b2140c02 first fixes - length larger _or equal_ to 1
I'm not sure if the tests are too vague - they allow to comment out way
more than just the text specified - like the whole page..
2015-08-06 00:20:52 +02:00
Marcin Flotyński 36f66c1262 Fixed tests in waypoint
changes col-xs-12 to col-xs-6 so the tests works
Issue #1578
2015-08-05 23:53:45 +02:00
Rafael J. Rodriguez 43a1a62536 Fix for Issue #1540 2015-08-05 17:34:06 -04:00
benmcmahon100 117306de33 Merge pull request #1576 from cristianvnica/cristianvnica-1575
Fixing #1575
2015-08-05 21:24:05 +01:00
Cristian V. Nica caef8c9da8 Fixing #1575
Fixing small typo
2015-08-05 23:22:37 +03:00
benmcmahon100 145cb422e2 Merge pull request #1573 from Greenheart/staging
added test for object for steamroller bonfire
2015-08-05 21:22:12 +01:00
Berkeley Martinez 3cfd69c704 add loopbackMigrationGrandfathered flag 2015-08-05 13:01:48 -07:00
benmcmahon100 974bf503ec Merge pull request #1572 from cristianvnica/cristianvnica-1571
Trying to fix: #1571
2015-08-05 20:43:17 +01:00
Samuel Plumppu 27cff0becf added test for object for steamroller bonfire 2015-08-05 21:37:04 +02:00
Quincy Larson 40cdf76035 Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging 2015-08-05 11:58:09 -07:00
Quincy Larson 01e408d48c new final-ish curriculum structure 2015-08-05 11:57:58 -07:00
Cristian V. Nica 5ff371fc6f Trying to fix: #1571
I have found a small typo on challenge: An Array Of new Information
2015-08-05 21:55:25 +03:00
Berkeley Martinez 71ca6b1b5b mark if user is github cool during migration 2015-08-05 11:22:58 -07:00
Berkeley Martinez f656311b3e remove comments from migration 2015-08-05 11:22:58 -07:00
benmcmahon100 f68c6d0fa3 Changed the object lessons to use dot notation instead of bracket
Fix https://github.com/FreeCodeCamp/freecodecamp/issues/1564
2015-08-05 17:31:42 +01:00
benmcmahon100 e7cac3ccf9 fix https://github.com/FreeCodeCamp/freecodecamp/issues/1559 2015-08-05 16:54:57 +01:00
benmcmahon100 4ff54006d3 Merge remote-tracking branch 'origin/staging' into staging 2015-08-05 15:39:18 +01:00
benmcmahon100 ceed3c4877 Fix some typos 2015-08-05 15:38:54 +01:00
Quincy Larson 959fde64fc add a span challenge and replace more old outside images with s3 images 2015-08-05 00:06:20 -07:00
Quincy Larson fa86f650e2 update cats to fetch from s3 2015-08-04 23:31:00 -07:00
Quincy Larson 932bc0ab65 continue working on jquery challenges 2015-08-04 23:24:26 -07:00
Berkeley Martinez c9e0184387 Merge pull request #1508 from flota113/flota113-1502
Small Fix of Bootstrap waypoint challenge - Issue 1502
2015-08-04 12:35:08 -07:00
Berkeley Martinez 00a9cfdf48 Merge pull request #1517 from ngalluzzo/fix-class-typo
Typo on 'Responsive Design with Bootstrap'
2015-08-04 12:34:47 -07:00
Ben ecacbc6233 Update bootstrap.json
fixed typo (misspelled 'container')
2015-08-04 14:03:19 -05:00
Nic Galluzzo ad46b72bd0 Update bootstrap.json 2015-08-04 08:54:21 -07:00
Djordje Lacmanović a3e5005058 fixed issue #1511 - now checking for words longer than 9 chars
closes #1511
2015-08-04 16:51:10 +02:00
Marcin Flotyński dbf8443430 Small Fix of Bootstrap waypoint challenge - Issue 1502
Changed second check for second class - 'btn-default'
2015-08-04 15:00:22 +02:00
benmcmahon100 fc0ccf3aea Fixed typos in magical maths waypoints and restored server.js to a previous working state 2015-08-04 13:28:41 +01:00
Quincy Larson aa10e1ff69 quick sweep to make sure all tests run properly 2015-08-03 23:03:12 -07:00
Quincy Larson eb8b9df5ad Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging 2015-08-03 21:17:55 -07:00
benmcmahon100 e6f14fc25f Merge remote-tracking branch 'origin/staging' into staging 2015-08-04 00:53:34 +01:00
benmcmahon100 aa906f81c3 fix https://github.com/FreeCodeCamp/freecodecamp/issues/1450 missing semi-colon and assert( 2015-08-04 00:53:20 +01:00
Berkeley Martinez 4c94bf7fcd Merge pull request #1231 from ahstro/lumenteun-410
Improved consitency in 'Friendly Date Ranges' test cases.
2015-08-03 16:04:37 -07:00
Berkeley Martinez 2f1d9c4826 Merge pull request #1197 from 1hella/1hella-1156
Fix typos in Bonfire: Friendly Date Ranges #1156
2015-08-03 16:02:50 -07:00