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

16287 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
d5ddb10b7a remove test based on closed @saadanerdetbare PR, closes #3362 2015-10-24 01:21:01 -07:00
Quincy Larson
f39c3eabe1 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
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
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
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
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
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
e521cdb2a6 additional minor edits 2015-10-24 00:17:06 -07:00
Ankit Aggarwal
8157c6e20c Temporary fix to bugs due to removeComments method-closes #3763 2015-10-24 12:45:30 +05:30
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
f6fe58e866 merge staging and make my own minor improvements 2015-10-23 23:45:42 -07:00
Quincy Larson
92868736c0 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
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
40ebacf63b Merge branch 'staging' of https://github.com/freecodecamp/freecodecamp into staging 2015-10-23 22:50:10 -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
7eb1870c79 fix second instance of logger.html 2015-10-23 22:48:49 -07:00
Quincy Larson
6e7df9288a 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
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
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
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
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
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
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
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
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
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
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
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
4385c4d7cd Merge pull request #3846 from vetom/patch-1 
Updating the waypoint information
 2015-10-23 22:08:00 -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
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
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
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
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
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
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
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
Joao Paulo Ribeiro
75d5f92f31 fix/test message in Where art thou bonfire 2015-10-24 01:20:50 -03:00
Quincy Larson
b6423979a4 confirm that all tests pass as intended 2015-10-23 16:46:21 -07:00
Quincy Larson
acd2f6282e confirm that all tests pass as intended 2015-10-23 16:46:21 -07:00
Quincy Larson
e7c6e626e0 merge staging and overhaul ajax challenges 2015-10-23 16:19:00 -07:00
Quincy Larson
36ba68781f merge staging and overhaul ajax challenges 2015-10-23 16:19:00 -07:00