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

16369 Commits (6cb1a95c72947907c8c2079cd69a5bca701d6b55)

Author SHA1 Message Date
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 106a10edca add a modal that allows one to scroll through all wiki pages 2015-03-30 15:55:00 -07:00
Michael Q Larson 23a3e235a7 Update routes for all static pages and leave redirects for existing routes to get to new wiki routes 2015-03-30 15:15:07 -07:00
Michael Q Larson 660214f87e able to seed and view wiki content 2015-03-30 13:48:54 -07:00
Berkeley Martinez b6da312547 Merge pull request #278 from FreeCodeCamp/accessability 
Fix some bugs, improver perf of show all bonfires/challenges and add buttons to challenge views
 2015-03-30 13:12:56 -07:00
Berkeley Martinez b6dc82805d Merge pull request #279 from FreeCodeCamp/styleguide 
Take @brndbr's styleguide to address #112
 2015-03-30 13:12:40 -07:00
Michael Q Larson 83a9223dcc respond to @BerkeleyTrue feedback 2015-03-30 13:09:24 -07:00
Michael Q Larson 64c4bfd566 remove a leftover console.log 2015-03-30 12:55:31 -07:00
Michael Q Larson 97c978dc7c Make Basejumps show up properly and get their github routes persisting in the database. 2015-03-29 18:13:04 -07:00
Michael Q Larson 5bb084120e create a styleguide from @brndbr's sample style guide 2015-03-29 17:28:25 -07:00
Michael Q Larson aa01a896a5 Add show all challenges button to all challenge views and refactor bonfire to use same modal and button ids 2015-03-29 17:09:12 -07:00
Michael Q Larson f0ae47dcf2 Fix show all bonfire bug where it wouldn't show while unauthenticated; add sr-only class to completed bonfires 2015-03-29 16:47:49 -07:00
Michael Q Larson 44ffc715de add nonprofit.json seed data from scrapped nonprofit branch 2015-03-29 15:29:14 -07:00
Michael Q Larson 9fe8bf2fbf remove references to codepen from codebase 2015-03-29 15:14:13 -07:00
Michael Q Larson 15728510ea t push origin ux-improvements:Merge branch 'terakilobyte-ux-improvements' into ux-improvements 2015-03-29 14:57:11 -07:00
Michael Q Larson 81ce249dfc tiny fix for a bonfire 2015-03-29 14:56:13 -07:00
Michael Q Larson 43810ccb0c Merge branch 'ux-improvements' of https://github.com/terakilobyte/freecodecamp into terakilobyte-ux-improvements 
Conflicts:
	controllers/bonfire.js
	controllers/resources.js
	public/js/main.js
	views/bonfire/show.jade
 2015-03-29 14:44:49 -07:00
Quincy Larson 4405defb0f Merge pull request #275 from storbeck/master 
Posts completed status when challenge 2 is opened for issue #274
 2015-03-29 14:34:13 -07:00
Quincy Larson 7a27ded5bc Merge pull request #273 from aldraco/coursewaresErr 
Coursewares error handling (issue #261)
 2015-03-29 14:32:16 -07:00
Quincy Larson d5fdc15605 Merge pull request #272 from aldraco/bonfireMDN3-4 
Bonfire mdn links: 3-4 flame
 2015-03-29 14:28:58 -07:00
Michael Q Larson f20743428a Merge branch 'jameskopacz-patch-259' of https://github.com/jameskopacz/freecodecamp into ux-improvements 2015-03-29 14:19:12 -07:00
Michael Q Larson b0099efe6e updates to javascript waypoints 2015-03-29 14:19:04 -07:00
Michael Q Larson 70f812dc78 Merge branch 'master' into ux-improvements 
Conflicts:
	controllers/bonfire.js
	controllers/resources.js
	views/bonfire/show.jade
 2015-03-29 13:05:39 -07:00
Michael Q Larson 4a805729cf add javascript waypoints 2015-03-29 12:51:23 -07:00
Nathan Leniz b00c5be45c View improvement for users that are not logged in or happen to hit control enter 2015-03-29 21:41:59 +09:00
Nathan Leniz 75073e362a Add errantly removed ramda include 2015-03-29 21:41:29 +09:00
Nathan Leniz aa2f0e8af8 Change completion event to remove duplicate entries if the user states they paired with themselves 2015-03-29 21:15:18 +09:00
Nathan Leniz 1fc3cffdbf Add .editorconfig to enforce certain automatic behavior on all editors, 
Add logic for ziplines and basejumps completion.
 2015-03-29 20:49:56 +09:00
Nathan Leniz f6df15d5e0 merge master in ux-improvements 2015-03-29 19:19:19 +09:00
Michael Q Larson 47d0d8e0da Merge branch 'master' of https://github.com/FreeCodeCamp/freecodecamp 2015-03-28 23:43:08 -07:00
Quincy Larson 1b247f97fc Merge pull request #262 from aldraco/bonfirelinks 
Bonfire MDN links - Issue #255
 2015-03-28 20:34:34 -07:00
Geoff Storbeck 64ccae938a Posts completed status when challenge 2 is opened for issue #274 2015-03-28 17:18:09 -04:00
Ashley Drake 3e839030ac Fixed async function 2015-03-28 14:08:51 -04:00
Ashley Drake 69533424a3 Fixed user.save error callback handler 2015-03-28 14:01:31 -04:00
Ashley Drake ca3d46a776 fixed obvious error handlers 2015-03-28 13:53:26 -04:00
Michael Q Larson ef27fda537 remove references to meeting from announcements and notification modal 2015-03-28 10:14:49 -07:00
Nathan Leniz 65a4c923b2 resolve merge conflicts 2015-03-29 00:51:09 +09:00
Nathan Leniz 6a19dc9bda Zipline/Basejump view with controller logic to serve. Will have to change based upon json 2015-03-29 00:09:50 +09:00
Michael Q Larson 672df775a2 add a zipline and a base jump to the seed file 2015-03-28 07:47:47 -07:00
Nathan Leniz 9e1a4a1348 Streak display in account/show.jade, refactor courseware.json for error handling and linting 2015-03-28 23:42:07 +09:00
Quincy Larson 85a06d5ac2 Merge pull request #256 from terakilobyte/ux-improvements 
User will now get a point for news/stories interactions
 2015-03-28 06:12:18 -07:00
Nathan Leniz ff94d10aa8 resolve merge conflict, favoring upstream 2015-03-28 17:41:07 +09:00
Nathan Leniz 0a07c1e397 Streaks! 2015-03-28 17:38:11 +09:00
Michael Q Larson 4d3337df32 Merge branch 'ziplines' into ux-improvements 
Conflicts:
	views/coursewares/showJS.jade
 2015-03-28 00:24:41 -07:00
Michael Q Larson a1ffc88b58 add trello and blogger apis back in 2015-03-27 23:30:06 -07:00
Michael Q Larson e4eb5052c7 intermediary work on ziplines 2015-03-27 23:15:39 -07:00
jameskopacz d3dee00df5 Stories reply and upvote redirect to signin when user isn't signed in. 
Redirects user back to story after signing in.
 2015-03-28 00:16:48 -05:00
Nathan Leniz 338d87424c More work towards unifying timestamps 2015-03-28 12:22:08 +09:00
Nathan Leniz eb96d2cb02 Resolve merge conflict, using ziplines changes 2015-03-28 12:16:42 +09:00
Nathan Leniz 947b034533 Resolve merge conflict (spacing issue in app.js) 2015-03-28 11:35:14 +09:00