gaspersic/freeCodeCamp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
26,729 Commits 9 Branches 0 Tags
5bfc6de78bf39a523bc51a3619224e14e87f7b51
Commit Graph

26729 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
bugron
c6e3c89b7c adds ability to 1-click expand images 2015-09-14 21:10:28 +04:00
Quincy Larson
3e713ca906 Merge branch 'staging' into bonfire-tests 
Conflicts:
	seed/challenges/basic-bonfires.json
	seed/challenges/intermediate-bonfires.json
 2015-09-14 00:24:33 -07:00
Quincy Larson
3d08496eb8 Merge branch 'staging' into bonfire-tests 
Conflicts:
	seed/challenges/basic-bonfires.json
	seed/challenges/intermediate-bonfires.json
 2015-09-14 00:24:33 -07:00
Quincy Larson
f837df92ed Merge branch 'staging' of https://github.com/freecodecamp/freecodecamp into staging 2015-09-14 00:03:05 -07:00
Quincy Larson
0ebd7f0261 Merge branch 'ahstro-css-cleanup' into staging 2015-09-14 00:02:45 -07:00
Quincy Larson
953df6826b fix merge conflicts 2015-09-14 00:02:42 -07:00
Quincy Larson
4d0e2cb097 Merge pull request #3296 from bugron/fix/improve-bug_btn-search 
Improves 'Bug' button search method
 2015-09-13 23:45:28 -07:00
Quincy Larson
f4c20e80ef Merge branch 'souldreamer-patch-4' into staging 2015-09-13 23:36:16 -07:00
Quincy Larson
f289eb9201 Merge branch 'patch-4' of https://github.com/souldreamer/FreeCodeCamp into souldreamer-patch-4 
Conflicts:
	seed/challenges/basic-javascript.json
 2015-09-13 23:35:27 -07:00
Quincy Larson
31f818788d Merge branch 'patch-4' of https://github.com/souldreamer/FreeCodeCamp into souldreamer-patch-4 
Conflicts:
	seed/challenges/basic-javascript.json
 2015-09-13 23:35:27 -07:00
Quincy Larson
9ed8d35ec2 Merge branch 'bugron-bugron-basic_js_fix-3' into staging 2015-09-13 23:26:22 -07:00
Quincy Larson
2922be8d98 minor improvements to suggested edits 2015-09-13 23:26:03 -07:00
Quincy Larson
ba4aacdbfd minor improvements to suggested edits 2015-09-13 23:26:03 -07:00
bugron
793f95d877 improves bug search method 2015-09-14 09:47:27 +04:00
bugron
615173ef91 fixes 'only 11 lines' issue 2015-09-14 08:37:45 +04:00
Quincy Larson
6dae5b8436 Merge branch 'bugron-basic_js_fix-3' of https://github.com/bugron/FreeCodeCamp into bugron-bugron-basic_js_fix-3 2015-09-13 21:03:00 -07:00
Quincy Larson
404b6d93c5 Merge branch 'bugron-basic_js_fix-3' of https://github.com/bugron/FreeCodeCamp into bugron-bugron-basic_js_fix-3 2015-09-13 21:03:00 -07:00
Quincy Larson
901bfa627d Merge branch 'bugron-bugron-basic_js_fix-2' into staging 2015-09-13 21:02:01 -07:00
Quincy Larson
c94b50d186 Merge branch 'bugron-basic_js_fix-2' of https://github.com/bugron/FreeCodeCamp into bugron-bugron-basic_js_fix-2 
Conflicts:
	seed/challenges/basic-javascript.json
 2015-09-13 20:59:54 -07:00
Quincy Larson
9bdbb59b67 Merge branch 'bugron-basic_js_fix-2' of https://github.com/bugron/FreeCodeCamp into bugron-bugron-basic_js_fix-2 
Conflicts:
	seed/challenges/basic-javascript.json
 2015-09-13 20:59:54 -07:00
Quincy Larson
fa64b9dca6 Merge branch 'bugron-bugron-basic_js_fix-1' into staging 2015-09-13 20:55:54 -07:00
Quincy Larson
4707bf1b1a small copy improvements to @bugron fixes 2015-09-13 20:55:51 -07:00
Quincy Larson
2688f48c71 small copy improvements to @bugron fixes 2015-09-13 20:55:51 -07:00
Quincy Larson
a90bf90e2a Merge branch 'bugron-basic_js_fix-1' of https://github.com/bugron/FreeCodeCamp into bugron-bugron-basic_js_fix-1 2015-09-13 20:48:46 -07:00
Quincy Larson
5ccf8fe56c Merge branch 'bugron-basic_js_fix-1' of https://github.com/bugron/FreeCodeCamp into bugron-bugron-basic_js_fix-1 2015-09-13 20:48:46 -07:00
Quincy Larson
89221bc762 Merge branch 'awesomeaniruddh-awesomeaniruddh-1318' into staging 
t push origin staging:# especially if it merges an updated upstream into a topic branch.
 2015-09-13 20:44:43 -07:00
