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
|
61da2885a9
|
fixes for isCurrentUserTalking
|
2014-10-14 22:38:15 +00:00 |
|
Anton Georgiev
|
d1f5bcab2f
|
joining and leaving audio is working fine now
|
2014-10-14 21:59:49 +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
|
b043b194b1
|
Removing presenter functionality from this viewer branch.
|
2014-10-14 08:51:08 -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
|
5beacad9f0
|
Fixed up some methods that weren't updated to use new id method.
|
2014-10-09 10:43:22 -07: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
|
bc3e0f0ab3
|
Now use DBID for webrtc calls, and call server methods with updated params.
|
2014-10-09 09:39:58 -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
|
9a901d56d7
|
version and date already set here: https://github.com/antobinary/bigbluebutton/blob/exploring-grunt/labs/meteor-client/app/client/main.coffee#L81-L82
|
2014-10-07 21:47:13 +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
|
aa270da0d2
|
fix footer version, date
|
2014-10-07 18:05:37 +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 |
|