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

405 Commits (23a3e235a740fcf099cd90a9e8d004b486f5a80e)

Author SHA1 Message Date
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 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
Nathan Leniz 5e095e8832 Merge remote-tracking branch 'upstream/master' into ux-improvements 2015-03-21 13:42:08 +09:00
Nathan Leniz d48da59aa7 resolve merge conflicts 2015-03-21 12:03:16 +09:00
Michael Q Larson 56d7301d25 refactor announcement modal and add nodeschool-challenges 2015-03-19 22:34:36 -07:00
Michael Q Larson 94e8550408 reverse change that was locking users out 2015-03-19 15:28:20 -07:00
Berkeley Martinez df7c21d6c8 newrelic should not run in development mode. 
removed unused packages from app.js
 2015-03-17 21:57:31 -07:00
jameskopacz 770d177873 fullUser fixes 
Set to null if user isn't logged in.

```delete fullUser.password;``` wasn't deleting the password so setting it to null instead.
 2015-03-17 21:11:14 -05:00
Michael Q Larson a36f978856 Merge branch 'master' of https://github.com/FreeCodeCamp/freecodecamp 2015-03-17 17:58:01 -07:00
Michael Q Larson f1dcb4c373 start fixing the password in scope potential corner case security issue 2015-03-17 17:22:58 -07:00
Michael Q Larson 6d8d123d85 unblock the cdn paths that firefox over-vigilantly blocked 2015-03-17 16:18:41 -07:00
jameskopacz 71456b7544 Gitter chat fix 
Added https://*.gitter.im to 'frameSrc' CSP
 2015-03-10 17:42:15 -05:00
Quincy Larson c0702b9d04 Merge pull request #180 from terakilobyte/master 
MOre news updates
 2015-03-09 16:39:04 -07:00
Michael Q Larson 792d72c6b4 alias /news to /stories 2015-03-09 08:54:45 -07:00
Nathan Leniz e661551a52 Refactor route to be more rest-ful 2015-03-09 18:41:07 +09:00
Michael Q Larson 3bd979ad08 Merge branch 'news' of https://github.com/FreeCodeCamp/freecodecamp 2015-03-08 12:16:35 -07:00
Michael Q Larson aacb0070b3 add the nonprofit projects guide view and change all our nonbreaking spaces to smaller, more natural looking spaces 2015-03-08 01:36:09 -08:00
Michael Q Larson 7bb18d41a8 Revert "Add cloud front and remove together.js" 
This reverts commit e029a00440.
 2015-03-07 14:53:28 -08:00
Michael Q Larson e029a00440 Add cloud front and remove together.js 2015-03-07 12:48:25 -08:00
Michael Q Larson 1180a3132c add express caching middleware 2015-03-07 02:00:21 -08:00
Nathan Leniz a3769f6507 Story submission now with a description, refactor show to display description above comment box 2015-03-07 18:26:49 +09:00
Nathan Leniz 9bea52d42f Refactor post flow, get url info back from server, redirect to final submission form 2015-03-07 17:42:22 +09:00
Nathan Leniz 39d66ea0da Merge branch 'master' into news 2015-03-07 15:23:56 +09:00