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

843 Commits (4434deb1084618c5f2df2eff80292045071758b5)

Author SHA1 Message Date
Berkeley Martinez 0623ace259 fix sitemap query's 
make rx mapping async
 2015-06-20 21:21:36 -07:00
Berkeley Martinez f17c442018 fix should be story not store 2015-06-20 20:54:39 -07:00
Berkeley Martinez 9fb3c0bff7 fix use secrets.db instead of process.env.MONGOHQ in datasource.local.js 
this should eliminate timeout issue.
I'd bet my bottom dollar.
 2015-06-20 20:43:36 -07:00
Berkeley Martinez 049233c0a1 fix add server/utils/rx to commit 2015-06-20 19:55:22 -07:00
Berkeley Martinez 03ea412b4a major challenges refactor 
commented out resetEditor in main
remove heatmap timout
 2015-06-20 19:55:07 -07:00
Berkeley Martinez 4d2b0844ae fix use regex to find challenges 2015-06-20 19:54:08 -07:00
Quincy Larson a0f4f91ec1 remove slack completely and update help and pair actions 2015-06-20 18:40:43 -07:00
Quincy Larson 5212173c61 Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging 2015-06-20 18:12:24 -07:00
Berkeley Martinez 43ae70465b refactor returnIndividualBonfires 2015-06-20 11:43:12 -07:00
Berkeley Martinez 50a0ad3595 fix use gt not $gt 
closes #1022
 2015-06-20 00:36:28 -07:00
Quincy Larson 883a561d73 finishing touches on calculator 2015-06-19 21:24:04 -07:00
Quincy Larson ccc29b7fcb improve upon @lemonyandrew pull request 2015-06-19 17:26:04 -07:00
Quincy Larson 6078b54393 Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging 2015-06-19 16:18:56 -07:00
Quincy Larson d5ea05e448 Merge branch 'Lemony-Andrew-master' into staging 
Conflicts:
	server/views/coursewares/showBonfire.jade
 2015-06-19 16:17:59 -07:00
Berkeley Martinez 12b055353e remove challangeMap 
move to challenges router
 2015-06-19 14:49:10 -07:00
Berkeley Martinez 938568454e move getMDNLinks func to utils 2015-06-19 14:32:17 -07:00
Berkeley Martinez f84ac9ad12 remove forceDomain 2015-06-18 19:56:21 -07:00
Berkeley Martinez 28f346e830 fix should be connectionTimeout not timeout 2015-06-18 19:08:39 -07:00
Berkeley Martinez 81b77ff8ad increase database timeout 2015-06-18 17:52:23 -07:00
Berkeley Martinez 2bf8810d79 add pmx errorhandler in beta spot 2015-06-18 16:19:59 -07:00
terakilobyte 0173804e21 updates helmet policies, makes new startup script 2015-06-18 17:08:21 -04:00
Berkeley Martinez 9c14e5846d add www.freecodecamp.org to trusted list 2015-06-18 13:12:35 -07:00
Berkeley Martinez 81ae7daff1 fix try using oath instead of oauth2 for google 2015-06-18 12:28:16 -07:00
Quincy Larson 0ef399ad92 Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging 
Conflicts:
	server/passport-providers.js
 2015-06-17 22:06:40 -07:00
Quincy Larson 1a3e227920 updated linkedin permissions 2015-06-17 22:05:37 -07:00
Berkeley Martinez c56c8fb310 fix linkedin/google should be oath2 
fix should be authOptions not oAuthOptions
fix should be LINKEDIN_STATE not LINKED_STATE
 2015-06-17 21:43:22 -07:00
Berkeley Martinez caacee7959 fix should be env not ENV 2015-06-17 21:13:47 -07:00
Berkeley Martinez bfddc0330f add state attribute to linked oauth 
note: a new variable will need to be added to .env 'LINKEDIN_STATE'
which is a random string
 2015-06-17 20:59:35 -07:00
