Commit Graph

487 Commits

Author SHA1 Message Date
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