Commit Graph

5821 Commits (f7d7e538a2ac25890e85454e5b08d3735e77eb4f)

Author SHA1 Message Date
Em01 218f44e40b Fixed typos in in JS Waypoints. Closes #3897 2015-10-26 23:59:43 +00:00
Berkeley Martinez 2852b5a196 Merge pull request #3924 from Chiouonthis/patch-1
Update README.md
2015-10-26 16:31:41 -07:00
Jonathan 5597d0efe3 Update README.md
Fixed small typo on the first line: changed "due" to "do."
2015-10-26 19:28:33 -04:00
krantzinator cd430a5167 finished adding solutions for the Basic Bonfires 2015-10-26 19:06:48 -04:00
Michael D. Johnson ae4011766b Update nonprofits.json 2015-10-26 16:44:06 -04:00
Michael D. Johnson 90175a2e90 Updated nonprofits directory 2015-10-26 16:40:19 -04:00
Quincy Larson d9cd9363bb Merge pull request #3917 from CodeNonprofit/remove-canceled-nonprofit-project
removed solace foundation
2015-10-26 13:12:25 -07:00
Michael D. Johnson b2a9368e77 removed solace foundation 2015-10-26 15:37:20 -04:00
Quincy Larson baaae041eb add the FCC leaderboard to the labs json 2015-10-26 11:39:45 -07:00
Quincy Larson e9bcbbb333 continue improving early challenges 2015-10-26 03:14:03 -07:00
Quincy Larson 75c534c984 update onboarding challenges 2015-10-26 02:50:02 -07:00
Quincy Larson dc26195395 finish clementine challenge for now 2015-10-25 23:28:53 -07:00
Logan Tegman a398c8a908 Fix Waypoint Create Slot Machine Tests
Permits solutions that don't explicitly call Math.random three times and instead wrap that operation in a function.
2015-10-25 23:08:00 -07:00
Berkeley Martinez 30d49e92ec Merge pull request #3908 from FreeCodeCamp/fix/signin-button
fix signin button to use signin instead of login for path
2015-10-25 22:31:25 -07:00
Quincy Larson b3c58910ac Merge branch 'staging' into clementine
Conflicts:
	seed/challenges/basejumps.json
2015-10-25 22:15:59 -07:00
Quincy Larson c75e938359 add more gifs to basejump onboarding 2015-10-25 22:14:51 -07:00
Quincy Larson ac4a71a229 fix signin button to use signin instead of login for path 2015-10-25 21:46:54 -07:00
Quincy Larson 8fd3f55a7a Merge pull request #3907 from FreeCodeCamp/fix/loop-waypoint-typo
fix waypoint typo
2015-10-25 19:48:13 -07:00
Quincy Larson 033dd5ee9c fix waypoint typo 2015-10-25 19:47:02 -07:00
Ben McMahon 3883483d8d Merge pull request #3595 from FreeCodeCamp/curriculum/JSONAndAJAX
Curriculum/json and ajax for QA and copy check
2015-10-26 00:47:30 +00:00
tdugger 7605a92e35 The word several is repeated in step 11
In step 11 of the build a personal portfolio zipline, the word
“several” is repeated.
2015-10-24 23:38:55 -05:00
Aniruddh Agarwal 93681509e5 Add tests to intermediate bonfire
The bonfire only tested the camper's solution for numbers upto 29. This
commit adds tests that verify the solution for numbers upto 1000. This
should motivate the campers to create a more sound logic that will work
for more numbers.
2015-10-25 10:32:48 +08:00
Quincy Larson 565d4d1309 Merge branch 'ahstro-3228' of https://github.com/ahstro/freecodecamp into ahstro-ahstro-3228
Conflicts:
	seed/challenges/basic-javascript.json
2015-10-24 01:39:05 -07:00
Quincy Larson 0e70f98171 Merge branch 'fcc-running-cats' of https://github.com/ptsurbeleu/FreeCodeCamp into ptsurbeleu-fcc-running-cats
Conflicts:
	seed/challenges/bootstrap.json
2015-10-24 01:33:26 -07:00
Quincy Larson b2a19cfec5 Merge branch 'staging' of https://github.com/freecodecamp/freecodecamp into staging 2015-10-24 01:26:30 -07:00
Quincy Larson 711b5cb8be Merge branch 'awesomeaniruddh-fix/bonfire-test' into staging 2015-10-24 01:26:18 -07:00
Quincy Larson 6dbbf56c5c Merge branch 'fix/bonfire-test' of https://github.com/awesomeaniruddh/FreeCodeCamp into awesomeaniruddh-fix/bonfire-test
Conflicts:
	seed/challenges/basic-bonfires.json