Quincy Larson bb6f153858 make server always show stack traces upon error 2015-06-17 20:26:59 -07:00
terakilobyte fbb7d0b065 Remove ssl on node servers 2015-06-17 15:40:44 -04:00
Quincy Larson 0621b8c62b Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging 2015-06-16 13:46:37 -07:00
Quincy Larson 2e1babb12d finalize calculator for release 2015-06-16 13:46:24 -07:00
Quincy Larson 40b5b05ea4 factor JavaScript and JSON into separate files 2015-06-16 13:03:13 -07:00
terakilobyte 810bf9a3f7 force https for blob url in _frame.js. Updates helmet to allow more inspectlet domains. 2015-06-16 15:59:22 -04:00
terakilobyte 1607fe0ba5 Updates server listen in production 2015-06-16 15:51:04 -04:00
terakilobyte 7915e8a77e 99 problems, and production only errors are 98 of them 2015-06-16 15:41:59 -04:00
terakilobyte 9e8796a0c4 More tweaking 2015-06-16 15:38:22 -04:00
Quincy Larson 2cb0a3d717 futher improve calculator ux 2015-06-16 12:32:12 -07:00
terakilobyte a662187d93 More ssl setup 2015-06-16 15:24:55 -04:00
terakilobyte e782e0310f Remove toString() on certificate reads as per http://stackoverflow.com/questions/20893025/cant-start-nodejs-https-server-v0-10-23 2015-06-16 15:04:20 -04:00
terakilobyte 645c0aac0e Server test 2015-06-16 14:51:40 -04:00
terakilobyte b25dd9416b More https configuration 2015-06-16 14:43:49 -04:00
terakilobyte 7e420217eb More https configuration 2015-06-16 14:43:12 -04:00
terakilobyte 0a8356e50f Configure production to run in https 2015-06-16 14:30:16 -04:00
terakilobyte b0b236821e More inspectlet configuring 2015-06-16 12:30:49 -04:00
terakilobyte 308e539e1e More protocol experimentation 2015-06-16 12:23:49 -04:00
terakilobyte 3546cf4765 Fetch google fonts over https 2015-06-16 12:09:45 -04:00
terakilobyte 97668120ad More work to load google fonts 2015-06-16 12:04:26 -04:00
terakilobyte efb4bd1781 Even more testing 2015-06-16 11:54:58 -04:00
terakilobyte 121dabdf73 More whitelist testing 2015-06-16 11:51:07 -04:00
terakilobyte 53f5f36768 whitelist beta site https://freecodecamp.org 2015-06-16 11:44:25 -04:00
terakilobyte 5b742121d7 Add pmx error handler for loggign to keymetrics 2015-06-16 09:42:55 -04:00
terakilobyte 7f311a1e03 Explicitly add google font servers to whitelist 2015-06-16 09:33:34 -04:00
terakilobyte a621ff3190 Add https to helmet whitelist 2015-06-16 09:18:59 -04:00
Quincy Larson 9bc4f0c25c Merge branch 'master' into staging 2015-06-16 06:08:25 -07:00
Quincy Larson ef9d6fc55b Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging 2015-06-16 06:08:18 -07:00
Quincy Larson 23eb74c762 improve ux on calculator clicking 2015-06-15 21:44:19 -07:00
terakilobyte cb76aa1ea0 whitelist nginx server in helmet 2015-06-16 00:14:33 -04:00
Quincy Larson c9ba210afa factor bootcamp JSON into seperate file 2015-06-15 20:49:55 -07:00
terakilobyte 1cd85eeb8f Debug statement for fieldguide ID 2015-06-15 23:35:29 -04:00
Quincy Larson 6b909d8f59 start refactoring calculator logic 2015-06-15 18:00:13 -07:00
terakilobyte 4fa1f25cc2 Fix challenge map display for loopback updated models. Update loopback migration script to auto complete and catch all records. 2015-06-15 20:53:43 -04:00
terakilobyte 42aae365f6 Update current challenge logic 2015-06-15 18:57:45 -04:00
terakilobyte 4092dcecf7 Merge branch 'staging' of http://github.com/FreeCodeCamp/freecodecamp into staging 2015-06-15 18:50:31 -04:00
terakilobyte c136895064 Rewrite challenge controller to use dashed names, update index.js to include new utility function getDashedNames 2015-06-15 18:50:18 -04:00
Berkeley Martinez b0dc4ffa12 get account should redirect to '/' when no user is logged in 2015-06-15 15:47:56 -07:00
Berkeley Martinez c4d229e62d remove email verification step. 
users are marked for future uses
 2015-06-15 15:43:12 -07:00
terakilobyte a334b9870c Set up production variables 2015-06-15 18:24:26 -04:00
terakilobyte a82a8fb044 move to dashedName lookup 2015-06-15 14:50:54 -04:00
terakilobyte 40ce1d8162 Refactor to use dashedName for challenges in lookup. 2015-06-15 08:01:43 -04:00
Quincy Larson 6c33d4bf78 calculator works 2015-06-14 21:17:48 -07:00
Quincy Larson 0ef39904a9 major improvements to calculator logic 2015-06-14 17:55:23 -07:00
Quincy Larson 2a98e5c851 fix calculator view file location 2015-06-14 01:39:22 -07:00
Quincy Larson 5e3edf5cda Merge branch 'master' into staging 2015-06-14 01:10:51 -07:00
Quincy Larson 43f347bae0 Merge branch 'calculator' into staging 
Conflicts:
	app.js
	controllers/resources.js
	seed/field-guides.json
 2015-06-14 01:10:48 -07:00
