Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2026-04-03 02:59:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin' into thread_options

Browse Source 
Conflicts:
	public/src/templates.js
This commit is contained in:
Julian Lam
2013-05-07 12:56:21 -04:00
parent 250c70bdfc ace64cec7b
commit 7bbc630dfb
14 changed files with 163 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/websockets.js
View File

@@ -123,12 +123,6 @@ var SocketIO = require('socket.io').listen(global.server,{log:false}),
});
socket.on('api:user.getNameByUid', function(data) {
modules.user.get_username_by_uid(data.uid, function(data){
socket.emit('api:user.getNameByUid', data);
});
});
socket.on('user.exists', function(data) {
modules.user.exists(socket, data.username);
});