Anton Georgiev
|
0d3fceae18
|
Merge branch 'meteor-new-auth' of github.com:perroned/bigbluebutton into testing-version-004
|
2014-10-23 17:37:21 +00:00 |
|
Anton Georgiev
|
60171511e0
|
add user fix condition
|
2014-10-23 17:26:08 +00:00 |
|
perroned
|
142d78ffb4
|
Working on deleting conversations.
|
2014-10-21 11:11:22 -07:00 |
|
perroned
|
b322d747fa
|
Merge remote-tracking branch 'anton/testing-version-04' into meteor-new-auth
|
2014-10-21 05:24:12 -07:00 |
|
perroned
|
12cd22e805
|
Fixing up deleting conversations.
|
2014-10-21 05:22:54 -07:00 |
|
Anton Georgiev
|
baa40e441b
|
temporarily reduce the amount of logging
|
2014-10-16 20:31:15 +00:00 |
|
Anton Georgiev
|
435a7435a5
|
check if the user exists first
|
2014-10-16 20:22:37 +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 |
|
Anton Georgiev
|
939ea5d09f
|
switching slides is back to normal
|
2014-10-10 18:45:12 +00:00 |
|
Anton Georgiev
|
725583335b
|
Merge branch 'meteor-disconnection-handling' into meteor-new-auth
|
2014-10-09 20:08:27 +00:00 |
|
Anton Georgiev
|
c7d3d9b9db
|
minor fix for public chat messages
|
2014-10-09 20:05:29 +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 |
|
perroned
|
17b468bc05
|
Made some code faster in places where we only need the size of the records returned. Take the count directly from the cursor returned instead of turning the cursor into an array first and taking the length.
|
2014-10-09 06:58:48 -07:00 |
|
Anton Georgiev
|
1a91092c82
|
cleaning up
|
2014-10-07 23:22:28 +00:00 |
|
Anton Georgiev
|
4a93388c4d
|
private chat using dbid
|
2014-10-07 23:08:48 +00: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 |
|
Anton Georgiev
|
3905e45de7
|
moving the meteor files into an app folder so that grunt can reside in the root without breaking meteor
|
2014-10-02 16:16:34 +00:00 |
|