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

2120 Commits (284b8e03ffb49cce62c24b117ced85bbbb72ebeb)

Author SHA1 Message Date
Michael Q Larson fa357a401f Merge branch 'master' of https://github.com/FreeCodeCamp/freecodecamp 2015-01-27 23:23:50 -08:00
Nathan Leniz 7ea08f3074 Add callback to and settimeout functions to prevent race conditions with write 2015-01-28 02:22:12 -05:00
Michael Q Larson 7aed4c152c Merge branch 'master' of https://github.com/FreeCodeCamp/freecodecamp 2015-01-27 22:32:00 -08:00
Quincy Larson adf1d30fee Merge pull request #52 from FreeCodeCamp/bonfire 
Bonfire
 2015-01-27 22:31:38 -08:00
Michael Q Larson e9efc039ec Merge branch 'master' of https://github.com/FreeCodeCamp/freecodecamp 
Conflicts:
	views/resources/live-pair-programming.jade
 2015-01-27 22:23:58 -08:00
Quincy Larson 3a8c10e438 Merge pull request #51 from FreeCodeCamp/bonfire 
Bonfire
 2015-01-27 22:04:17 -08: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
Michael Q Larson 3b0c082b56 update live-pair-programming page 
;
 2015-01-27 17:17:21 -08:00
Nathan Leniz 3844542651 Refactor routing, minor display tweaks 2015-01-27 20:12:51 -05:00
Michael Q Larson 547b9757b1 set wide layout background to white 2015-01-27 15:05:51 -08:00
Michael Q Larson 2f0415ecf9 update the congratulatory text a bit 2015-01-27 14:46:05 -08: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 504838083e Fixed display issue of difficulty iconography 2015-01-27 03:31:59 -05:00
Nathan Leniz f97350ecf3 Fixed challenge ordering 2015-01-27 03:29:17 -05:00
Nathan Leniz 1988101ba2 Server successfully redirects, still need to work on challenge ordering 2015-01-27 02:55:41 -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
Michael Q Larson 48e535b9c5 now have both full width layout and normal layout 2015-01-26 11:02:22 -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
Michael Q Larson 7c6cbbf221 Merge branch 'bonfire-redesign' of https://github.com/FreeCodeCamp/freecodecamp into bonfire-redesign 2015-01-25 21:16:57 -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 f8eb5971b8 Fixing playground for to not include a null symbol 2015-01-26 00:15:46 -05: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 413d89cf18 minor improvements to the navbar and layout in general 2015-01-25 14:05:56 -08:00
Nathan Leniz 00dfdb2e1e More layout improvements, adding in contextual icons for test success/failure and styling font of test output 2015-01-25 15:22:21 -05:00
Michael Q Larson fa5a1a8618 make test results look better 2015-01-25 10:35:41 -08:00
Michael Q Larson 6503c108bb Merge branch 'bonfire' into bonfire-redesign 
Conflicts:
	views/bonfire/show.jade
 2015-01-25 09:43:39 -08:00
Michael Q Larson 17312f43f5 moved components to correct sides of the view and cleaned up pair name entry 2015-01-25 09:41:07 -08:00
Michael Q Larson f593ebbbf2 start widescreen refactor 2015-01-25 09:06:30 -08: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
Michael Q Larson a2c2388e75 Merge branch 'bonfire' of https://github.com/FreeCodeCamp/freecodecamp into bonfire 2015-01-24 22:29:29 -08:00
Nathan Leniz 3c3dc803c5 Show long/short form instructions based on user input 2015-01-24 20:49:59 -05:00
Nathan Leniz 966eb3d073 More cleanup of input field after user error 2015-01-24 19:16:28 -05:00
Michael Q Larson 0ba1ecd30a add @freecodecamp to generated tweet messages 2015-01-24 15:40:11 -08:00
Nathan Leniz 7502dc0689 Allowing user to delete attempted username input from bonfire challenges completion modal 2015-01-24 18:33:00 -05:00
Michael Q Larson 65384b2913 add @ sign and autofocus to twitter form 2015-01-24 15:20:48 -08:00
Michael Q Larson 54c3305281 change bonfire path to playground and update links, and also add a should example test to playground 2015-01-24 14:42:34 -08:00
Michael Q Larson c4bd0e4dc3 make bonfire dynamically direct to best subsequent bonfire after completion 2015-01-24 14:29:50 -08:00
Michael Q Larson 1b75a6a7b8 only pad navbar rightmost element if not authenticated 2015-01-24 11:31:56 -08:00
Michael Q Larson e115e6da22 Merge branch 'master' into bonfire 2015-01-24 11:29:43 -08:00
Michael Q Larson 34f106387d Merge branch 'master' of https://github.com/FreeCodeCamp/freecodecamp 2015-01-24 11:28:48 -08:00
Michael Q Larson 1c0799bef0 start adding alternative congradulatory text 2015-01-24 11:28:18 -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