Commit Graph

29599 Commits

Author SHA1 Message Date
158a5e4841 verify all basic-bonfires.json bonfires work as before 2015-09-14 14:55:00 -07:00
952b5e8e70 verify all basic-bonfires.json bonfires work as before 2015-09-14 14:55:00 -07:00
22e785b0b8 Fix waypoint description to be in accordance with W3C rec 2015-09-15 05:50:14 +08:00
d3623577fb Fix waypoint description to be in accordance with W3C rec 2015-09-15 05:50:14 +08:00
2726b5026d Fixed ambigious wording 2015-09-14 14:30:53 -07:00
148f68e3a1 Fixed ambigious wording 2015-09-14 14:30:53 -07:00
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
33527c1c4f Merge pull request #3291 from QuincyLarson/fix-3278
minor formatting improvement to @awesomeaniruddh fix
2015-09-14 14:13:13 -07:00
ac5573b11c Merge pull request #3291 from QuincyLarson/fix-3278
minor formatting improvement to @awesomeaniruddh fix
2015-09-14 14:13:13 -07:00
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
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
3d8f139f6c Merge branch 'bugron-feature/enlarge-images' into staging 2015-09-14 14:05:55 -07:00
118c71e57e fix css issue and use bower instead of files 2015-09-14 14:05:43 -07:00
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
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
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
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
d56b6711a1 most of the basic bonfires have running tests 2015-09-14 13:43:04 -07:00
98ed941384 most of the basic bonfires have running tests 2015-09-14 13:43:04 -07:00
c1cfdeddbb adds ability to 1-click expand images 2015-09-14 21:10:28 +04:00
c6e3c89b7c adds ability to 1-click expand images 2015-09-14 21:10:28 +04:00
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
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
f837df92ed Merge branch 'staging' of https://github.com/freecodecamp/freecodecamp into staging 2015-09-14 00:03:05 -07:00
0ebd7f0261 Merge branch 'ahstro-css-cleanup' into staging 2015-09-14 00:02:45 -07:00
953df6826b fix merge conflicts 2015-09-14 00:02:42 -07:00
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
f4c20e80ef Merge branch 'souldreamer-patch-4' into staging 2015-09-13 23:36:16 -07:00
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
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
9ed8d35ec2 Merge branch 'bugron-bugron-basic_js_fix-3' into staging 2015-09-13 23:26:22 -07:00
2922be8d98 minor improvements to suggested edits 2015-09-13 23:26:03 -07:00
ba4aacdbfd minor improvements to suggested edits 2015-09-13 23:26:03 -07:00
793f95d877 improves bug search method 2015-09-14 09:47:27 +04:00
615173ef91 fixes 'only 11 lines' issue 2015-09-14 08:37:45 +04:00
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
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
901bfa627d Merge branch 'bugron-bugron-basic_js_fix-2' into staging 2015-09-13 21:02:01 -07:00
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
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
fa64b9dca6 Merge branch 'bugron-bugron-basic_js_fix-1' into staging 2015-09-13 20:55:54 -07:00
4707bf1b1a small copy improvements to @bugron fixes 2015-09-13 20:55:51 -07:00
2688f48c71 small copy improvements to @bugron fixes 2015-09-13 20:55:51 -07:00
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
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
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
db9f0a1fd5 switch backticks for doublequotes and fix the git.json file as well 2015-09-13 20:44:25 -07:00
389d8b43a8 switch backticks for doublequotes and fix the git.json file as well 2015-09-13 20:44:25 -07:00
3898321bb7 Merge branch 'awesomeaniruddh-1318' of https://github.com/awesomeaniruddh/FreeCodeCamp into awesomeaniruddh-awesomeaniruddh-1318 2015-09-13 20:39:40 -07:00
ba25511ee5 Merge branch 'awesomeaniruddh-1318' of https://github.com/awesomeaniruddh/FreeCodeCamp into awesomeaniruddh-awesomeaniruddh-1318 2015-09-13 20:39:40 -07:00