beenull/tellform
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

fixed node-email-verification error

Browse source
This commit is contained in:
David Baldwynn 2016-06-08 17:01:49 -07:00
parent c03c9ae33d ffc615a262
commit 8e35413d67
3 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
app/controllers/users/users.authentication.server.controller.js
View file

@ -51,7 +51,6 @@ var config_nev = function () {
}, function(err, options){ }, function(err, options){
if(err) throw err; if(err) throw err;
return
}); });
nev.generateTempUserModel(User); nev.generateTempUserModel(User);

4
public/dist/application.js vendored
View file

@ -690,7 +690,11 @@ angular.module('core').service('Menus', [
// Connect to Socket.io server // Connect to Socket.io server
function connect(url) { function connect(url) {
<<<<<<< HEAD
service.socket = io(url, {'transports': ['websocket', 'polling']}); service.socket = io(url, {'transports': ['websocket', 'polling']});
=======
service.socket = io('https://stage.tellform.com', { transports: ['websocket', 'polling'] });
>>>>>>> ffc615a26240cdaebe88ff1064508f7120f0f4d5
} }
// Wrap the Socket.io 'emit' method // Wrap the Socket.io 'emit' method

9
public/dist/application.min.js vendored
View file

File diff suppressed because one or more lines are too long