Commit Graph

3631 Commits (6078b54393c6a01a28f89a6dc93bfccb651468f8)

Author SHA1 Message Date
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
Quincy Larson 6fed8d1c24 Merge branch 'master' of https://github.com/Lemony-Andrew/freecodecamp into Lemony-Andrew-master 2015-06-19 16:09:42 -07:00
Quincy Larson 93e96643fb Merge pull request #940 from LumenTeun/lumenteun-907
Check fix in 'Bootstrap Grid'.
2015-06-19 16:07:48 -07:00
Quincy Larson 40a1ff835c Merge pull request #939 from LumenTeun/lumenteun-911
Test for almost palindromes in 'Check for Palindromes'
2015-06-19 16:06:56 -07:00
Quincy Larson a339c1b60b Merge pull request #938 from LumenTeun/lumenteun-914
Improves check for catphotoapp.com in 'Link to External Pages with Anchor Elements'
2015-06-19 16:05:23 -07:00
Quincy Larson c2c64b153a Merge pull request #937 from LumenTeun/lumenteun-918
Fixed Zipline jQuery.getJSON() links.
2015-06-19 16:03:17 -07:00
Quincy Larson f200a6f8a3 Merge pull request #936 from LumenTeun/lumenteun-924
More 'Convert HTML Entities' test cases. Fixes #924
2015-06-19 16:00:45 -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 adbbbf3743 fix name and dashed name switched
close #975
2015-06-18 20:02:32 -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
Berkeley Martinez 4560cfed03 deleted old setup file 2015-06-18 16:19:59 -07:00
terakilobyte b24699a43e updates pm2 startup script 2015-06-18 17:33:34 -04: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 a8540bee35 add initial react app 2015-06-17 21:04:28 -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
Quincy Larson b78b3ddcd6 Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging 2015-06-17 20:23:01 -07:00
terakilobyte fbb7d0b065 Remove ssl on node servers 2015-06-17 15:40:44 -04:00
terakilobyte b88f862cd6 Update readme 2015-06-17 13:25:34 -04:00
terakilobyte e62853e379 Merge branch 'staging' of http://github.com/FreeCodeCamp/freecodecamp into staging 2015-06-17 13:23:45 -04:00
terakilobyte 63641a141b Update .gitignore to ignore .remote-sync.json file 2015-06-17 12:43:30 -04:00
Quincy Larson d615e94c29 fix minor typo in html challenge 2015-06-16 18:00:17 -07:00
Andrew Cay 687750809f Reset button inserted beneath Run
Also inserted a button spacer in appropriate place.
2015-06-16 16:56:50 -07:00
Andrew Cay 0ceb5e0685 Inserted reset button with button spacer below Run 2015-06-16 16:52:32 -07:00
Berkeley Martinez a788d2954d add hacked loopback version
this version avoids cheking indexOf on falsey values
2015-06-16 14:53:18 -07: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
terakilobyte 8735f164f8 Remove https from blob code 2015-06-16 16:28:09 -04: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