Commit Graph

158 Commits (3a0ab673f3a5ae1e538a984a5f2f5aece173e311)

Author SHA1 Message Date
Berkeley Martinez 0b1e9ba279 fix mismatch property in challenge controller 2015-06-23 16:45:35 -07:00
Berkeley Martinez 31eb81bf2f fix many queries in story 2015-06-23 16:28:16 -07:00
Berkeley Martinez fb04a022ae refactor rxify fieldguides 2015-06-23 16:22:07 -07:00
Berkeley Martinez 1dda8e2f87 refactor Rxify nonprofits router 2015-06-22 19:23:07 -07:00
Berkeley Martinez d624cf3640 factor out (un)dasherize into utils 2015-06-22 17:24:55 -07:00
Berkeley Martinez 10a5c3c928 fix send 200 to non users on post to challenges
fix remove random 'yo' debug
2015-06-22 16:43:31 -07:00
Quincy Larson 6972f64697 fix minor issue with controller 2015-06-21 22:46:37 -07:00
Quincy Larson a428404600 Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging 2015-06-21 21:01:26 -07:00
Berkeley Martinez 7df91e6310 add total time to start to logs during waitFordb 2015-06-21 19:11:42 -07:00
Berkeley Martinez 5e8ed616d5 add wait for db in development before listening for connections 2015-06-21 18:37:29 -07:00
Berkeley Martinez 4804d868c4 wrap server.listen in if module
prevents server from starting durring testing/scripting
2015-06-21 18:10:17 -07:00
Quincy Larson ce0731df5f Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging
Conflicts:
	server/boot/randomAPIs.js
	server/views/coursewares/showBonfire.jade
	server/views/partials/navbar.jade
2015-06-21 15:53:16 -07:00
Berkeley Martinez 629262dd0d fix /chat should go to gitterim 2015-06-20 23:15:10 -07:00
Berkeley Martinez 8f445b58f2 fix chat links go to Gitter Room 2015-06-20 23:11:33 -07:00
Berkeley Martinez 742a49b70d fix mainjs resetEditor 2015-06-20 22:48:59 -07:00
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