Richard Alam
|
72a1745c65
|
Merge branch 'v2.0.x-release' of github.com:bigbluebutton/bigbluebutton into synch-with-v2.0
|
2017-10-31 14:58:36 -07:00 |
|
Richard Alam
|
c7ba367a39
|
Merge pull request #4617 from ritzalam/implement-multi-chat
- open guest window when new guest joins
|
2017-10-31 17:42:46 -04:00 |
|
Richard Alam
|
9ef812707c
|
- open guest window when new guest joins
|
2017-10-31 14:31:12 -07:00 |
|
Richard Alam
|
e665f2ac6e
|
Merge pull request #4616 from ritzalam/implement-multi-chat
- setup polling of guest while waiting for approval from moderator
|
2017-10-31 15:55:21 -04:00 |
|
Richard Alam
|
3056622283
|
- setup polling of guest while waiting for approval from moderator
|
2017-10-31 12:50:54 -07:00 |
|
Chad Pilkey
|
383893c517
|
Merge pull request #4611 from capilkey/implement-rights-management
Add some of the rights management checks
|
2017-10-31 13:46:26 -04:00 |
|
Chad Pilkey
|
db44e24b9d
|
Merge pull request #4609 from capilkey/load-swf-cdn
Allow loading SWFs from a CDN
|
2017-10-31 13:46:07 -04:00 |
|
Anton Georgiev
|
0b7424d147
|
Merge pull request #4615 from antobinary/pods_vol4
Presentation Pods - Handle default presentation pod missing ownerId
|
2017-10-31 15:42:08 -02:00 |
|
Anton Georgiev
|
8853d562ce
|
Merge pull request #4497 from Gcampes/audio-refactor
[HTML5] Refactor Audio
|
2017-10-31 15:39:37 -02:00 |
|
Gabriel Carvalho de Campes
|
2cca0c1724
|
change device selector key generation
|
2017-10-31 15:34:06 -02:00 |
|
Chad Pilkey
|
a51274c7ad
|
add security check for ChangeUserEmoji
|
2017-10-31 13:07:53 -04:00 |
|
Chad Pilkey
|
3b91a87658
|
change two security checks to header userId from body
|
2017-10-31 13:06:00 -04:00 |
|
Chad Pilkey
|
7e47a08f29
|
allow users to mute themselves again
|
2017-10-31 13:05:07 -04:00 |
|
Gabriel Carvalho de Campes
|
fde5d56d87
|
change ask permissions timing, small code fixes
|
2017-10-31 08:53:06 -02:00 |
|
Chad Pilkey
|
ebcf7dc4cc
|
added some of the rights management checks
|
2017-10-30 23:21:02 -04:00 |
|
Richard Alam
|
376b42d58f
|
Merge pull request #4610 from ritzalam/sign-new-jars
Signing new jars
|
2017-10-30 23:14:27 -04:00 |
|
Richard Alam
|
116d8793cf
|
- new signed jars expiring on 2019-5-22
|
2017-10-30 20:11:46 -07:00 |
|
Chad Pilkey
|
052eed88d0
|
allow loading SWFs from a CDN
|
2017-10-30 17:28:32 -04:00 |
|
Richard Alam
|
6eb7e4e83e
|
Merge pull request #4608 from ritzalam/implement-multi-chat
create guest lobby html page
|
2017-10-30 17:28:19 -04:00 |
|
Richard Alam
|
0036b5734d
|
- create guest lobby html page
|
2017-10-30 14:21:09 -07:00 |
|
Richard Alam
|
332670c0b1
|
Merge pull request #4607 from ritzalam/implement-multi-chat
Setup presentation window for pre-uploaded presentation
|
2017-10-30 16:14:21 -04:00 |
|
Anton Georgiev
|
8a87b9d6d2
|
Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into pods_vol4
|
2017-10-30 16:06:47 -04:00 |
|
Richard Alam
|
9f28f240a5
|
- hardcode default presentation window for pre-uploaded presentations and for creation of breakout rooms
|
2017-10-30 13:05:06 -07:00 |
|
Anton Georgiev
|
fcdb479581
|
Handle default presentation pod missing ownerId
request new pod from client side, and when handling it, just populate the ownerId of the existing pod
|
2017-10-30 16:04:43 -04:00 |
|
Richard Alam
|
38ade4d7ec
|
Merge pull request #4605 from ritzalam/implement-multi-chat
Rights management and layout id
|
2017-10-30 15:36:19 -04:00 |
|
Richard Alam
|
243e4c1536
|
- update bbb-apps-common version
|
2017-10-30 12:34:23 -07:00 |
|
Richard Alam
|
0ffd9b4bad
|
- override meetingId and userId for messages from client making sure that clients do not spoof
messages from other users or meetings.
|
2017-10-30 12:11:40 -07:00 |
|
Richard Alam
|
bb63fa78a9
|
Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into implement-multi-chat
|
2017-10-30 12:11:24 -07:00 |
|
Richard Alam
|
e313647655
|
- fix presentation window name for sample multi pod layout
|
2017-10-30 12:08:56 -07:00 |
|
Richard Alam
|
83ae14a44a
|
Merge pull request #4603 from ritzalam/implement-multi-chat
Implement multi chat
|
2017-10-30 14:46:58 -04:00 |
|
Richard Alam
|
ed88dba7e5
|
- record start/stop webcam events into redis
|
2017-10-30 11:45:52 -07:00 |
|
Richard Alam
|
974c1d7780
|
- sample default layou for chat
|
2017-10-30 10:00:31 -07:00 |
|
Richard Alam
|
d0fb1b3191
|
Merge pull request #4602 from ritzalam/implement-multi-chat
- check if pod has been initialized before accessing the presentation…
|
2017-10-30 10:56:55 -04:00 |
|
Richard Alam
|
19a692e6bf
|
- check if pod has been initialized before accesing the presentation page to prevent an exception.
|
2017-10-30 07:55:37 -07:00 |
|
Richard Alam
|
14b1f6b994
|
Merge pull request #4600 from ritzalam/implement-multi-chat
Record start/stop webcam events
|
2017-10-29 19:14:16 -04:00 |
|
Richard Alam
|
1b045a04d2
|
- fix video recording of events
|
2017-10-29 16:12:46 -07:00 |
|
Richard Alam
|
528c401110
|
Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into implement-multi-chat
|
2017-10-29 14:30:18 -07:00 |
|
Richard Alam
|
6c1ce36cd9
|
Merge pull request #4597 from capilkey/close-chat-pods
[2.1] Close all ChatWindows when module is stopped
|
2017-10-29 16:11:24 -04:00 |
|
Richard Alam
|
4c99626c84
|
Merge pull request #4596 from capilkey/add-presentwin-to-layout
Add proper window identification to PresentationWindows
|
2017-10-29 16:11:11 -04:00 |
|
Richard Alam
|
b128ba3fea
|
Merge pull request #4593 from antobinary/pods_vol4
Improvements to Presentation Pods
|
2017-10-29 16:11:00 -04:00 |
|
Chad Pilkey
|
596d8d1e01
|
close all ChatWindows when module is stopped
|
2017-10-29 15:57:12 -04:00 |
|
Chad Pilkey
|
f471bb7380
|
add proper window identification to PresentationWindows
|
2017-10-29 15:53:54 -04:00 |
|
Anton Georgiev
|
ebdaedd3ae
|
work on remove presentation from pod. WIP
|
2017-10-29 13:12:27 -04:00 |
|
Richard Alam
|
a1a0c4526c
|
Merge pull request #4594 from riadvice/2x-client-theme
Fix toolbar background color option
|
2017-10-29 12:21:05 -04:00 |
|
Richard Alam
|
976b8cb687
|
Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into implement-multi-chat
|
2017-10-29 09:13:07 -07:00 |
|
Anton Georgiev
|
d888af2583
|
cleanup; moved assignments after constructor
|
2017-10-29 11:53:16 -04:00 |
|
Ghazi Triki
|
ac7ae1d382
|
Fix toolbar background color option.
|
2017-10-29 16:43:26 +01:00 |
|
Anton Georgiev
|
2b25a6ff24
|
pass podId to showPresentation
|
2017-10-29 11:41:34 -04:00 |
|
Fred Dixon
|
f72fe51c1c
|
Update bigbluebutton.properties
Reverted serverURL to previous value
|
2017-10-29 11:15:34 -04:00 |
|
Fred Dixon
|
ec87a575f7
|
Update bigbluebutton.properties
Revert serverURL to previous value
|
2017-10-29 11:12:25 -04:00 |
|