Commit Graph

5771 Commits

Author SHA1 Message Date
6936d35c5d Merge pull request #3944 from mschultz4/fix/typos-intermediate-bonfire
Fixed typos in assert messages
2015-10-27 19:36:39 -07:00
37b5784899 Fixed typos in assert messages 2015-10-27 20:57:48 -04:00
ee69ff4314 Merge pull request #3885 from tdugger/fix/3884
The word several is repeated in step 11
2015-10-27 17:29:38 -07:00
17310b0a98 Merge pull request #3936 from XianPalin/fix/incorrect_text_objective_2
Fix example for black background color in Objective 2
2015-10-27 17:28:22 -07:00
f423bbf4ea Fix example for black background color closes #3870 2015-10-27 12:28:15 -04:00
ae2be7234b 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
096d0099c5 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
9f901ec97a Merge pull request #3926 from Em01/ew/fix-typo-boolean-waypoint-3897
Fixed typos in in JS Waypoints 2, 4 and 23.
2015-10-27 14:20:10 +00:00
daeaf34372 Fixed same issue in waypoint 4 2015-10-27 14:06:34 +00:00
72c52114f6 Fixed additional typos. 2015-10-27 09:49:56 +00:00
218f44e40b Fixed typos in in JS Waypoints. Closes #3897 2015-10-26 23:59:43 +00:00
2852b5a196 Merge pull request #3924 from Chiouonthis/patch-1
Update README.md
2015-10-26 16:31:41 -07:00
5597d0efe3 Update README.md
Fixed small typo on the first line: changed "due" to "do."
2015-10-26 19:28:33 -04:00
cd430a5167 finished adding solutions for the Basic Bonfires 2015-10-26 19:06:48 -04:00
ae4011766b Update nonprofits.json 2015-10-26 16:44:06 -04:00
90175a2e90 Updated nonprofits directory 2015-10-26 16:40:19 -04:00
d9cd9363bb Merge pull request #3917 from CodeNonprofit/remove-canceled-nonprofit-project
removed solace foundation
2015-10-26 13:12:25 -07:00
b2a9368e77 removed solace foundation 2015-10-26 15:37:20 -04:00
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
ac4a71a229 fix signin button to use signin instead of login for path 2015-10-25 21:46:54 -07:00
8fd3f55a7a Merge pull request #3907 from FreeCodeCamp/fix/loop-waypoint-typo
fix waypoint typo
2015-10-25 19:48:13 -07:00
033dd5ee9c fix waypoint typo 2015-10-25 19:47:02 -07:00
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
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
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
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
b2a19cfec5 Merge branch 'staging' of https://github.com/freecodecamp/freecodecamp into staging 2015-10-24 01:26:30 -07:00
711b5cb8be Merge branch 'awesomeaniruddh-fix/bonfire-test' into staging 2015-10-24 01:26:18 -07:00
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
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
d5ddb10b7a remove test based on closed @saadanerdetbare PR, closes #3362 2015-10-24 01:21:01 -07:00
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
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
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
e521cdb2a6 additional minor edits 2015-10-24 00:17:06 -07:00
70b7383f3b Merge branch 'patch-1' of https://github.com/rngadam/FreeCodeCamp into rngadam-patch-1 2015-10-23 23:49:41 -07:00
92868736c0 merge staging and make my own minor improvements 2015-10-23 23:45:42 -07:00
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
990dbc6f52 Merge branch 'staging' of https://github.com/freecodecamp/freecodecamp into staging 2015-10-23 22:50:10 -07:00
6e7df9288a fix second instance of logger.html 2015-10-23 22:48:49 -07:00
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
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
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
bf6611e988 Merge branch 'fix/jQuery-script-tag' of https://github.com/junhaoyap/FreeCodeCamp into staging 2015-10-23 22:12:26 -07:00
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
100075eea1 Merge pull request #3844 from krantzinator/feature/add-solutions
added 5 solutions to Basic Bonfies
2015-10-23 22:09:35 -07:00
ae084236c2 Merge pull request #3846 from vetom/patch-1
Updating the waypoint information
2015-10-23 22:08:00 -07:00
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
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
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