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

2679 Commits (07becee1c44e710a96108842069267cd32388243)

Author SHA1 Message Date
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
Nathan Leniz efd7707ac8 Move to Mongoose 4.0, begin implementation of streak 2015-03-28 11:34:12 +09:00
Michael Q Larson f7f7fb39b9 start refactoring basejumps and ziplines to just be normal challenges, make all timestamps miliseconds 2015-03-27 14:36:17 -07: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
jameskopacz c17ff59aef Handle callback errors for user, bonfire, challenges, 
courseware, and resources controllers
 2015-03-26 23:41:06 -05:00
Ashley Drake 85c996ad2e Added bonfire links for level 3. 2015-03-26 10:45:33 -04:00
Ashley Drake c053069f23 Added bonfire links for level 2. 2015-03-26 10:34:59 -04:00
Ashley Drake 4cad7c1aee fixed comma error for merge. 2015-03-26 09:53:22 -04: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
Michael Q Larson 7d4c30c502 start adding progress bar to nonprofit onboarding 2015-03-25 14:18:27 -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
Nathan Leniz e9c6498cdf Error handling 2015-03-26 02:28:04 +09:00
Berkeley Martinez 8a357dd48a Merge pull request #265 from FreeCodeCamp/errorHandlerUpgrade 
Add production error handler
 2015-03-25 06:56:04 -07: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 6fe7392f8f Merge pull request #267 from storbeck/master 
fixed typo for issue #266
 2015-03-24 13:35:38 -07:00
Geoff Storbeck 482cc3fa7b fixed typo for issue #266 2015-03-24 15:58:17 -04:00
Berkeley Martinez 2b0cc91754 Add production error handler 2015-03-24 08:03:59 -07:00
Nathan 6bcec35ae9 Merge pull request #264 from BlueOceanView/master 
Add chai-jquery to package.json
 2015-03-24 19:43:24 +09:00
Julie Myers a6ce700831 Add chai-jquery to package.json 2015-03-24 04:26:39 -06:00
Nathan Leniz 83d23ed2a4 Remove sending 500 response to user manually and rely on middleware instead 2015-03-24 18:28:02 +09:00
Nathan Leniz d0a00428d5 Refactor story.js to use sendStatus instead of status, ensure returning on next(err) 2015-03-24 18:26:02 +09:00
A. Drake b3174eeadf If no links are present, the template does not show the helpful links header. 2015-03-24 01:24:06 -04:00
A. Drake c4624b7f20 links added, basic functionality working across pages. 2015-03-24 01:17:21 -04:00
A. Drake 4dae91ff41 formatting done. 2015-03-23 23:57:44 -04:00
A. Drake dbc57dd0cb links iterated through on the page. TODO formatting and adding more data. 2015-03-23 23:55:24 -04:00
A. Drake 0bf68fea5f Links from database are being passed to the view. TODO create links 2015-03-23 23:20:19 -04:00
Berkeley Martinez 5bfd8a8d54 Handle user save err and respond to end route handler 
closes #260
 2015-03-23 17:17:39 -07:00
Michael Q Larson 1facf532f3 start building the nonprofit project flow 2015-03-23 10:42:59 -07:00
Michael Q Larson ac8487a4fc update basejump, zipline and nonprofit models 2015-03-23 08:33:59 -07:00
Michael Q Larson 6c929b8375 Revert "start adding error handling to passport" 
This reverts commit 89ee552a12.
 2015-03-22 22:23:46 -07:00
Michael Q Larson 816f22260b Merge branch 'master' of https://github.com/FreeCodeCamp/freecodecamp 2015-03-22 22:23:01 -07:00
Michael Q Larson 89ee552a12 start adding error handling to passport 2015-03-22 22:22:52 -07:00
Berkeley Martinez d8bf99708d Add uncaught exception handler 
closes #258
 2015-03-22 22:18:01 -07:00