gaspersic/freeCodeCamp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
29,260 Commits 9 Branches 0 Tags
659cc1276b8de68fc7b70a548da86c09b9052c5c
Commit Graph

29260 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Berkeley Martinez
5539fbc515 Merge branch 'QuincyLarson-bonfire-tests' into staging 2015-09-14 15:28:44 -07:00
Berkeley Martinez
5b760b7cf3 Merge branch 'bonfire-tests' of https://github.com/QuincyLarson/freecodecamp into QuincyLarson-bonfire-tests 2015-09-14 15:28:14 -07:00
Berkeley Martinez
fba0d02c08 Merge branch 'bonfire-tests' of https://github.com/QuincyLarson/freecodecamp into QuincyLarson-bonfire-tests 2015-09-14 15:28:14 -07:00
Berkeley Martinez
1eb34dc175 Merge pull request #3298 from awesomeaniruddh/fix/html-waypoint-desc 
Fix waypoint description to be in accordance with W3C rec
 2015-09-14 15:20:33 -07:00
Berkeley Martinez
523410e3ef Merge pull request #3298 from awesomeaniruddh/fix/html-waypoint-desc 
Fix waypoint description to be in accordance with W3C rec
 2015-09-14 15:20:33 -07:00
Berkeley Martinez
a30a5f4bcb Merge pull request #3303 from avastu/Fix-title-case 
Fixed Ambigious Explanation of Title Case
 2015-09-14 15:18:33 -07:00
Berkeley Martinez
eb88cc3bb0 Merge pull request #3303 from avastu/Fix-title-case 
Fixed Ambigious Explanation of Title Case
 2015-09-14 15:18:33 -07:00
Quincy Larson
ac51c6efb9 revert intermediate-bonfires to previous state for another camper to tackle 2015-09-14 14:57:14 -07:00
Quincy Larson
4f16b0e996 revert intermediate-bonfires to previous state for another camper to tackle 2015-09-14 14:57:14 -07:00
Quincy Larson
6c7c8bbc04 Merge branch 'staging' into bonfire-tests 2015-09-14 14:56:06 -07:00
Quincy Larson
d66dbc3879 Merge branch 'staging' into bonfire-tests 2015-09-14 14:56:06 -07:00
Quincy Larson
158a5e4841 verify all basic-bonfires.json bonfires work as before 2015-09-14 14:55:00 -07:00
Quincy Larson
952b5e8e70 verify all basic-bonfires.json bonfires work as before 2015-09-14 14:55:00 -07:00
Aniruddh Agarwal
22e785b0b8 Fix waypoint description to be in accordance with W3C rec 2015-09-15 05:50:14 +08:00
Aniruddh Agarwal
d3623577fb Fix waypoint description to be in accordance with W3C rec 2015-09-15 05:50:14 +08:00
Utsav Ahuja
2726b5026d Fixed ambigious wording 2015-09-14 14:30:53 -07:00
Utsav Ahuja
148f68e3a1 Fixed ambigious wording 2015-09-14 14:30:53 -07:00
Berkeley Martinez
f659141746 Merge pull request #3292 from FreeCodeCamp/improve-map 
adjust map font size and simplify Facebook share call to action
 2015-09-14 14:15:50 -07:00
Berkeley Martinez
33527c1c4f Merge pull request #3291 from QuincyLarson/fix-3278 
minor formatting improvement to @awesomeaniruddh fix
 2015-09-14 14:13:13 -07:00
Berkeley Martinez
ac5573b11c Merge pull request #3291 from QuincyLarson/fix-3278 
minor formatting improvement to @awesomeaniruddh fix
 2015-09-14 14:13:13 -07:00
Quincy Larson
8361c6cd9e Merge pull request #3301 from avastu/patch-2 
Corrected Incorrectly Styled Text in Target HTML Elements
 2015-09-14 14:12:08 -07:00
Quincy Larson
b605af0f09 Merge pull request #3301 from avastu/patch-2 
Corrected Incorrectly Styled Text in Target HTML Elements
 2015-09-14 14:12:08 -07:00
Quincy Larson
3d8f139f6c Merge branch 'bugron-feature/enlarge-images' into staging 2015-09-14 14:05:55 -07:00
Quincy Larson
118c71e57e fix css issue and use bower instead of files 2015-09-14 14:05:43 -07:00
Utsav Ahuja
f008f4a59a Corrected Incorrectly Styled Text 
In Target HTML Elements (jQuery) per https://github.com/FreeCodeCamp/FreeCodeCamp/issues/3299
 2015-09-14 13:49:28 -07:00
Utsav Ahuja
9a7fc92e79 Corrected Incorrectly Styled Text 
In Target HTML Elements (jQuery) per https://github.com/FreeCodeCamp/FreeCodeCamp/issues/3299
 2015-09-14 13:49:28 -07:00
Quincy Larson
9c7f96368b Merge branch 'feature/enlarge-images' of https://github.com/bugron/FreeCodeCamp into bugron-feature/enlarge-images 2015-09-14 13:43:34 -07:00
Quincy Larson
e107b0e005 Merge branch 'feature/enlarge-images' of https://github.com/bugron/FreeCodeCamp into bugron-feature/enlarge-images 2015-09-14 13:43:34 -07:00
Quincy Larson
d56b6711a1 most of the basic bonfires have running tests 2015-09-14 13:43:04 -07:00
Quincy Larson
98ed941384 most of the basic bonfires have running tests 2015-09-14 13:43:04 -07:00
bugron
c1cfdeddbb adds ability to 1-click expand images 2015-09-14 21:10:28 +04:00
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