Merge branch 'master' into account-history-patches

This commit is contained in:
Wyatt Johnson
2018-02-23 12:33:05 -07:00
4 changed files with 10 additions and 8 deletions
+1 -1
View File
@@ -16,7 +16,7 @@ function parseAssetURL() {
// Try to get the url from the canonical tag on the page.
return document.querySelector('link[rel="canonical"]').href;
} catch (e) {
console.warn(
window.console.warn(
'This page does not include a canonical link tag. Talk has inferred this asset_url from the window object. Query params have been stripped, which may cause a single thread to be present across multiple pages.'
);
@@ -2,7 +2,7 @@ module.exports = router => {
const { passport, HandleAuthPopupCallback } = require('services/passport');
/**
* Facebook auth endpoint, this will redirect the user immediatly to facebook
* Facebook auth endpoint, this will redirect the user immediately to Facebook
* for authorization.
*/
router.get(
@@ -15,8 +15,8 @@ module.exports = router => {
);
/**
* Facebook callback endpoint, this will send the user a html page designed to
* send back the user credentials upon sucesfull login.
* Facebook callback endpoint, this will send the user a HTML page designed to
* send back the user credentials upon successful login.
*/
router.get('/api/v1/auth/facebook/callback', (req, res, next) => {
// Perform the facebook login flow and pass the data back through the opener.
@@ -2,7 +2,7 @@ module.exports = router => {
const { passport, HandleAuthPopupCallback } = require('services/passport');
/**
* Google auth endpoint, this will redirect the user immediatly to google
* Google auth endpoint, this will redirect the user immediately to Google
* for authorization.
*/
router.get(
@@ -16,10 +16,10 @@ module.exports = router => {
/**
* Google callback endpoint, this will send the user a html page designed to
* send back the user credentials upon sucesfull login.
* send back the user credentials upon successful login.
*/
router.get('/api/v1/auth/google/callback', (req, res, next) => {
// Perform the google login flow and pass the data back through the opener.
// Perform the Google login flow and pass the data back through the opener.
passport.authenticate(
'google',
{ session: false },
+3 -1
View File
@@ -214,12 +214,14 @@ if (process.env.NODE_ENV === 'production') {
toplevel: false,
typeofs: false,
unused: false,
// Switch off all types of compression except those needed to convince
// react-devtools that we're using a production build
conditionals: true,
dead_code: true,
evaluate: true,
// Remove warnings + discard any console.* functions
warnings: false,
drop_console: true,
},
mangle: true,
},