Commit Graph

1753 Commits

Author SHA1 Message Date
bf00eff111 continue refining waypoints 2015-10-27 17:49:58 -07:00
6ab127d68d Merge pull request #3885 from tdugger/fix/3884
The word several is repeated in step 11
2015-10-27 17:29:38 -07:00
3e79fdb145 Fix example for black background color closes #3870 2015-10-27 12:28:15 -04:00
faf131769d Merge pull request #3920 from CodeNonprofit/new-nonprofits
Added nonprofits and changed status of several ongoing projects to "started"
2015-10-27 14:37:58 +00:00
9030bc3a20 Merge pull request #3922 from krantzinator/feature/add-basic-bonfire-solutions
finished adding solutions for the Basic Bonfires
2015-10-27 14:24:09 +00:00
0db2882f42 Fixed same issue in waypoint 4 2015-10-27 14:06:34 +00:00
ea632c3a79 Fixed additional typos. 2015-10-27 09:49:56 +00:00
35aa781215 Fixed typos in in JS Waypoints. Closes #3897 2015-10-26 23:59:43 +00:00
9663b33ab5 finished adding solutions for the Basic Bonfires 2015-10-26 19:06:48 -04:00
1ddff390bf Update nonprofits.json 2015-10-26 16:44:06 -04:00
16bd976ea9 Updated nonprofits directory 2015-10-26 16:40:19 -04:00
087475e3e1 removed solace foundation 2015-10-26 15:37:20 -04:00
00084696fb continue improving early challenges 2015-10-26 03:14:03 -07:00
049514c6ce update onboarding challenges 2015-10-26 02:50:02 -07:00
57adbd053f finish clementine challenge for now 2015-10-25 23:28:53 -07:00
082eb3065f 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
8cb33be491 Merge branch 'staging' into clementine
Conflicts:
	seed/challenges/basejumps.json
2015-10-25 22:15:59 -07:00
9573c83679 add more gifs to basejump onboarding 2015-10-25 22:14:51 -07:00
df8df1172b fix waypoint typo 2015-10-25 19:47:02 -07:00
8ed3d3e723 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
2a1c48bc49 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
0e5461e08f 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
2ca89c19e9 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
4cf242d4b1 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
c1212e159c Merge branch 'staging' of https://github.com/freecodecamp/freecodecamp into staging 2015-10-24 01:26:30 -07:00
d1cc8350a4 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
af8fd9e653 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
f39c3eabe1 remove test based on closed @saadanerdetbare PR, closes #3362 2015-10-24 01:21:01 -07:00
8a8157fd67 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
d970e5a97c 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
a4e893ead9 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
f6fe58e866 merge staging and make my own minor improvements 2015-10-23 23:45:42 -07:00
dfe0ba1a7b 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
40ebacf63b Merge branch 'staging' of https://github.com/freecodecamp/freecodecamp into staging 2015-10-23 22:50:10 -07:00
7eb1870c79 fix second instance of logger.html 2015-10-23 22:48:49 -07:00
7c7454bc94 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
ce165ba791 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
4954a7c999 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
e53a771cfe Merge branch 'fix/jQuery-script-tag' of https://github.com/junhaoyap/FreeCodeCamp into staging 2015-10-23 22:12:26 -07:00
ed0a25e1cb 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
0281e0915c Merge pull request #3844 from krantzinator/feature/add-solutions
added 5 solutions to Basic Bonfies
2015-10-23 22:09:35 -07:00
4385c4d7cd Merge pull request #3846 from vetom/patch-1
Updating the waypoint information
2015-10-23 22:08:00 -07:00
cbd4a14adb 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
6fd5178f71 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
cc2b04467d 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
97a3b12bfb finish editing ajax challenges 2015-10-23 21:32:51 -07:00
518bf25f39 fix/test message in Where art thou bonfire 2015-10-24 01:20:50 -03:00
acd2f6282e confirm that all tests pass as intended 2015-10-23 16:46:21 -07:00
36ba68781f merge staging and overhaul ajax challenges 2015-10-23 16:19:00 -07:00
502510ac29 added @dting's solutions to the intermediate bonfires
closes #3837
2015-10-23 19:18:45 -04:00