Quincy Larson b6fc2551d9 Merge branch 'interview' into staging 
Conflicts:
	app.js
	controllers/challenge.js
	seed/future-jquery-ajax-json.json
 2015-06-14 01:02:39 -07:00
terakilobyte af75452db5 Remove forcedomain so we can test beta website 2015-06-12 21:09:12 -04:00
terakilobyte 5b2b7e23ae Take id property of username, remove wasteful save on profile lookup. 2015-06-12 19:16:10 -04:00
Berkeley Martinez 63937c3a56 fix make usernames required 2015-06-12 13:14:07 -07:00
Quincy Larson 173d46ae01 Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging 
Conflicts:
	seed/field-guides.json
 2015-06-12 12:40:26 -07:00
Berkeley Martinez 0f5f92b937 fix user deletion of credentials 
should use a where clause with destroyAll
 2015-06-12 11:58:31 -07:00
Berkeley Martinez c2f408fb56 add blacklist to usernames 2015-06-11 17:04:48 -07:00
Berkeley Martinez 5be6ce7193 add delete user idenity and credentials after profile deletion 2015-06-11 16:57:06 -07:00
terakilobyte 34c3fef7d4 Move api hooks to user.js 2015-06-11 19:11:07 -04:00
terakilobyte f7bb14803e Update field guides to display properly. Correct models on user object. 2015-06-11 16:19:44 -04:00
terakilobyte 0aa83f1bb9 Remove mongoose style lookup from fieldguide.js. Update user model. 2015-06-11 15:33:38 -04:00
terakilobyte 0b1c23207d Merge branch 'staging' of http://github.com/FreeCodeCamp/freecodecamp into staging 2015-06-11 15:18:45 -04:00
terakilobyte 3115ba6404 update tests 2015-06-11 15:18:37 -04:00
Quincy Larson b3fb1d492d Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging 2015-06-11 11:39:20 -07:00
Berkeley Martinez fe5cbec117 add pull in user image on signup when available 2015-06-11 11:38:08 -07:00
Quincy Larson 5fb89cb091 Merge branch 'master' of github.com:FreeCodeCamp/freecodecamp into staging 2015-06-11 11:16:31 -07:00
Berkeley Martinez af902799b1 add acl controls to models 2015-06-10 23:59:42 -07:00
Berkeley Martinez 84f2168769 fix remove stray profile reference 
fix findOne queries should have where filter
 2015-06-10 17:12:21 -07:00
Berkeley Martinez 9f5ace03dc fix acls access for user exists remote method 2015-06-10 17:11:32 -07:00
Berkeley Martinez bdb7d40548 fix usernames should be saved lowercased 2015-06-10 15:22:57 -07:00
Berkeley Martinez 996c3e7816 fix make email optional 2015-06-10 15:12:48 -07:00
Berkeley Martinez cd38a2d88e fix user local signin 2015-06-09 17:22:14 -07:00
Berkeley Martinez a8494b29da add user signup through loopback 2015-06-09 16:45:14 -07:00
Berkeley Martinez 2e5f250ba8 remove hpp 
loopback is protected against hpp attack by default
 2015-06-09 16:45:14 -07:00
Berkeley Martinez b34646dd6b remove passport file 
remove unneeded comments
 2015-06-09 16:45:14 -07:00
Berkeley Martinez 68da1f1c68 optionally add email field if available 2015-06-09 16:43:32 -07:00
terakilobyte 5ec532f3d9 Remove debug statements from story.js and clean up one linting error. Rename href in navbar from news to stories to unify API names. 2015-06-09 16:57:23 -04:00
Quincy Larson 61486c2d7c Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging 
Conflicts:
	app.js
	controllers/fieldGuide.js
	controllers/story.js
	seed/challenges/basic-html5-and-css.json
	seed/challenges/bootstrap.json
	seed/field-guides.json
	server/views/partials/navbar.jade
	views/resources/jobs-form.jade
	views/resources/nonprofits-form.jade
	views/resources/pmi-acp-agile-project-managers-form.jade
 2015-06-09 13:48:29 -07:00
