Commit Graph

19 Commits

Author SHA1 Message Date
Anton Georgiev
32debc5544 publish to the client only after the particular user was added to the collection. still need to propagate the new _id 2014-10-29 23:12:04 +00:00
Anton Georgiev
b1f444f0c3 need to return the Users cursor only after the user was added to the collection 2014-10-29 21:58:57 +00:00
Anton Georgiev
e827efbbbc add user_is_online field in Users, pass userid when subscribing for Users, only subscribe after the user has joined (must verify) 2014-10-29 20:40:39 +00:00
Anton Georgiev
60171511e0 add user fix condition 2014-10-23 17:26:08 +00:00
perroned
ce41c6798d Merge remote-tracking branch 'anton/meteor-new-auth' into meteor-new-auth
Conflicts:
	labs/meteor-client/app/client/views/whiteboard/slide.coffee
	labs/meteor-client/app/server/collection_methods/users.coffee
2014-10-16 06:15:13 -07:00
Anton Georgiev
b1f361a1ed cleaning up 2014-10-14 22:40:39 +00:00
Anton Georgiev
531b141e7c mute/unmute is working now 2014-10-14 21:20:27 +00:00
Anton Georgiev
97bc187bfc fixed a bug where joining audio on the html5 side would add a user + a few minor changes for isTalking 2014-10-14 20:25:45 +00:00
perroned
c5bc0bface Removing more presenter functionality from viewer branch. 2014-10-14 09:15:01 -07:00
Anton Georgiev
d65bfa8f55 recovered some functionality for audio (resulting in icons displaying in the html userlist). still have work to do 2014-10-10 21:35:51 +00:00
perroned
dbd3478605 Cleaned up a bit. 2014-10-09 10:38:06 -07:00
perroned
9247921b1c Fixed muting and unmuting of users. 2014-10-09 10:27:44 -07:00
perroned
7d1afee614 Fixed joining and leaving audio. Muting remaining. 2014-10-09 09:48:27 -07:00
Anton Georgiev
7ce7b96acf remove user after bbb-app's acknowledgement 2014-10-07 20:53:25 +00:00
Anton Georgiev
9261898476 fixed logging out 2014-10-07 20:34:03 +00:00
Anton Georgiev
7dccc09608 handle user_left_message 2014-10-07 20:08:36 +00:00
Anton Georgiev
846a59d4c8 Merge branch 'meteor-new-auth' of github.com:perroned/bigbluebutton into meteor-new-auth 2014-10-07 19:52:51 +00:00
Anton Georgiev
866bd4e539 minor things 2014-10-07 19:52:30 +00:00
Anton Georgiev
319a1247a1 Merge branch 'meteor-new-auth' of github.com:perroned/bigbluebutton into meteor-new-auth
Conflicts:
	labs/meteor-client/app/client/globals.coffee
	labs/meteor-client/app/client/views/chat/chat_bar.coffee
	labs/meteor-client/app/collections/chat.coffee
	labs/meteor-client/app/collections/meetings.coffee
	labs/meteor-client/app/collections/presentations.coffee
	labs/meteor-client/app/collections/shapes.coffee
	labs/meteor-client/app/collections/slides.coffee
	labs/meteor-client/app/collections/users.coffee
2014-10-07 17:45:47 +00:00