Commit Graph

166 Commits

Author SHA1 Message Date
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
Michael Q Larson
c07a75e4ba add several more coursewares 2015-02-10 12:46:34 -08:00
alicekamada
6a631c1f6d Update bonfires.json
Fixed a test case for "Sum All Primes"
2015-02-09 22:23:28 -08:00
Branden Byers
d466c704c2 Add 18 new bonfire challenges
Finders Keepers
Where art thou
Chunky Monkey
Falsey Bouncer
Slasher Flick
Drop it like its hot
Steamroller
Seek and Destroy
Where do I belong?
Sorted Union
Symmetric Difference
Everything Be True
Boo who?
Confirm the Ending
Convert HTML Entities
Spinal-Tap-Case
Repeat a string repeat a string
Truncate a string
2015-02-09 23:29:12 -06:00
Branden Byers
c1e2af9525 Fix typos
The only none obvious fix was this one: 'Lobster' to "Lobster" with double quotes for consistency. The first reference to Lobster was with single quotes and the next challenge had them in double quotes.
2015-02-09 10:18:05 -06:00
Michael Q Larson
b71453f4e2 update the first 13 courseware challenges and remove some silly compliments 2015-02-08 23:46:08 -08:00
Nathan Leniz
e425df2b0b Regex matching example for lorem ipsum challenge 2015-02-06 20:25:21 -05:00
Michael Q Larson
319b537e5b add a hotkey for advancing to the next challenge 2015-02-06 15:18:02 -08:00
Michael Q Larson
a1c5d665e6 Merge branch 'courseware' of https://github.com/FreeCodeCamp/freecodecamp into courseware 2015-02-06 13:54:55 -08:00
Michael Q Larson
57db67aa82 update the courseware.json to treat challengeSeed as an array, and update schema and write logic to strinify this array 2015-02-06 12:11:22 -08:00
Nathan Leniz
e2ab4438f5 Merge branch 'master' into courseware
Conflicts:
	controllers/bonfire.js
	controllers/resources.json
	views/bonfire/show.jade
2015-02-06 14:39:16 -05:00
Nathan Leniz
dcb057a175 Fixing routing issue for unfound bonfires 2015-02-06 01:51:54 -05:00
Michael Q Larson
1c3bb66848 figure out a test for inline styles 2015-02-05 22:31:15 -08:00
Michael Q Larson
480a8493fc add a bunch of raw material to the coursewares 2015-02-05 21:59:21 -08:00
Nathan Leniz
3ef334ac6f New bonfire challenges added 2015-02-05 23:35:09 -05:00
Michael Q Larson
471bd575e2 more work on courseware 2015-02-05 16:51:25 -08:00
Michael Q Larson
f35b1332da start creation of courseware challenges 2015-02-05 15:33:38 -08:00
Branden Byers
fc3ae2a623 Fix typo in Bonfire Challenge
Challenge id:  a3566b1109230028080c9345
2015-02-05 16:22:42 -06:00
Michael Q Larson
adfe5588d6 wire in points for courseware and bonfire 2015-02-04 19:39:57 -08:00
Nathan Leniz
d47482fdcc Merge branch 'master' into courseware 2015-02-04 21:28:41 -05:00
Nathan Leniz
9246d7f663 Hooked courseware up to mongo correctly, persisting solutions and configured controller to correctly pass user to next course or return to first if all are completed 2015-02-04 21:28:10 -05:00
Nathan Leniz
161582f6c9 courseware testing implemented 2015-02-04 19:59:51 -05:00
Nathan Leniz
26ee23ddf9 Fix for fibonacci challenge, fix routing issue for bonfire lookup 2015-02-04 15:32:31 -05:00
Michael Q Larson
f1000c3189 Merge branch 'master' into courseware
Conflicts:
	controllers/bonfire.js
	views/layout.jade
2015-02-02 23:32:46 -08:00
Quincy Larson
f7e136e3d3 Merge pull request #70 from FreeCodeCamp/ga-bonfire
Ga bonfire
2015-02-02 23:04:54 -08:00