Ghazi Triki
|
ec48b1ec2d
|
Display join audio window if back from breakout room.
|
2017-10-19 15:51:58 +01: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 |
|
gcampes
|
c600a78fea
|
Merge remote-tracking branch 'oswaldo/toast-notifications' into audio-refactor
|
2017-10-19 09:45:06 -02:00 |
|
Oswaldo Acauan
|
27ba271f56
|
Fix condition for duplicated notification
|
2017-10-19 09:44:09 -02:00 |
|
gcampes
|
3bd709c629
|
Merge remote-tracking branch 'oswaldo/toast-notifications' into audio-refactor
|
2017-10-19 09:39:50 -02:00 |
|
Oswaldo Acauan
|
ebfed7795e
|
Add notification when recording start/stop
|
2017-10-19 08:45:07 -02:00 |
|
Oswaldo Acauan
|
cbc3ea9e36
|
Add handlers for recording messages
|
2017-10-19 08:44:41 -02:00 |
|
Oswaldo Acauan
|
0686a596e9
|
Merge remote-tracking branch 'upstream/v2.0.x-release' into toast-notifications
|
2017-10-19 08:07:42 -02:00 |
|
gcampes
|
b15322e7f2
|
Merge remote-tracking branch 'upstream/v2.0.x-release' into audio-refactor
|
2017-10-18 17:42:49 -02:00 |
|
gcampes
|
1dda597fca
|
Toast notifications on audio and overall changes
|
2017-10-18 17:40:01 -02:00 |
|
Oswaldo Acauan
|
317335d359
|
Revert caret for the react-tostify package
|
2017-10-18 17:38:53 -02: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 |
|
Joao Siebel
|
da9e2ef3a4
|
Fix function name in updateVoiceUser
|
2017-10-18 10:30:33 -02: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 |
|
gcampes
|
d1bc675465
|
changes setdevices to bridge
|
2017-10-17 17:16:42 -02: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 |
|
Oswaldo Acauan
|
c801ad8996
|
Fix the version of react-toastify util we update to react 16
|
2017-10-13 15:24:58 -03: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 |
|
Oswaldo Acauan
|
0dd371087b
|
Fix logClient method name
|
2017-10-13 11:49:48 -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 |
|
gcampes
|
2ae020ba9a
|
Merge remote-tracking branch 'oswaldo/toast-notifications' into audio-refactor-notifications
|
2017-10-13 10:43:27 -03:00 |
|
Tainan Felipe
|
873d227819
|
Merge remote-tracking branch 'upstream/v2.0.x-release' into fix-errors-linter
|
2017-10-13 10:35:38 -03: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 |
|