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

50 Commits (0eededde368163e37061c68adf15adedca2f8b4d)

Author SHA1 Message Date
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 5898de7ab9 Changes to courseware and bonfire controller to handle direction to next challenge if the user has completed all offerings, also show a flash message letting them know why they are being redirected 2015-02-04 23:27:57 -05: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
Nathan Leniz c487ddf18e Cleaning up bonfire.js 2015-02-04 14:59:45 -05:00
Nathan Leniz 9193ba04e0 Fix pathing bug for users who are not logged in and type /bonfires/ 2015-02-04 00:41:25 -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
Michael Q Larson f059bc33d8 add courseware controller and routes 2015-02-01 23:35:27 -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
Michael Q Larson afab456ad9 start adding Courseware controllers, routes etc. 2015-02-01 14:22:34 -08:00
Michael Q Larson 68df7b218e update URL on regex match if incomplete url 2015-01-30 17:27:24 -08:00
Michael Q Larson d7d4727c0f first commit with working iframe pulling data from code editor 2015-01-29 17:01:50 -08:00
Michael Q Larson 2f59dd5e5b improve the tweet button functionality for both bonfire and challenges 2015-01-28 21:00:14 -08:00
Nathan Leniz 9fa0323049 Sequence request for new bonfire to wait until save operation, making bonfire fetch unsolved bonfires at a much faster rate to ensure data sync 2015-01-28 17:17:45 -05:00
Nathan Leniz 7ea08f3074 Add callback to and settimeout functions to prevent race conditions with write 2015-01-28 02:22:12 -05:00
Nathan Leniz 40d52a5a3b BONFIRE READY TO SHIP 2015-01-28 00:59:30 -05:00
Nathan Leniz 4fcca641b6 Adding name to passed variables for generated bonfires 2015-01-27 22:46:18 -05:00
Nathan Leniz 5294462e4c Resolving issue with saving to "paired with" user profile 2015-01-27 22:25:48 -05:00
Nathan Leniz 01bdbd8f4d Finishing up pathing issues, writing user object if they haven't visited in a day 2015-01-27 17:39:53 -05:00
Nathan Leniz be0cf978f5 Correctly sorting unsolved bonfires 2015-01-27 02:51:59 -05:00
Nathan Leniz 227c938445 massive redesign of user model and the way it interacts with bonfires, successfully returning next bonfire for the user, showing meet bonfire to unauthenticated users 2015-01-27 01:22:02 -05:00
Nathan Leniz 2e5dd6ea73 Strange user behavior, model not updating correctly 2015-01-26 18:28:14 -05:00
Michael Q Larson f8343d4c13 full layout now works. refactor files and routes to have more conventional names and redirects where necessary 2015-01-26 11:38:19 -08: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
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
Nathan Leniz d886a77858 Refactor random verbs, phrases, and compliments so that only the resources controller is concerned with how to fetch them and how to make them randomly. Remove debug statement from bonfire/show.jade 2015-01-25 10:02:41 -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 3c3dc803c5 Show long/short form instructions based on user input 2015-01-24 20:49:59 -05:00
Michael Q Larson c4bd0e4dc3 make bonfire dynamically direct to best subsequent bonfire after completion 2015-01-24 14:29:50 -08:00
Nathan Leniz a7f228c410 Refactor db read/write ops to use find instead of findOne to improve performance 2015-01-24 14:21:44 -05:00
Nathan Leniz 0ca042a1f0 Paired with is now properly saved, bonfire challenge framework is almost ready for release 2015-01-24 13:40:58 -05:00
Nathan Leniz a3cf6c3ee2 Persisting completion of bonfire challenges into User model, split routes for bonfires and challenges, refactored class selectors to be challenge type specific 2015-01-24 03:11:01 -05: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
Michael Q Larson 1f6cb10a32 fix a jquery exercise regression and make jquery exercises run in firefox 2015-01-23 00:30:34 -08:00
Nathan Leniz 0e9523ab72 More steps towards integrating the bonfire challenge framework. Importing challnge seed, public tests, private tests, entry point and entry point negator 2015-01-22 15:49:16 -05:00
Nathan Leniz 378277f0e1 More steps towards building the bonfire challenge interface 2015-01-22 13:20:46 -05:00
Nathan Leniz 094b937148 Incremental steps towards building the bonfire challenge views 2015-01-22 11:59:55 -05:00
Nathan Leniz 6ea5f5c895 Preparing for bonfire challenges, create Bonfire model, BonfireCompletion model, update bonfire controller, create initial bonfire seed data 2015-01-21 21:32:13 -05:00
Michael Q Larson b1f22ef925 update the title on bonfire.js 2015-01-21 15:38:39 -08:00
Michael Q Larson 6202c03d13 Merge branch 'bonfire-improvement' of https://github.com/FreeCodeCamp/freecodecamp into bonfire-improvement 
Conflicts:
	controllers/bonfire.js
 2015-01-21 15:37:14 -08:00
Nathan Leniz c422f9474b More improvements, keyboard shortcuts working again, extra protection against fatal errors 2015-01-21 17:17:45 -05:00
jmcshane 03d635c65f Test evaluation complete, need to hook pre-submit 2015-01-20 23:31:36 -05:00
Michael Q Larson 1e427d723c fix bug that was crashing heroku 2015-01-17 19:07:57 -08:00
Michael Q Larson bae9e41b42 improve bonfire and start adding model and controller 2015-01-17 18:52:58 -08:00
webdev adac5f6352 Work on bonfire and make better .jshintrc files 2015-01-16 18:58:27 -05:00
Michael Q Larson d8929ac72d make bonfire view consistent with other challenge views and make codemirror height larger and result code mirror pane read only with no cursor 2015-01-10 22:59:24 -08:00
terakilobyte 407f2212d0 Smoke rises 2015-01-11 00:45:37 -05:00