Quincy Larson
db9f0a1fd5 switch backticks for doublequotes and fix the git.json file as well 2015-09-13 20:44:25 -07:00
Quincy Larson
389d8b43a8 switch backticks for doublequotes and fix the git.json file as well 2015-09-13 20:44:25 -07:00
Quincy Larson
3898321bb7 Merge branch 'awesomeaniruddh-1318' of https://github.com/awesomeaniruddh/FreeCodeCamp into awesomeaniruddh-awesomeaniruddh-1318 2015-09-13 20:39:40 -07:00
Quincy Larson
ba25511ee5 Merge branch 'awesomeaniruddh-1318' of https://github.com/awesomeaniruddh/FreeCodeCamp into awesomeaniruddh-awesomeaniruddh-1318 2015-09-13 20:39:40 -07:00
Quincy Larson
957a5329e5 adjust map font size and simplify Facebook share call to action 2015-09-13 20:26:33 -07:00
Quincy Larson
5376c1d4fe Merge pull request #3266 from leonfeng/leonfeng-fix-3208 
Change the example in Waypoint: Manipulate Arrays With unshift()
 2015-09-13 20:22:30 -07:00
Quincy Larson
06f0d80d7b Merge pull request #3266 from leonfeng/leonfeng-fix-3208 
Change the example in Waypoint: Manipulate Arrays With unshift()
 2015-09-13 20:22:30 -07:00
Quincy Larson
24bcf29396 minor formatting improvement to @awesomeaniruddh fix 2015-09-13 19:56:57 -07:00
Quincy Larson
f31fe15d77 minor formatting improvement to @awesomeaniruddh fix 2015-09-13 19:56:57 -07:00
Quincy Larson
d0359e5b27 Merge pull request #3278 from awesomeaniruddh/awesomeaniruddh-3276 
Edited decription of html waypoint to include details
 2015-09-13 19:50:48 -07:00
Quincy Larson
63f461a5d6 Merge pull request #3278 from awesomeaniruddh/awesomeaniruddh-3276 
Edited decription of html waypoint to include details
 2015-09-13 19:50:48 -07:00
Quincy Larson
01608edf7b Merge pull request #3287 from joel-bentley/joel-bentley-1936 
Fix confusing Waypoint: Write Reusable JavaScript with Functions
 2015-09-13 17:34:44 -07:00
Joel Bentley
023aca6a75 Add explanation of how values passed to function 2015-09-13 16:02:25 -04:00
Joel Bentley
c0f08b140a Add explanation of how values passed to function 2015-09-13 16:02:25 -04:00
Joel Bentley
4163b376bf Remove unneeded tests 2015-09-13 15:34:54 -04:00
Joel Bentley
bf08c300be Remove unneeded tests 2015-09-13 15:34:54 -04:00
Joel Bentley
815f460fd8 Modify sample function in code to match form of sample function in description 2015-09-13 14:04:52 -04:00
Joel Bentley
96e071687b Modify sample function in code to match form of sample function in description 2015-09-13 14:04:52 -04:00
Berkeley Martinez
a0ef8dd2ee Merge pull request #3277 from awesomeaniruddh/awesomeaniruddh-3268 
Updated instructions to ziplines intro challenge
 2015-09-12 23:56:35 -07:00
Berkeley Martinez
fd81e57df0 Merge pull request #3277 from awesomeaniruddh/awesomeaniruddh-3268 
Updated instructions to ziplines intro challenge
 2015-09-12 23:56:35 -07:00
Berkeley Martinez
11370db569 Merge pull request #3263 from leonfeng/leonfeng-fix-3260 
Fix wording of the tests in Waypoint: Create Bootstrap Wells
 2015-09-12 23:29:54 -07:00
Berkeley Martinez
656e7268ec Merge pull request #3263 from leonfeng/leonfeng-fix-3260 
Fix wording of the tests in Waypoint: Create Bootstrap Wells
 2015-09-12 23:29:54 -07:00
Berkeley Martinez
e982bd198e Merge pull request #3261 from awesomeaniruddh/awesomeaniruddh-2065 
Fixes description of jQuery waypoint
 2015-09-12 23:02:33 -07:00
Berkeley Martinez
ade62c2a90 Merge pull request #3261 from awesomeaniruddh/awesomeaniruddh-2065 
Fixes description of jQuery waypoint
 2015-09-12 23:02:33 -07:00