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

426 Commits (47bb301a9112c305f102caf39c888075e97d2247)

Author SHA1 Message Date
Michael Q Larson d2fae63310 fix a few minor issues post merge 2015-04-16 23:16:55 -07:00
terakilobyte 04d9856d4f Remove vomit route. 2015-04-17 01:48:06 -04:00
terakilobyte b9372b9af6 Resolve merge conflicts using Webstorm's merge integration tool. v2 2015-04-17 00:39:48 -04:00
terakilobyte b49d2fd343 Resolve merge conflicts using Webstorm's merge integration tool. 2015-04-17 00:11:13 -04:00
terakilobyte 9c67d4988f Add new currying challenge to bonfires and allow inspectlet through protective helmet 2015-04-14 23:04:54 -04:00
terakilobyte 18bdefbfac Add in message about twitter authorization being down temporarily to error handler 2015-04-14 16:17:58 -04:00
brndnb a6d5721458 Switch from debug to console.log 2015-04-14 15:42:46 -04:00
brndnb 4fb119ab68 Add debug to app.js to troubleshoot twitter signin in production, unable to repliate locally 2015-04-14 15:36:02 -04:00
Michael Q Larson 9145e959de able to use the api upon button click 2015-04-08 22:42:40 -07:00
Michael Q Larson 7da6f69cd8 start process of moving wiki over to field guide 2015-04-08 17:18:51 -07:00
Michael Q Larson c02fafa6a9 add status, turn hours into integer, create a directory view of all nonprofits 2015-04-08 14:36:05 -07:00
Michael Q Larson bd7c5310b1 improve the footer 2015-04-07 00:11:31 -07:00
Michael Q Larson 840930d967 get bonfire solutions showing up in the view; eliminate a lot of old views in favor of new challenge map 2015-04-05 18:37:58 -07:00
Michael Q Larson 60fee94574 create infrastructure for advancing through wiki 2015-04-05 16:44:07 -07:00
Michael Q Larson fbeff58477 build a functional challenge map and change navbar links 2015-04-03 20:05:53 -07:00
Michael Q Larson 1248cde97f continue work on nonprofit show views 2015-04-01 22:31:08 -07:00
Michael Q Larson fa74a1b454 got show all nonprofits button working and improved nonprofit show view 2015-03-31 17:38:33 -07:00
Michael Q Larson ca404e66e8 close to getting all nonprofits to render 2015-03-30 20:08:29 -07:00
Michael Q Larson acea52dc1b make further improvements to wiki and start new show view for nonprofits 2015-03-30 18:02:50 -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
Michael Q Larson 5bb084120e create a styleguide from @brndbr's sample style guide 2015-03-29 17:28:25 -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
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 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
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
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
Michael Q Larson a1ffc88b58 add trello and blogger apis back in 2015-03-27 23:30:06 -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 947b034533 Resolve merge conflict (spacing issue in app.js) 2015-03-28 11:35:14 +09:00
Nathan Leniz efd7707ac8 Move to Mongoose 4.0, begin implementation of streak 2015-03-28 11:34:12 +09:00
Michael Q Larson 94b6cae3ec apply Nathan's insights into multistep form' 2015-03-27 12:36:21 -07:00
Nathan Leniz 29e29d5687 Merge remote-tracking branch 'upstream/master' into ux-improvements 2015-03-28 02:51:52 +09:00
Michael Q Larson c69d919d46 Merge branch 'master' into ux-improvements 2015-03-27 10:28:31 -07:00
Michael Q Larson e915e74b8d Merge branch 'master' of https://github.com/FreeCodeCamp/freecodecamp 2015-03-27 00:21:00 -07:00
Michael Q Larson 683498e62a remove calls to trello and blogger, camp counselor photos, and update the notice about Saturday's meeting 2015-03-27 00:20:50 -07:00
Michael Q Larson e78609171d continue work on the param-based funnel 2015-03-26 23:33:52 -07:00
Michael Q Larson d64b5c5718 add progress bar to nonprofit project proposal wizard 2015-03-25 15:25:19 -07:00
Michael Q Larson 09b812688e Merge branch 'master' of https://github.com/FreeCodeCamp/freecodecamp into ux-improvements 
Conflicts:
	app.js
 2015-03-25 14:20:34 -07:00
Nathan Leniz 25ae3ec909 resolve merge conflict in app.js while merging in master, get rid of completed-challenge route 2015-03-26 02:32:07 +09:00
Michael Q Larson 6e4067ee00 most views are now in place 2015-03-24 22:12:16 -07:00
Michael Q Larson d4935d44de add the routes, controller actions and views for the nonprofit wizard 2015-03-24 21:46:42 -07:00
Michael Q Larson bcec96e427 half way done with the initial views and controllers 2015-03-24 19:08:26 -07:00
Berkeley Martinez 2b0cc91754 Add production error handler 2015-03-24 08:03:59 -07:00
Berkeley Martinez 5bfd8a8d54 Handle user save err and respond to end route handler 
closes #260
 2015-03-23 17:17:39 -07:00
Berkeley Martinez d8bf99708d Add uncaught exception handler 
closes #258
 2015-03-22 22:18:01 -07:00
Nathan Leniz ac511982a4 User facing challenge mentions now point to coursewares, remove completed view from account/show 2015-03-21 18:42:19 +09:00
Nathan Leniz be91849d20 coursewares properly push timestamps to user object 2015-03-21 14:28:00 +09:00