gaspersic/freeCodeCamp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
1,517 Commits 9 Branches 0 Tags
d1b3ba22f6e0f1a0c3cb208eccb6d5ae00c8dff6
Commit Graph

1517 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Berkeley Martinez
b390db0be4 Fix update properties challenge 2015-10-28 10:35:01 -07:00
Quincy Larson
515a011448 one more commit before resuming on Berkeley side 2015-10-28 10:11:46 -07:00
Quincy Larson
4820ae2e36 everything is ready except OOP 2015-10-28 05:13:49 -07:00
Quincy Larson
6a7d9e2878 fix some mis-mergings for basic-javascript.json 2015-10-28 02:39:51 -07:00
Quincy Larson
7326996bdb Merge branch 'staging' into improve-early-challenges 
Conflicts:
	seed/challenges/basic-javascript.json
	seed/challenges/bootstrap.json
	seed/challenges/html5-and-css.json
	seed/challenges/object-oriented-and-functional-programming.json
 2015-10-28 02:20:09 -07:00
Quincy Larson
4011efdaed Merge pull request #3909 from ltegman/fix/waypoint-slot-machine-permits-more-efficient-answer-2278 
Fix Waypoint Create Slot Machine Tests
 2015-10-28 01:49:39 -07:00
Quincy Larson
bcc730cbee Merge pull request #3483 from awesomeaniruddh/fix/add-test-cases-for-bonfire 
Add tests to intermediate bonfire
 2015-10-28 01:25:32 -07:00
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
Quincy Larson
eef1c5136a finish JavaScript and OOP sections for QA 2015-10-28 01:15:54 -07:00
Quincy Larson
419f6507d0 major improvements to basic-javascript.json 2015-10-27 23:16:08 -07:00
Quincy Larson
1344283221 finish first pass of jQuery 2015-10-27 21:02:08 -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
bf00eff111 continue refining waypoints 2015-10-27 17:49:58 -07: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
00084696fb continue improving early challenges 2015-10-26 03:14:03 -07:00
Quincy Larson
049514c6ce update onboarding challenges 2015-10-26 02:50:02 -07:00
Quincy Larson
57adbd053f finish clementine challenge for now 2015-10-25 23:28:53 -07:00
Logan Tegman
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
Quincy Larson
8cb33be491 Merge branch 'staging' into clementine 
Conflicts:
	seed/challenges/basejumps.json
 2015-10-25 22:15:59 -07:00
Quincy Larson
9573c83679 add more gifs to basejump onboarding 2015-10-25 22:14:51 -07: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
Aniruddh Agarwal
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
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