2015-10-24 01:25:42 -07:00
Quincy Larson 882b82fe1d Merge pull request #3876 from FreeCodeCamp/fix/symmetric-dif
remove test based on closed @saadanerdetbare PR, closes #3362
2015-10-24 01:21:42 -07:00
Quincy Larson d5ddb10b7a remove test based on closed @saadanerdetbare PR, closes #3362 2015-10-24 01:21:01 -07:00
Quincy Larson 2ebc551197 Merge pull request #3380 from joel-bentley/fix/tests-on-waypoint-img-responsive
Fix tests on Waypoint Mobile Responsive Images
2015-10-24 01:14:43 -07:00
Quincy Larson a8f3e663e3 Merge pull request #3383 from abhisekp/correct-test-bf-where-belong
Modify tests for Bonfire - Where do I belong
2015-10-24 00:46:16 -07:00
Quincy Larson 333d4c0ffa Merge pull request #3384 from richchurcher/fix/where-do-i-belong
Modify description for Where do I belong
2015-10-24 00:45:28 -07:00
Quincy Larson e521cdb2a6 additional minor edits 2015-10-24 00:17:06 -07:00
Quincy Larson 70b7383f3b Merge branch 'patch-1' of https://github.com/rngadam/FreeCodeCamp into rngadam-patch-1 2015-10-23 23:49:41 -07:00
Quincy Larson 92868736c0 merge staging and make my own minor improvements 2015-10-23 23:45:42 -07:00
Quincy Larson a6a5b430b3 Merge branch 'saintpeter-new-for-loops' of https://github.com/SaintPeter/FreeCodeCamp into SaintPeter-saintpeter-new-for-loops 2015-10-23 22:51:41 -07:00
Quincy Larson 990dbc6f52 Merge branch 'staging' of https://github.com/freecodecamp/freecodecamp into staging 2015-10-23 22:50:10 -07:00
Quincy Larson 6e7df9288a fix second instance of logger.html 2015-10-23 22:48:49 -07:00
Quincy Larson 7ede839a02 Merge branch 'fix/test-slot-machine-to-life' of https://github.com/natac13/freecodecamp into natac13-fix/test-slot-machine-to-life 2015-10-23 22:45:23 -07:00
Quincy Larson f16dd554fc Merge pull request #3620 from ltegman/fix-everything-be-true-tests-3394
Fix BF: Everything Be True Description and Tests
2015-10-23 22:41:12 -07:00
Quincy Larson e552984244 Merge pull request #3789 from ltegman/fix/OOP-functional-lesson-cleanup-3760
Add Better Explanations to the Functional Programming Lessons
2015-10-23 22:39:59 -07:00
Quincy Larson bf6611e988 Merge branch 'fix/jQuery-script-tag' of https://github.com/junhaoyap/FreeCodeCamp into staging 2015-10-23 22:12:26 -07:00
Quincy Larson e89c8b5525 Merge pull request #3841 from michael-krebs/feature/add-advanced-solutions
Adds dting's solutions to advanced bonfires
2015-10-23 22:10:18 -07:00
Quincy Larson 100075eea1 Merge pull request #3844 from krantzinator/feature/add-solutions
added 5 solutions to Basic Bonfies
2015-10-23 22:09:35 -07:00
Quincy Larson ae084236c2 Merge pull request #3846 from vetom/patch-1
Updating the waypoint information
2015-10-23 22:08:00 -07:00
Quincy Larson 84223fceff Merge pull request #3847 from junhaoyap/fix/jQuery-script-tag
Make first jQuery lesson more lenient for script tag
2015-10-23 21:55:37 -07:00
Quincy Larson 4d816df10a Merge pull request #3869 from natac13/fix/add-solution-intermediate-bonfires
added @dting's solutions to the intermediate bonfires
2015-10-23 21:44:45 -07:00
Logan Tegman b149bc7a04 Merge pull request #3863 from ribeirojpn/fix/test-message-in-Bonfire-Where-art-thou
fix first test message in Where art thou bonfire
2015-10-23 21:34:10 -07:00
Quincy Larson d2cab92237 finish editing ajax challenges 2015-10-23 21:32:51 -07:00
Joao Paulo Ribeiro 75d5f92f31 fix/test message in Where art thou bonfire 2015-10-24 01:20:50 -03:00