Commit Graph

54 Commits (669afb079105b9f36ce5002e5408690a36b5e2b5)

Author SHA1 Message Date
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
Nathan Leniz 31aafd300c Removing a very buggy challenge 2015-02-14 15:54:51 -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
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
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
Alex Dixon c826ac2341 Typos 2015-02-12 04:04:18 -08:00
Michael Q Larson 17809ebceb fix a comma json typo that was crashing the branch 2015-02-11 13:00:33 -08:00
Steve Phillips 5734ab3dda meetBonfire: Added missing spaces to return line 2015-02-10 22:22:43 -08:00
Steve Phillips 2308ce1eeb Check for Palindromes: Removed redundancy from description 2015-02-10 22:19:05 -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
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
Nathan Leniz 3ef334ac6f New bonfire challenges added 2015-02-05 23:35:09 -05: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 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
Nathan Leniz a558777382 Cleaning up angular, preparing to make new editor framework for coursewares 2015-02-02 20:39:05 -05:00
Michael Q Larson 9944f1b685 start adding new favicons and make the seed task run with each push to heroku 2015-02-02 15:27:12 -08:00
Michael Q Larson 0ee291878a remove term code campers from codebase - replace with camper. Move bulky function from app.js to bonfire.js 2015-02-01 22:39:59 -08:00
Nathan Leniz 29db5f8b94 Adding person challenge, need to inspect execution failure in testing. 2015-01-29 00:17:49 -05:00
Nathan Leniz b7ed227116 Fix for largest of arrays 2015-01-28 21:53:47 -05:00
Nathan Leniz e163864829 Fix for challenge Title Case 2015-01-28 21:46:06 -05:00
Maxim Orlov 4604ede346 fix typo Title Case a Sentence 2015-01-29 00:23:04 +01:00
Nathan Leniz 40d52a5a3b BONFIRE READY TO SHIP 2015-01-28 00:59:30 -05:00
Nathan Leniz 2e5dd6ea73 Strange user behavior, model not updating correctly 2015-01-26 18:28:14 -05:00
Nathan Leniz ead9fe56d1 Fixed bonfire to allow users to enter contractions 2015-01-26 12:30:04 -05:00
Michael Q Larson c20aa1697c generator now publishes directly to a view where you can interact with your new bonfire 2015-01-25 23:10:05 -08:00
Michael Q Larson 3f6ee44248 add the first new bonfire and resequence bonfire form slightly 2015-01-25 21:16:44 -08:00
Nathan Leniz 26c041826b Fixed bonfire to not overwrite user entry point but still allow user error by not defining entry point, create web form to give challenge json back, improved layout of bonfire even more 2015-01-25 23:56:04 -05:00
Michael Q Larson 0e63521ee0 refactor verbs, compliments and phrases into resources controller and require them where necessary. Create tutorial bonfire. Clean up existing bonfires. Fix minor ui issues. 2015-01-24 23:03:25 -08:00
Nathan Leniz 6b4475a5b8 Major refactor of bonfireFramework to differentiate tests, refactor tests in Bonfire schema to remove public/private tests and only have tests, fire modal on successful run of all tests in bonfire/show, added bonfiresHash to User schema, and we should have committed a while ago because there is too much too list 2015-01-24 00:44:08 -05:00
Nathan Leniz bc1f01f67b More bonfire improvements, restoring functionality to original bonfire module after growing it to accept the challenge framework 2015-01-22 22:47:15 -05:00
Nathan Leniz e9f24347b4 Improving seeding function to also seed bonfires 2015-01-22 19:04:16 -05:00
Nathan Leniz e0311210e0 Improving bonfire flow, working on seed.js 2015-01-22 18:44:25 -05:00