gaspersic/freeCodeCamp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
2,387 Commits 9 Branches 0 Tags
c9dd6366ec508af39a30bd084fe0fb49a6cec3e5
Commit Graph

190 Commits

Author SHA1 Message Date
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
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
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
2a32f5f087 minor updates to coursewares.json 2015-02-14 15:50:47 -08: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
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
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
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
Michael Q Larson
43da6d16ff fix trello integration and make minor changes to courseware.json 2015-02-12 22:59:06 -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
Alex Dixon
c826ac2341 Typos 2015-02-12 04:04:18 -08:00
Michael Q Larson
da4deb77ff create box model and working test for padding and margin training 2015-02-11 17:13:00 -08:00
Michael Q Larson
e0bb3b4fd7 add some additional coursewares 2015-02-11 15:18:54 -08:00
Michael Q Larson
17809ebceb fix a comma json typo that was crashing the branch 2015-02-11 13:00:33 -08:00
Quincy Larson
a5fea13ffe Merge pull request #85 from FreeCodeCamp/brndnb-courseware-typos 
Fix typos
 2015-02-11 09:19:25 -08:00
Michael Q Larson
7514e3fba6 Merge branch 'brndnb-courseware-typos' of https://github.com/FreeCodeCamp/freecodecamp into brndnb-courseware-typos 
Conflicts:
	seed_data/coursewares.json
 2015-02-11 09:18:50 -08:00
Nathan
adb094cf49 Merge pull request #88 from elimisteve/master 
Check for Palindromes: Removed redundancy from description
 2015-02-11 11:36:18 -05:00
Steve Phillips
5734ab3dda meetBonfire: Added missing spaces to return line 2015-02-10 22:22:43 -08:00
Michael Q Larson
a1507a969b Add should and assert to coursewares and write code to test multiple instances of an element for a condition 2015-02-10 22:22:40 -08:00
Steve Phillips
2308ce1eeb Check for Palindromes: Removed redundancy from description 2015-02-10 22:19:05 -08:00
Michael Q Larson
44c5761f6a do more work on organizing and adding coursewares 2015-02-10 19:12:51 -08:00
Michael Q Larson
5f4fe74b16 attempt to make footer more accessible 2015-02-10 16:26:59 -08:00
Michael Q Larson
85ef3e734b Merge branch 'master' of https://github.com/FreeCodeCamp/freecodecamp 2015-02-10 13:44:50 -08:00
Michael Q Larson
4307c6659e further improvements to coursewares 2015-02-10 13:44:38 -08:00