Commit Graph

1147 Commits

Author SHA1 Message Date
Quincy Larson
42cb25ca2a Merge pull request #3946 from ltegman/fix/bootstrap-waypoint-wording-3895-3893
Fix Bootstrap Waypoints Wording Clarifications
2015-10-28 01:20:06 -07:00
Logan Tegman
57f20bfcfe Merge pull request #3944 from mschultz4/fix/typos-intermediate-bonfire
Fixed typos in assert messages
2015-10-27 19:36:39 -07:00
Logan Tegman
c1e0cf5cc9 Fix Bootstrap Waypoints Wording Clarifications
Closes #3895 and #3893
2015-10-27 19:30:47 -07:00
mschultz4
307fe9e4b3 Fixed typos in assert messages 2015-10-27 20:57:48 -04:00
Quincy Larson
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
Zarek Parker
3e79fdb145 Fix example for black background color closes #3870 2015-10-27 12:28:15 -04:00
Ben McMahon
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
Ben McMahon
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
Em01
0db2882f42 Fixed same issue in waypoint 4 2015-10-27 14:06:34 +00:00
Em01
ea632c3a79 Fixed additional typos. 2015-10-27 09:49:56 +00:00
Em01
35aa781215 Fixed typos in in JS Waypoints. Closes #3897 2015-10-26 23:59:43 +00:00
krantzinator
9663b33ab5 finished adding solutions for the Basic Bonfires 2015-10-26 19:06:48 -04:00
Michael D. Johnson
1ddff390bf Update nonprofits.json 2015-10-26 16:44:06 -04:00
Michael D. Johnson
16bd976ea9 Updated nonprofits directory 2015-10-26 16:40:19 -04:00
Michael D. Johnson
087475e3e1 removed solace foundation 2015-10-26 15:37:20 -04:00
Quincy Larson
df8df1172b fix waypoint typo 2015-10-25 19:47:02 -07:00
Ben McMahon
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
tdugger
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
Quincy Larson
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
Quincy Larson
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
Quincy Larson
c1212e159c Merge branch 'staging' of https://github.com/freecodecamp/freecodecamp into staging 2015-10-24 01:26:30 -07:00
Quincy Larson
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
Quincy Larson
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
Quincy Larson
f39c3eabe1 remove test based on closed @saadanerdetbare PR, closes #3362 2015-10-24 01:21:01 -07:00
Quincy Larson
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
Quincy Larson
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
Quincy Larson
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
Quincy Larson
f6fe58e866 merge staging and make my own minor improvements 2015-10-23 23:45:42 -07:00
Quincy Larson
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
Quincy Larson
40ebacf63b Merge branch 'staging' of https://github.com/freecodecamp/freecodecamp into staging 2015-10-23 22:50:10 -07:00
Quincy Larson
7eb1870c79 fix second instance of logger.html 2015-10-23 22:48:49 -07:00
Quincy Larson
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
Quincy Larson
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
Quincy Larson
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
Quincy Larson
e53a771cfe Merge branch 'fix/jQuery-script-tag' of https://github.com/junhaoyap/FreeCodeCamp into staging 2015-10-23 22:12:26 -07:00
Quincy Larson
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
Quincy Larson
0281e0915c 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
4385c4d7cd Merge pull request #3846 from vetom/patch-1
Updating the waypoint information
2015-10-23 22:08:00 -07:00
Quincy Larson
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
Quincy Larson
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
Logan Tegman
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
Quincy Larson
97a3b12bfb finish editing ajax challenges 2015-10-23 21:32:51 -07:00
Joao Paulo Ribeiro
518bf25f39 fix/test message in Where art thou bonfire 2015-10-24 01:20:50 -03:00
Quincy Larson
acd2f6282e confirm that all tests pass as intended 2015-10-23 16:46:21 -07:00
Quincy Larson
36ba68781f merge staging and overhaul ajax challenges 2015-10-23 16:19:00 -07:00
natac13
502510ac29 added @dting's solutions to the intermediate bonfires
closes #3837
2015-10-23 19:18:45 -04:00
Quincy Larson
fab104c52d Merge pull request #3824 from FreeCodeCamp/fix/init-app-for-dev
Fix first start for new devs
2015-10-23 14:32:15 -07:00
Joao Paulo Ribeiro
c1e5238a34 fix/test message in Bonfire:Where art thou 2015-10-23 15:26:23 -03:00
natac13
924d35e610 fixed unclear description for jQuery challenge using all selectors
suggested by @trs4ece

closes #3845
2015-10-22 17:32:40 -04:00
Berkeley Martinez
b26810bdf7 Merge pull request #3835 from FreeCodeCamp/feature/solutions
Add solutions to upper intermediate bonfires
2015-10-22 12:53:58 -07:00