Commit Graph

106 Commits

Author SHA1 Message Date
Nathan
92157ebdff Merge pull request #311 from FreeCodeCamp/seek-and-destroy
Attempt to fix wording on seek and destroy bonfire issue #293
2015-04-21 22:28:14 -04:00
terakilobyte
7cbd8e1c04 merge pr for unique story slugs 2015-04-20 00:28:55 -04:00
Quincy Larson
102550fd0b update the symmetric difference challenge 2015-04-19 01:18:56 -07:00
terakilobyte
b49d2fd343 Resolve merge conflicts using Webstorm's merge integration tool. 2015-04-17 00:11:13 -04:00
terakilobyte
56e45ba9dd resolve merge conflict 2015-04-15 18:35:06 -04:00
Michael Q Larson
d968524c69 attempt to fix wording on seek and destroy bonfire issue #293 2015-04-15 00:59:12 -07:00
terakilobyte
9c67d4988f Add new currying challenge to bonfires and allow inspectlet through protective helmet 2015-04-14 23:04:54 -04:00
Michael Q Larson
11548bfcf9 add checkbox cross off effect to challenges and reword pairwise bonfire 2015-04-13 02:41:42 -04:00
Geoff Storbeck
543c79b67a Updated from upstream 2015-04-04 12:16:00 -04:00
Geoff Storbeck
003f6c6c0a Updated language and added more test cases 2015-03-31 19:07:22 -04:00
Geoff Storbeck
46d185a503 added 5 new bonfires 2015-03-30 23:27:09 -04:00
Michael Q Larson
18a9818200 Merge branch 'master' into nonprofit-show
Conflicts:
	controllers/challenges.js
	controllers/courseware.js
2015-03-30 16:17:04 -07:00
Michael Q Larson
81ce249dfc tiny fix for a bonfire 2015-03-29 14:56:13 -07:00
Ashley Drake
85c996ad2e Added bonfire links for level 3. 2015-03-26 10:45:33 -04:00
Ashley Drake
c053069f23 Added bonfire links for level 2. 2015-03-26 10:34:59 -04:00
Ashley Drake
4cad7c1aee fixed comma error for merge. 2015-03-26 09:53:22 -04:00
Geoff Storbeck
482cc3fa7b fixed typo for issue #266 2015-03-24 15:58:17 -04:00
A. Drake
c4624b7f20 links added, basic functionality working across pages. 2015-03-24 01:17:21 -04:00
A. Drake
0bf68fea5f Links from database are being passed to the view. TODO create links 2015-03-23 23:20:19 -04:00
piecedigital
a2aec8d20d initial commit 2015-03-08 23:20:23 -04:00
Jonathan Boiser
a6cd9876d9 Rewrite description of Pairwise bonfire. Added second test illustrating the no-reuse rule. 2015-03-06 23:39:45 -08:00
Michael Q Larson
130f743dfc wrap some json notation that Nathan left unwrapped in code tags 2015-03-03 00:22:39 -08:00
Nathan Leniz
e85b91de36 Fixup of bonfires for clarity, thanks to our users 2015-03-03 17:10:33 +09:00
Nathan Leniz
ea9691de1c Added new bonfire "No repeats please" 2015-03-01 08:58:05 +09:00
Nathan Leniz
43f9a9c30b Clean up bonfire descriptions 2015-02-28 17:57:58 +09:00
Nathan Leniz
d70fd24583 clean up pairwise 2015-02-28 17:51:23 +09:00
Nathan Leniz
2c27d6d965 Added pairwise bonfire 2015-02-28 17:46:17 +09:00
Nathan Leniz
2d40779a96 Adding missing letters bonfire 2015-02-28 17:33:45 +09:00
Nathan Leniz
df2ba2e486 Rename anagrams to mutations 2015-02-28 17:14:04 +09:00
Nathan Leniz
d896857fd3 Added new anagram bonfire 2015-02-28 17:03:36 +09:00
Nathan Leniz
8acf44ed86 Updated bonfires, added new challenge binary agents 2015-02-26 19:42:47 +09:00
Nathan
bd6b9b2887 Merge pull request #118 from aldraco/master
update description on Union Sort bonfire challenge for clarity
2015-02-26 16:42:47 +09:00
A. Drake
216eae90c6 Updating local branch.
merge branch 'master' of https://github.com/FreeCodeCamp/freecodecamp
2015-02-24 13:11:39 -05:00
A. Drake
d446dbbd53 Updated description for Sorted Union bonfire for clarity. 2015-02-24 13:10:34 -05:00
Branden Byers
9ce991b9df Update bonfire challenge description
Clarified the description on the Return Largest Numbers in Arrays challenge.
2015-02-23 21:37:57 -06:00
Nathan Leniz
a087068022 Fix drop it like its hot challenge 2015-02-22 13:55:27 +09:00
Nathan Leniz
ff4fbefc0a Cleaned up where do I belong challenge 2015-02-22 13:24:26 +09:00
Nathan Leniz
f077a0f333 New bonfire challenge 2015-02-22 06:18:38 +09:00
letalumil
5628b44899 Fix 'Inventory Update' bonfire. Closes #105 2015-02-16 19:36:18 +03:00
letalumil
cf941c3666 Fix 'Cash Register' bonfire bug. Closes #103 2015-02-16 10:02:35 +03:00
Nathan Leniz
9774f4fd5d Merge branch 'master' of https://github.com/freecodecamp/freecodecamp 2015-02-16 00:04:14 -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
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
letalumil
0e377c5728 Fix 'Where art thou' bonfire. Fixes #96 2015-02-15 04:54:56 +03:00