Commit Graph

2702 Commits (e3822edd9391bd0ad921520cfb8c3027ba2bca52)

Author SHA1 Message Date
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
Berkeley Martinez 940dbea622 Handle err in config/passport 2015-03-22 22:07:58 -07:00
Michael Q Larson f9523beb29 update copy on show all bonfires button 2015-03-22 18:22:07 -07:00
Berkeley Martinez f246ef618c Close web worker after completion
closes #257
2015-03-22 16:57:10 -07:00
Nathan Leniz 999ba14db7 Fix indenting to 2 spaces, remove most lint errors 2015-03-22 20:20:08 +09:00
Nathan Leniz fb5e8dc387 Remove debug statement, closes #156, story decay to 32 hours 2015-03-22 20:11:37 +09:00
Nathan Leniz 31ce7b686a User will now get a point for posting a story as well as receiving an upvote on a posted story 2015-03-22 20:07:08 +09:00
Michael Q Larson 6e0da758e0 finish wiring in buttons and hotkeys 2015-03-22 01:38:04 -07:00
Michael Q Larson 9633a2dbe0 get hotkey working in showVideo 2015-03-22 01:28:40 -07:00
Michael Q Larson d0a40dc202 fix intermittent variable declaration error in camper news view 2015-03-22 01:16:02 -07:00
Michael Q Larson f2f8d93f9f further work on ziplines 2015-03-21 22:49:31 -07:00
Michael Q Larson 91edf73965 start building zipline views and controller 2015-03-21 17:23:13 -07:00
Michael Q Larson 0eb15269be create zipline model 2015-03-21 16:48:48 -07:00
Michael Q Larson 2dbd59b7f1 Merge branch 'ux-improvements' of https://github.com/FreeCodeCamp/freecodecamp into ux-improvements
Conflicts:
	controllers/resources.js
	views/account/show.jade
	views/coursewares/showHTML.jade
	views/coursewares/showJS.jade
	views/partials/bonfires.jade
2015-03-21 16:36:35 -07:00
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 5e97c678a5 Merge branch 'master' of https://github.com/FreeCodeCamp/freecodecamp
Conflicts:
	controllers/story.js
2015-03-21 16:19:51 -07:00
Quincy Larson 03022c68ed Merge pull request #244 from terakilobyte/ux-improvements
Ux improvements
2015-03-21 02:58:54 -07:00
Nathan Leniz fa0462da4c point courseware reference in navbar to challenges 2015-03-21 18:58:14 +09:00
Nathan Leniz cf44287d7a resolve merge conflict in navbar 2015-03-21 18:53:15 +09: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 9cdb2588b4 resolve merge conflict 2015-03-21 17:04:31 +09:00
Michael Q Larson 9c5d9eea23 try shorter decay rate 2015-03-21 00:47:21 -07:00
Nathan ec5b3e4b84 Change from 1 billion seconds to 172 million. 2015-03-21 16:41:29 +09:00
Nathan bc69233226 Merge pull request #226 from FreeCodeCamp/email-validation
fix email validation issue #212
2015-03-21 16:40:03 +09:00
Quincy Larson bd7461d2c7 Merge pull request #243 from terakilobyte/master
Change decay rate of hot stories to 48 hours
2015-03-21 00:39:29 -07:00
Nathan Leniz 752f4125d4 Change decay rate of hot stories to 48 hours 2015-03-21 16:36:20 +09:00
Nathan Leniz 6ad7c22313 Working on codemirror display issue in html coursewares 2015-03-21 16:34:06 +09:00
Nathan Leniz a2e2e6bfa2 Improve profile view on devices, store name in completedCoursewares for display in account/show 2015-03-21 15:44:18 +09:00