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

2320 Commits (792d72c6b4d461f92a9821adb6c4be769b1d5082)

Author SHA1 Message Date
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
Michael Q Larson a9036408aa Merge branch 'master' of https://github.com/FreeCodeCamp/freecodecamp 2015-02-13 08:38:48 -08:00
Nathan Leniz ba03dd51fa Slight reorder of bonfires 2015-02-13 09:03:34 -05:00
Nathan Leniz ae5fb1e3c2 Cleaning up bonfires.json 2015-02-13 09:01:39 -05:00
Nathan Leniz ef86867eeb Merge branch 'master' into tmp 2015-02-13 08:59:12 -05:00
Nathan b3a8087e55 Merge pull request #86 from FreeCodeCamp/brndnb-easy-bonfires 
Add 18 new bonfire challenges
 2015-02-13 08:54:05 -05:00
Nathan Leniz 542679c92d WIP on master: 995ca3d Refactor moment scripts to only be included in live-pair-programming view instead of being required in layout-wide 2015-02-13 08:52:55 -05:00
Nathan Leniz 2acc5b3f3c index on master: 995ca3d Refactor moment scripts to only be included in live-pair-programming view instead of being required in layout-wide 2015-02-13 08:52:55 -05:00
Michael Q Larson 2bbb19b6db Merge branch 'master' of https://github.com/FreeCodeCamp/freecodecamp 2015-02-12 23:06:19 -08:00
Michael Q Larson 43da6d16ff fix trello integration and make minor changes to courseware.json 2015-02-12 22:59:06 -08:00
Nathan Leniz 995ca3d376 Refactor moment scripts to only be included in live-pair-programming view instead of being required in layout-wide 2015-02-13 00:24:57 -05:00
Nathan 282cab19ce Merge pull request #90 from Phazz/patch-1 
Fix a typo in README
 2015-02-13 00:13:23 -05:00
Jason Rueckert 54b5870fc9 Merge pull request #91 from phlacin/automaticDating-livepair 
Added Moment.js library and time logic to next Live session
 2015-02-12 20:44:27 -08:00
phlacin 2d447f0bb0 added automatic time logic to live-pair-programming page 2015-02-12 20:31:11 -08:00
Michael Q Larson f8f0c3454a subtle completed challenge button for courseware and add completionMessage to coursewares 2015-02-12 16:48:35 -08:00
Michael Q Larson 93f4f6aa19 resequence coursewares 2015-02-12 16:00:34 -08:00
Michael Q Larson 51f75031de add a bunch of padding and margin related courseware, and start bootstrap courseware 2015-02-12 15:21:48 -08:00
Michael Q Larson 474c711935 Merge branch 'master' of https://github.com/FreeCodeCamp/freecodecamp 2015-02-12 13:05:53 -08:00
Nathan 05eec98071 Merge pull request #92 from alex-dixon/patch-1 
Typos
 2015-02-12 11:19:45 -05:00
Alex Dixon c826ac2341 Typos 2015-02-12 04:04:18 -08:00
phlacin 6455d80a6e Added Moment.js library and added logic to the time for the next Live session. 2015-02-11 23:08:10 -08:00