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

197 Commits (2dbd59b7f1260916c666367fceb89e4e27e1e172)

Author SHA1 Message Date
Michael Q Larson 88e261ccf6 Merge branch 'master' into ux-improvements 
Conflicts:
	controllers/resources.js
	controllers/user.js
	seed_data/challenges.json
	views/account/show.jade
	views/coursewares/showHTML.jade
	views/coursewares/showJS.jade
	views/partials/bonfires.jade
 2015-03-21 16:25:39 -07:00
Michael Q Larson 2f240655a2 update announcements and move announcement modal back into learn-to-code view 2015-03-19 23:24:44 -07:00
Michael Q Larson 9adc444a31 fix a courseware test 2015-03-10 17:52:48 -07:00
piecedigital a2aec8d20d initial commit 2015-03-08 23:20:23 -04:00
Nathan Leniz bc06c69a7b update user pictures on page fetch for learn-to-code 2015-03-09 07:59:18 +09:00
Nathan Leniz 8608f48d8c Delete seed tasks, email signup now defaults a picture 2015-03-09 06:51:47 +09:00
Michael Q Larson 3bd979ad08 Merge branch 'news' of https://github.com/FreeCodeCamp/freecodecamp 2015-03-08 12:16:35 -07:00
Nathan Leniz bd81c678f9 Add story limiting for hotStories, not working on recentStories 2015-03-08 20:36:13 +09:00
Nathan 95f938efdf Merge pull request #149 from jonboiser/master 
Fixed expected answer for third test on Pairwise bonfire.
 2015-03-07 21:05:51 +09: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
Nathan Leniz 89dd38cbac Fix minor bugs 2015-03-07 03:55:59 +09:00
Nathan Leniz 6910ed0aea Nesting of comments in view, disabling comment form display button on button click 2015-03-07 01:57:09 +09:00
Michael Q Larson 7e14990698 Merge branch 'news' of https://github.com/FreeCodeCamp/freecodecamp into news 2015-03-05 10:56:31 -08:00
Michael Q Larson 4971d06db2 Merge branch 'master' into news 2015-03-05 10:56:20 -08:00
Michael Q Larson 4c0ff3b5ed Merge branch 'master' of https://github.com/FreeCodeCamp/freecodecamp into news 
Conflicts:
	views/partials/navbar.jade
 2015-03-05 10:56:06 -08:00
Nathan Leniz 41442a540f Need to work on story redirect after submission, fix url link in stories/show 2015-03-05 19:21:26 +09:00
Michael Q Larson 3d9c49b76e refactor the first challenge to make use of the array atribute we gave it 2015-03-04 22:04:58 -08:00
Michael Q Larson d8b8373b70 do some refactoring of the camper news views 2015-03-03 19:55:04 -08:00
Nathan Leniz 6ac780e836 Rewire upvote to use post and req.body instead of req.params, add logic on click handler to reject upvotes if the user has already upvoted, coment display now works 2015-03-04 07:15:00 +09:00
Michael Q Larson 3416353baf remove mention of forum from fcc 2015-03-03 11:31:16 -08:00
Nathan Leniz 52e494407b Get initial view working, sort out mongo mess with seed file 2015-03-03 19:23:56 +09:00
Michael Q Larson b7a95ee56f passing off hacker news clone to Nathan and his pair 2015-03-03 01:41:32 -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
Michael Q Larson f4fcb565f4 Merge branch 'master' into ux-improvements 
Conflicts:
	seed_data/coursewares.json
 2015-02-22 18:17:47 -08:00
Michael Q Larson 19e8795055 some minor ux improvements and use nice ghost-style buttons for more information and less information on challenges and bonfires 2015-02-22 17:32:30 -08:00
Michael Q Larson 5a68ac5411 Merge branch 'ux-improvements' of https://github.com/FreeCodeCamp/freecodecamp into ux-improvements 2015-02-22 01:27:52 -08:00
Michael Q Larson 36cf4196f5 fix some messed up json 2015-02-22 01:27:27 -08:00
Nathan Leniz 3e65298e35 All coursewares list now displays properly, coursewares properly direct to the follow on, courseware controller now properly finds the next courseware 2015-02-22 18:23:50 +09:00
Michael Q Larson 150226f4cf add all old challenges to our coursewares.json file after normalization 2015-02-21 22:50:46 -08: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
Free Code Camp b700b1dd87 Merge pull request #106 from letalumil/letalumil-bonfires-fixes 
Fix 'Inventory Update' bonfire. Closes #105
 2015-02-17 12:36:15 -08:00
Michael Q Larson 8e209d6bca start refactoring the learn-to-code view to use ajax 2015-02-16 23:35:02 -08:00
Michael Q Larson 1742be2efa Merge branch 'master' of https://github.com/FreeCodeCamp/freecodecamp 2015-02-16 17:56:13 -08:00
letalumil 5628b44899 Fix 'Inventory Update' bonfire. Closes #105 2015-02-16 19:36:18 +03:00
Michael Q Larson 9dd1558f1c update the about page and make it the root 2015-02-15 23:59:03 -08:00