Richard Alam
|
cfec9de678
|
Merge branch 'v2.0.x-release' of github.com:bigbluebutton/bigbluebutton into update-with-20
|
2017-10-19 18:20:25 -07:00 |
|
Richard Alam
|
154d3d6081
|
Merge branch 'antobinary-pods_vol4'
|
2017-10-19 18:01:15 -07:00 |
|
Richard Alam
|
11f0bdf0ac
|
Merge branch 'pods_vol4' of https://github.com/antobinary/bigbluebutton into antobinary-pods_vol4
|
2017-10-19 17:46:35 -07:00 |
|
Anton Georgiev
|
04cef71384
|
re-enable next/prev/goto slide
|
2017-10-19 14:47:59 -04:00 |
|
Richard Alam
|
1abba9391d
|
Merge branch 'riadvice-2x-client-theme' into v2.0.x-release
|
2017-10-19 07:17:30 -07:00 |
|
Richard Alam
|
b718d92767
|
Merge branch '2x-client-theme' of https://github.com/riadvice/bigbluebutton into riadvice-2x-client-theme
|
2017-10-19 07:12:46 -07:00 |
|
Ghazi Triki
|
e1b5d6b9f1
|
Improve screen-sharing view layout and video scaling.
|
2017-10-18 18:31:04 +01:00 |
|
Richard Alam
|
40fbc78194
|
Merge pull request #4534 from ritzalam/implement-multi-chat
Implement multi chat and multi-presentation
|
2017-10-18 13:13:53 -04:00 |
|
Richard Alam
|
a548af00f7
|
- format
|
2017-10-18 10:11:56 -07:00 |
|
Richard Alam
|
8070821068
|
Merge branch 'pods_vol4' of https://github.com/antobinary/bigbluebutton into implement-multi-chat
|
2017-10-18 10:09:54 -07:00 |
|
Richard Alam
|
cbd82ffa29
|
- simplify sending of message
|
2017-10-18 10:07:54 -07:00 |
|
Anton Georgiev
|
fc62c4521c
|
Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into pods_vol4
|
2017-10-18 11:47:12 -04:00 |
|
Anton Georgiev
|
56cdecf152
|
add presentation into state
|
2017-10-18 11:46:33 -04:00 |
|
Richard Alam
|
313440abdd
|
- send an eject message to the client so client doesn't attempt to auto-reconnect
|
2017-10-17 15:01:10 -07:00 |
|
Richard Alam
|
a5ddf0b203
|
- setup layered handler traits for rights management
|
2017-10-17 13:57:57 -07:00 |
|
Richard Alam
|
55e371fce2
|
- layer rights management traits
|
2017-10-17 12:37:22 -07:00 |
|
Richard Alam
|
4a48a69c7f
|
- start implementing rights management
|
2017-10-17 11:41:05 -07:00 |
|
Richard Alam
|
5c765072c4
|
- start implementing rights management
|
2017-10-16 14:32:05 -07:00 |
|
Richard Alam
|
fa877e8f73
|
Merge branch 'capilkey-fix-user-avatar-size' into v2.0.x-release
|
2017-10-16 10:36:35 -07:00 |
|
Richard Alam
|
9e193bf631
|
Merge branch 'fix-user-avatar-size' of https://github.com/capilkey/bigbluebutton into capilkey-fix-user-avatar-size
|
2017-10-16 10:30:39 -07:00 |
|
Richard Alam
|
0005f4bdf6
|
Merge pull request #4531 from riadvice/fix-file-download
Update PDF conversion actions order
|
2017-10-16 13:13:46 -04:00 |
|
Ghazi Triki
|
268acc8f9c
|
Update PDF conversin actions order.
|
2017-10-16 17:19:30 +01:00 |
|
Richard Alam
|
0ecd191725
|
Merge pull request #4527 from riadvice/fix-file-download
[Flash 2.1] - Use new presentationModel logic to export PDF files.
|
2017-10-13 17:38:28 -04:00 |
|
Richard Alam
|
bffaabfffd
|
Merge branch 'riadvice-2x-client-theme' into v2.0.x-release
|
2017-10-13 14:37:26 -07:00 |
|
Ghazi Triki
|
8866f9e6cb
|
Use new presentationModel logic to export PDF files.
|
2017-10-13 18:32:00 -03:00 |
|
Richard Alam
|
d4997454e8
|
Merge branch '2x-client-theme' of https://github.com/riadvice/bigbluebutton into riadvice-2x-client-theme
|
2017-10-13 14:21:40 -07:00 |
|
Ghazi Triki
|
f72d165fa9
|
Make most of the popup windows closable using keayboard ESCAPE button.
|
2017-10-13 18:14:50 -03:00 |
|
Ghazi Triki
|
0d634b4c0d
|
Redesign CustomLayoutNameWindow window.
|
2017-10-13 18:13:33 -03:00 |
|
Ghazi Triki
|
c693215cab
|
Remove scrollbar from AddChatTabBox component.
|
2017-10-13 18:12:43 -03:00 |
|
Chad Pilkey
|
b77be1a9f4
|
fix user avatar image sizing
|
2017-10-13 11:37:41 -07:00 |
|
Richard Alam
|
9984d168d2
|
Merge pull request #4523 from riadvice/fix-file-download
[Flash 2.1] - Fix displaying file download button.
|
2017-10-13 13:28:41 -04:00 |
|
Anton Georgiev
|
f1de51595d
|
Merge pull request #4515 from OZhurbenko/fix-warnings-assign-presenter
[HTML5] - Fix for the React console warnings
|
2017-10-13 14:06:31 -03:00 |
|
Ghazi Triki
|
1cfe0697c7
|
Fix displaying file download button.
|
2017-10-13 11:48:40 -03:00 |
|
Ghazi Triki
|
cbe9ca666a
|
Add new skins for the NumericStepper component to make the UI consistent.
|
2017-10-13 11:40:24 -03:00 |
|
Richard Alam
|
62d7461ae5
|
Merge branch 'riadvice-2x-browser-detection' into v2.0.x-release
|
2017-10-13 07:03:30 -07:00 |
|
Richard Alam
|
f197aaff62
|
Merge branch '2x-browser-detection' of https://github.com/riadvice/bigbluebutton into riadvice-2x-browser-detection
|
2017-10-13 06:52:32 -07:00 |
|
Oleksandr Zhurbenko
|
b3572cec3a
|
Changed the way the object is assigned
|
2017-10-12 17:20:27 -07:00 |
|
Anton Georgiev
|
8e6e450195
|
Merge pull request #4514 from OZhurbenko/merge-2.0-1.1-api
[HTML5] - Follow up on 2.0 -> 1.1 api merge
|
2017-10-12 21:17:47 -03:00 |
|
Anton Georgiev
|
8e1e6225bb
|
Merge pull request #4517 from jfsiebel/breakoutrooms-modal-hide
[HTML 5] Closes breakout room modal when the breakout room are closed
|
2017-10-12 21:17:18 -03:00 |
|
Ghazi Triki
|
7449f1555e
|
Fix toolbar top paddingTop style.
|
2017-10-12 20:14:14 -03:00 |
|
Tiago Daniel Jacobs
|
48f4750d2b
|
Merge pull request #4520 from ritzalam/change-listen-only-for-html5
Change listen only for html5
|
2017-10-12 19:46:04 -03:00 |
|
Joao Siebel
|
8b8456a1ac
|
Closes breakout room modal when the breakout room are closed
|
2017-10-12 19:39:03 -03:00 |
|
Richard Alam
|
11c7287d26
|
- don't force changing listen only status on mute and talking events
|
2017-10-12 15:36:19 -07:00 |
|
Richard Alam
|
73493f1345
|
- change how we handle listen only for html5 user
|
2017-10-12 15:33:22 -07:00 |
|
Richard Alam
|
2c103ce6fc
|
Merge pull request #4518 from ritzalam/change-listen-only-for-html5
- do not set listenOnly status when receiving user joined voice event..
|
2017-10-12 17:43:42 -04:00 |
|
Richard Alam
|
680a538596
|
- do not set listenOnly status when receiving user joined voice event from FS as
HTML5 client connects with no mic
|
2017-10-12 14:41:12 -07:00 |
|
Ghazi Triki
|
05b400267f
|
Directly use Flash Audio if under HTTP using chrome >= 60 or opera >= 47
|
2017-10-12 18:40:11 -03:00 |
|
Ghazi Triki
|
770947c065
|
Show a message when accessing webcam from HTTP using chrome >= 60 or opera >= 47
|
2017-10-12 18:30:45 -03:00 |
|
Ghazi Triki
|
58f60efe40
|
Improve opera browser detection.
|
2017-10-12 18:21:20 -03:00 |
|
Ghazi Triki
|
51abc59bd8
|
Refactor BrowserCheck class to store browser data and call the "determineBrowser" external interface method only once.
|
2017-10-12 17:18:48 -03:00 |
|