Berkeley Martinez 78dac937f7 remove email verification. 2015-06-07 22:07:38 -07:00
terakilobyte 1a27c133c5 Update user account fetching for profile view 2015-06-05 15:57:27 -04:00
terakilobyte 6b6de50ad4 Update story query for loopback. 2015-06-05 15:00:54 -04:00
terakilobyte 21b9405f06 Update links for new api model in views for stories. 2015-06-05 14:58:42 -04:00
terakilobyte 4f9061bffb Sort out story model. 2015-06-05 14:53:12 -04:00
terakilobyte d782ac9520 Update find method in fieldGuide.js 2015-06-05 13:25:28 -04:00
terakilobyte a0b34c8e90 Redirect to home path on unsuccessful query rather than induce infinite redirect loop. 2015-06-05 09:41:53 -04:00
terakilobyte 8b7bfb23ab Update story api to use stories instead of news 2015-06-05 09:07:46 -04:00
Quincy Larson 875d09c29b add hpp to address express vulnerability 2015-06-04 19:30:27 -07:00
Berkeley Martinez 208f4ea18f fix typo in require 2015-06-04 14:32:59 -07:00
Berkeley Martinez 40e8b61fbf Set up datasources properly for production 2015-06-04 14:20:37 -07:00
Quincy Larson 3654bb7e6f change _id to id everywhere that seems relevant to loopback 2015-06-04 13:20:42 -07:00
Quincy Larson b2aafd89e7 flatten user object references throughout controllers and views 2015-06-04 12:54:41 -07:00
Berkeley Martinez 72fe9c2463 Add cookie secrets to env 2015-06-04 12:42:13 -07:00
Berkeley Martinez 7a2bcc06f7 add passport stuff back 
Because Berkeley really needs to wait for his coffee to kick in before
commiting anything...
 2015-06-04 12:03:53 -07:00
Berkeley Martinez 66eff31294 Adding passport config stuff 2015-06-04 10:52:12 -07:00
Berkeley Martinez 075d851374 refactor resources to utils 2015-06-03 17:14:45 -07:00
Berkeley Martinez e349797a4b rename boot utility 
remove subrouter use in server.js
 2015-06-03 16:56:48 -07:00
Berkeley Martinez 75f9b06e90 fix incorrect model name 2015-06-03 16:48:17 -07:00
Berkeley Martinez 415d46b591 fix add models to model-config 2015-06-03 16:35:22 -07:00
Berkeley Martinez bfd33d8b40 fix use app.use(router) to add sub router 2015-06-03 16:31:42 -07:00
Berkeley Martinez 8165105b29 refactor all boot to export func and use loopback 2015-06-03 16:19:23 -07:00
Berkeley Martinez 65cde59f0d use app instead of server in boot directories 2015-06-03 12:26:11 -07:00
Berkeley Martinez 79cbe13c62 fix seed paths 2015-06-03 12:23:37 -07:00
Berkeley Martinez e7d01424e9 refactor challenge and challengeMap 2015-06-02 19:02:54 -07:00
Berkeley Martinez 956a2b915e initial move to loopback server 2015-06-02 17:27:02 -07:00
Berkeley Martinez 279f953628 Move models to common/models 
closes #795
 2015-06-02 15:05:26 -07:00
Quincy Larson f6596d2654 Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging 
Conflicts:
	app.js
	controllers/challengeMap.js
	controllers/resources.js
	server/views/partials/field-guide.jade
	server/views/partials/github.jade
	server/views/partials/nonprofit-application-progress-bar.jade
	server/views/partials/nonprofits.jade
 2015-06-02 13:44:53 -07:00
Berkeley Martinez 24bca19616 fix order of routes 2015-06-01 17:09:15 -07:00
Berkeley Martinez 7643f1cabe fix FCC running using router syntax 2015-06-01 17:01:54 -07:00
Berkeley Martinez 7bb11e9fbe fix linting errors in server/boot/utilities 2015-06-01 16:48:16 -07:00
Berkeley Martinez d67f7c666d refactor challenge controller to router syntax 2015-06-01 16:45:21 -07:00
Berkeley Martinez 28f0320f18 refactor fieldGuide controller to router 2015-06-01 16:32:54 -07:00
Berkeley Martinez 7c2f171d31 fix all the linting errors in boot 2015-06-01 16:23:53 -07:00
terakilobyte d9c3251f94 Begin shaping codebase for loopback migration. 2015-06-01 18:30:43 -04:00
Sahat Yalkabov 56eb0e4e73 converted all auth functions to use mongoose 2013-11-14 00:15:52 -05:00
Sahat Yalkabov cd1af7e230 moved helper functions to auth.js as well as all passport strategies 2013-11-13 22:11:21 -05:00
Sahat Yalkabov b6e55c1aae Created findOrCreateOauth user function 2013-11-13 19:37:53 -05:00
Sahat Yalkabov 7b86a34a6a Added schema and finduserbyid to the new Users model file 2013-11-13 18:58:03 -05:00
Sahat Yalkabov fc5563c70c added sample app for client-server authentication 2013-11-13 17:16:06 -05:00