greatbody
/
freeCodeCamp
mirror of https://github.com/freeCodeCamp/freeCodeCamp.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
5,455 Commits
4 Branches
0 Tags
959 MiB
Commit Graph

5455 Commits (60d059f71e1c60b8c13d6144403b1b76c50c6139)

Author SHA1 Message Date
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 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 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 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 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 2688f48c71 small copy improvements to @bugron fixes 2015-09-13 20:55:51 -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 389d8b43a8 switch backticks for doublequotes and fix the git.json file as well 2015-09-13 20:44:25 -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 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 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 c0f08b140a Add explanation of how values passed to function 2015-09-13 16:02:25 -04:00
Joel Bentley bf08c300be Remove unneeded tests 2015-09-13 15:34:54 -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 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 e982bd198e Merge pull request #3261 from awesomeaniruddh/awesomeaniruddh-2065 
Fixes description of jQuery waypoint
 2015-09-12 23:02:33 -07:00
Aniruddh Agarwal 0c7b1dbf5f Fixes description of jQuery waypoint 2015-09-13 13:58:37 +08:00
bugron 3af8a9eb9f Fixes typos, word issues in Basic JS, part 3 2015-09-13 09:10:30 +04:00
bugron 43778e5149 Fixes typos, word issues in Basic JS, part 2 2015-09-13 09:02:54 +04:00
bugron 02d24381a7 Fixes typos, word issues in Basic JS, part 1 2015-09-13 08:52:51 +04:00
Berkeley Martinez 849e823d54 Merge pull request #3255 from bugron/bugron-1117 
Improves tests to check if elements are nested properly
 2015-09-12 21:46:14 -07:00
Berkeley Martinez 94ca5a0326 Merge pull request #3225 from awesomeaniruddh/awesomeaniruddh-1398 
Updated description of voting app basejump
 2015-09-12 21:39:47 -07:00
Berkeley Martinez b3c7a73ee1 Merge pull request #2892 from bugron/bugron-2256 
fixes a test and some text
 2015-09-12 21:31:46 -07:00
Berkeley Martinez 5ed9e5e831 Merge branch 'sJhonny-e-sJhonny-e-969' into staging 2015-09-12 20:40:17 -07:00
Berkeley Martinez 91f6e21757 fix typo 2015-09-12 20:39:23 -07:00
Berkeley Martinez 5360531dc8 Merge branch 'sJhonny-e-969' of https://github.com/sJhonny-e/FreeCodeCamp into sJhonny-e-sJhonny-e-969 2015-09-12 20:37:48 -07:00
Berkeley Martinez 8a4ffa4c1b Merge pull request #3272 from leonfeng/leonfeng-feature-pr-link 
Add links to the Pull Request Contribute wiki entry
 2015-09-12 19:54:53 -07:00
Berkeley Martinez 8f50925bba Merge pull request #2957 from awesomeaniruddh/awesomeaniruddh-2955 
updated ambiguous description of jquery waypoint
 2015-09-12 19:52:32 -07:00
Berkeley Martinez f846d007b3 change code copy 2015-09-12 19:17:51 -07:00
Berkeley Martinez 9fd22e8264 remove unnecessary class 2015-09-12 18:51:44 -07:00
Berkeley Martinez 044571a8be Merge branch 'ahstro-3258' of https://github.com/ahstro/freecodecamp into ahstro-ahstro-3258 2015-09-12 18:27:25 -07:00
ahstro 7f6bcaa704 Include code in issue + issue body improvements 
This creates an auto-checked checkbox next to the 'Create my GitHub
issue'-button that, when checked, includes the camper's code in the body
sent to GitHub when creating a new issue.
Also includes some general improvements to how the way the issue
creation is handled and how the output looks.
 2015-09-13 01:54:26 +02:00
Aniruddh Agarwal 9243a1832f Edited decription of html waypoint to include details 2015-09-13 07:40:17 +08:00
Aniruddh Agarwal 739a8b122b Merge pull request #3273 from joel-bentley/joel-bentley-2274 
Fix description of Waypoint: Find Numbers with Regular Expressions
 2015-09-13 07:12:28 +08:00
Aniruddh Agarwal 4bf3959ad4 Updated instructions to ziplines intro challenge 
Updated the instructions to add jQuery as well as Bootstrap in the JS section.
closes #3268
 2015-09-13 07:04:18 +08:00