Richard Alam
|
d832719d27
|
- clean up some unused code
|
2017-10-20 11:24:05 -07:00 |
|
Richard Alam
|
54bd2acf99
|
- fix tests
|
2017-10-20 10:49:36 -07:00 |
|
Richard Alam
|
1968756f73
|
- update fsesl lib jar version
|
2017-10-20 08:35:50 -07:00 |
|
Richard Alam
|
8eab96b1cc
|
Merge branch 'ritzalam-remove-reconnect-handler'
|
2017-10-20 08:21:32 -07:00 |
|
Richard Alam
|
afb217fe70
|
Merge branch 'remove-reconnect-handler' of https://github.com/ritzalam/bigbluebutton into ritzalam-remove-reconnect-handler
|
2017-10-20 08:11:49 -07:00 |
|
Richard Alam
|
ec35eed07c
|
Merge branch 'v2.0.x-release' of github.com:bigbluebutton/bigbluebutton
|
2017-10-20 08:10:43 -07:00 |
|
Richard Alam
|
24def2ce7e
|
Merge branch 'riadvice-config-options-clean' into v2.0.x-release
|
2017-10-20 08:05:24 -07:00 |
|
Richard Alam
|
bf5d5de34e
|
Merge branch 'config-options-clean' of https://github.com/riadvice/bigbluebutton into riadvice-config-options-clean
|
2017-10-20 07:58:22 -07:00 |
|
Richard Alam
|
bd68aa3128
|
Merge pull request #4543 from ritzalam/remove-auto-join-voice-on-reconnect
Remove auto-join voice handler on auto-reconnect
|
2017-10-20 10:56:49 -04:00 |
|
Richard Alam
|
333dba585b
|
- remove for now as sometimes when reconnect occurs while there is only one user in the voice conference and
the meeting is being records, the audio conference fails to record.
|
2017-10-20 07:38:50 -07:00 |
|
Ghazi Triki
|
bd1e8a0f08
|
Remove trailing spaces in config.xml.template
|
2017-10-20 15:37:38 +01:00 |
|
Richard Alam
|
97f14ddfac
|
Merge branch 'v2.0.x-release' of github.com:bigbluebutton/bigbluebutton into v2.0.x-release
|
2017-10-20 07:36:39 -07:00 |
|
Richard Alam
|
fb58a5f0ca
|
Merge branch 'riadvice-breakout-audio-rejoin' into v2.0.x-release
|
2017-10-20 07:36:14 -07:00 |
|
Anton Georgiev
|
e0db8b1d3e
|
Merge pull request #4533 from jfsiebel/fix-update-voice-user-function-name
Fix function name in updateVoiceUser
|
2017-10-20 12:30:25 -02:00 |
|
Ghazi Triki
|
f3ba3e5ac9
|
Clean ununsed options properties and classes.
|
2017-10-20 11:17:19 +01:00 |
|
Richard Alam
|
543d34765b
|
Merge pull request #4540 from ritzalam/update-with-20
Update with latest 2.0
|
2017-10-19 21:22:02 -04:00 |
|
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 |
|
Richard Alam
|
e01692c40b
|
- send voice conf started and destroyed message
|
2017-10-19 17:18:50 -07:00 |
|
Richard Alam
|
a3530cad91
|
- remove for now as sometimes when reconnect occurs while there is only one user in the voice conference and
the meeting is being records, the audio conference fails to record.
|
2017-10-19 12:59:14 -07:00 |
|
Anton Georgiev
|
04cef71384
|
re-enable next/prev/goto slide
|
2017-10-19 14:47:59 -04:00 |
|
Ghazi Triki
|
b447d18b04
|
Invalidate 'breakoutEjectFromAudio' state if the join audio button is pressed.
|
2017-10-19 15:59:01 +01:00 |
|
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 |
|
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 |
|
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 |
|