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

2139 Commits (9774f4fd5de0211f9f6ee2f18a1a3ab271172768)

Author SHA1 Message Date
Nathan Leniz 9774f4fd5d Merge branch 'master' of https://github.com/freecodecamp/freecodecamp 2015-02-16 00:04:14 -05:00
Nathan f03425f219 Merge pull request #101 from letalumil/letalumil-bonfire-fixes 
Fix 'Make a Person' bonfire
 2015-02-16 00:04:07 -05:00
Nathan Leniz d0c2f6ccca Fixing up more bonfires 2015-02-16 00:03:35 -05:00
letalumil 0df8fd394d Remove duplicate initialization of bob variable in the 'Make a Person' bonfire 2015-02-16 07:44:06 +03:00
Nathan Leniz a277305e90 Merge branch 'master' of https://github.com/freecodecamp/freecodecamp 2015-02-15 22:29:32 -05:00
Nathan e37f69b3dd Merge pull request #100 from FreeCodeCamp/brndnb-bonfire-challenges-1 
Update sorted union bonfire description
 2015-02-15 22:29:09 -05:00
Branden Byers d12e25f250 Update sorted union bonfire description 
A camper requested more clarification on this challenge. Re-reading it, it was convoluted as to how the returned array should have been ordered.
 2015-02-15 20:46:36 -06:00
Nathan Leniz 6b6ffe0ae4 Fix naming of spinal tap case so bonfire can return it 2015-02-15 19:25:57 -05:00
Nathan Leniz c1115cbc7c more fixes for boo who 2015-02-15 18:08:11 -05:00
Nathan Leniz ef6ad60778 Updated infinite redirect on boo who challenge 2015-02-15 17:54:46 -05:00
Nathan Leniz b93b2af97c Cleaning up challengeSeed for where-art-though and adding it back into pool of available challenges 2015-02-15 11:57:48 -05:00
Nathan Leniz 28c3fa5125 Merge branch 'master' of https://github.com/freecodecamp/freecodecamp 2015-02-15 11:52:16 -05:00
Nathan Leniz cf288c7daf Switch to angular jqlite for class manipulation on pairedwith form in bonfire/show 2015-02-15 11:51:56 -05:00
Nathan 6476ebd52c Merge pull request #99 from letalumil/bonfire-fixes 
Bonfire fixes
 2015-02-15 02:36:22 -05:00
Nathan Leniz 92136dcd1f Fixing dependency injection for account view as well as defining a challengeName to suppress errors 2015-02-14 22:52:44 -05:00
Nathan Leniz 3d7c7cf6b3 Remove debug statements from the server 2015-02-14 22:42:10 -05:00
Nathan Leniz 284b8e03ff Properly observe angular dependency injection in main 2015-02-14 22:35:16 -05:00
Nathan Leniz 68ad6f9831 Added in debug statements to diagnose problem in production 2015-02-14 21:55:24 -05:00
Nathan Leniz d66f6bebf5 Merge branch 'master' of https://github.com/freecodecamp/freecodecamp 2015-02-14 21:49:04 -05:00
Nathan Leniz 4f6a6bd8f0 Clean up username validation in bonfires and remove red border from input field if user deletes all input 2015-02-14 21:48:48 -05:00
letalumil 0e377c5728 Fix 'Where art thou' bonfire. Fixes #96 2015-02-15 04:54:56 +03:00
letalumil a2d66b4b96 Fix 'Slasher Flick' bonfire seed function signature 2015-02-15 04:51:52 +03:00
letalumil f0f4e85cb0 Fix 'Chunky Monkey' bonfire EntryPoint typo 2015-02-15 04:50:47 +03:00
Quincy Larson 669afb0791 Merge pull request #98 from FreeCodeCamp/coderbye 
Coderbye
 2015-02-14 17:31:10 -08:00
Michael Q Larson 3509e8c285 hide javascript and video courseware for now. add link to new screen hero video. 2015-02-14 16:53:54 -08:00
Michael Q Larson c7b1668dcd missed a conflict during a merge 2015-02-14 16:30:15 -08:00
Michael Q Larson 5cc5623648 Merge branch 'master' into coderbye 
Conflicts:
	seed_data/bonfires.json
 2015-02-14 16:29:34 -08:00
Nathan Leniz 20b37ac470 Clean up meet bonfire 2015-02-14 19:16:18 -05:00
Michael Q Larson 108b272879 Merge branch 'coderbye' of https://github.com/FreeCodeCamp/freecodecamp into coderbye 
Conflicts:
	seed_data/coursewares.json
 2015-02-14 15:51:37 -08:00
Michael Q Larson 2a32f5f087 minor updates to coursewares.json 2015-02-14 15:50:47 -08:00
Nathan Leniz e3c9e42fce showJS view now shows errors in a pretty format (kinda) 2015-02-14 18:43:45 -05:00
Nathan Leniz 9ac19023d9 Show tests on html view 2015-02-14 18:31:32 -05:00
Nathan Leniz 693b8fbb33 Forward progress, need to resolve script loading timing 2015-02-14 17:28:07 -05:00
Michael Q Larson fb971ab080 start adding test output to coursewares 2015-02-14 14:09:26 -08:00
Nathan Leniz 31aafd300c Removing a very buggy challenge 2015-02-14 15:54:51 -05:00
Michael Q Larson 255d2654ea fix an indentation issue in showHTML 2015-02-14 12:52:04 -08:00
Michael Q Larson 8210cb927e Merge branch 'master' of https://github.com/FreeCodeCamp/freecodecamp into coderbye 
Conflicts:
	seed_data/challenges.json
 2015-02-14 12:32:50 -08:00
Nathan f0fff1e1b9 Merge pull request #94 from alex-dixon/master 
Typos
 2015-02-14 06:33:07 -05:00
Alex Dixon 5846a61955 Typos 2015-02-13 21:40:02 -08:00
Michael Q Larson a22e472fb2 update the showVideo view 2015-02-13 18:40:39 -08:00
Nathan Leniz efa4b2d9bc Factor all challenges button out of showvideo 2015-02-13 21:07:56 -05:00
Nathan Leniz b5c0ad9942 Building out new challenge framework to allow controller to determine view type for challenge 2015-02-13 20:55:49 -05:00
Nathan Leniz 0eededde36 merge master into coderbye 2015-02-13 16:56:09 -05:00
Nathan Leniz 54901a4b9b Remove special characters inserted from somewhere that were throwing off truncate challenges 2015-02-13 15:55:18 -05:00
Nathan Leniz cfec52c15b Even more cleanup of truncate challenge 2015-02-13 15:53:29 -05:00
Nathan Leniz 3bcf3d8d54 More fixes for truncate 2015-02-13 15:46:28 -05:00
Nathan Leniz 01cddba50d Fixed "truncate a string" test that was preventing users from completing the challenge 2015-02-13 15:05:53 -05:00
Michael Q Larson b691a35163 merge challenge entry point into challenge seed 2015-02-13 11:13:09 -08:00
Michael Q Larson bafba0b16f make some copy changes reflecting our shift to coderbyte 2015-02-13 11:01:12 -08:00
Nathan Leniz a0427b3e18 Fix for bonfire to allow people to prototype objects properly but lose default insertion point injection (i.e. they will get an error if they forget to call their function 2015-02-13 12:14:12 -05:00