Commit Graph

19629 Commits

Author SHA1 Message Date
Richard Alam
f4d4bc8370 - refresh presentation list 2017-12-15 12:36:37 -08:00
Richard Alam
6c3b2b1374 Merge branch 'presentation-download' of github.com:riadvice/bigbluebutton into presentation-download 2017-12-15 12:28:09 -08:00
Ghazi Triki
986b9598ef Localised allow/disallow presentation dowload label and tooltip. 2017-12-15 21:26:06 +01:00
Anton Georgiev
bfa8637edc
Merge pull request #4830 from OZhurbenko/fix-issue-3576
Fixed round buttons' icon centering
2017-12-15 18:24:49 -02:00
Oleksandr Zhurbenko
6de2b35cb2 Fixed round buttons' icon centering
Fixes #3576
2017-12-15 11:56:12 -08:00
Richard Alam
f826aae0fc Merge branch 'presentation-download' of github.com:riadvice/bigbluebutton into presentation-download 2017-12-15 11:54:59 -08:00
Ghazi Triki
ef7a3137a7 - Download the current slide with annotation should always be available.
- Disable toggle file downloadable on and off.
2017-12-15 20:52:34 +01:00
Richard Alam
b03f9fbeea Merge branch 'master' into presentation-download 2017-12-15 11:23:29 -08:00
Richard Alam
3dfbba8991
Merge pull request #4828 from capilkey/decouple-whiteboard-from-pres
Decouple whiteboard from presentation
2017-12-15 14:22:38 -05:00
Richard Alam
3dc2cc95a0 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into presentation-download 2017-12-15 11:11:18 -08:00
Chad Pilkey
b9ae9e765b
Merge pull request #4827 from capilkey/2.1-cleanup-mnr-iss-usrmsgrcvr
Cleanup minor issues with Users MessageReceiver
2017-12-15 14:10:55 -05:00
Richard Alam
0dc922e7df - handle message from server for presenation download change event 2017-12-15 11:07:09 -08:00
Oswaldo Acauan
2eb2bbd8ab Fix case when there is no current selected 2017-12-15 16:49:47 -02:00
Chad Pilkey
7f657c5b38 decouple the WhiteboardCanvas from the PresentationModule 2017-12-15 13:10:01 -05:00
Chad Pilkey
9318ccbeb4 add a forgotten break for IsMeetingMutedRespMsg case 2017-12-15 12:45:47 -05:00
Chad Pilkey
8ecbf50ca4 remove old 1.1 message handling in users MessageReceiver 2017-12-15 12:43:38 -05:00
Fred Dixon
8687f9d572
Merge pull request #4826 from capilkey/2.1-fix-client-mate-errors
Fix exceptions on reconnect
2017-12-15 12:39:59 -05:00
Richard Alam
31a80be511 - handle presentation download change in client 2017-12-15 08:50:59 -08:00
Anton Georgiev
c9c6797fc9
Merge pull request #4788 from antobinary/audio-work-3
Handle dial-in users in HTML5
2017-12-15 13:44:51 -02:00
Ghazi Triki
89814bd613 Implement new feature: set presentation downloadable on and off. Work in progress. 2017-12-15 16:08:56 +01:00
Fred Dixon
be5d7f4513
Merge pull request #4825 from ritzalam/guest-policy-management
- do not ask moderator permissions if not guest or authenticated guest
2017-12-15 08:33:21 -05:00
Joao Siebel
218890d8a6 Alter status tooltip to match selected status 2017-12-15 11:11:28 -02:00
Richard Alam
07e9f78730 - do not ask moderator permissions if not guest or authenticated guest 2017-12-14 17:35:52 -08:00
Chad Pilkey
ead04e3470 fix exceptions on reconnect 2017-12-14 16:08:52 -05:00
Fred Dixon
48548a7adc
Merge pull request #4824 from kepstin/recording-cleanup-2
Don't delete video events in the sanity script.
2017-12-14 15:03:30 -05:00
Calvin Walton
d8c0f7a67d Don't delete video events in the sanity script.
When working with the segmented recording format, the events file might
end with a mismatched start video event for an incomplete file. The
sanity script was removing this event, meaning the video didn't show up
in future segments.

Simply drop the code that tries to find invalid video files and removes
them from the events file. The new video processing code is already
robust against missing or corrupt files.
2017-12-14 14:43:31 -05:00
Anton Georgiev
9a92d972d8
Merge pull request #4822 from bigbluebutton/antobinary-update-index.html
Update index_html5_vs_flash.html
2017-12-14 14:00:14 -02:00
Anton Georgiev
696974d3b7
Update index_html5_vs_flash.html 2017-12-14 10:58:06 -05:00
Anton Georgiev
1b939ad2aa
Merge pull request #4803 from antobinary/adjust-polls-4778
Poll updated event - drop requesterId/presenterId and rename event
2017-12-14 13:25:34 -02:00
Joao Siebel
845692b9e5 Merge remote-tracking branch 'upstream/v2.0.x-release' into hide-audio-labels 2017-12-14 09:01:38 -02:00
Richard Alam
cddd7f68a9
Merge pull request #4820 from ritzalam/start-webcam-event
- add more logging to trace why start webcam event doesn't appear in…
2017-12-13 23:32:26 -05:00
Richard Alam
17cec753a0 - add more logging to trace why start webcam event doesn't appear in events.xml 2017-12-13 20:24:41 -08:00
Richard Alam
b8c43226bb
Merge pull request #4817 from ritzalam/fix-breakout-room
- add create breakout rooms request to whitelist
2017-12-13 15:38:55 -05:00
Richard Alam
6a66a9fe01 - add create breakout rooms request to whitelist
- use current presentation and page of main presentation window as default presentation for breakout rooms
2017-12-13 12:15:18 -08:00
Anton Georgiev
334c80083e
Merge pull request #4753 from jfsiebel/html5-tooltip
Add tooltip for buttons without label
2017-12-13 17:13:28 -02:00
Richard Alam
052d21b805 Merge branch 'capilkey-2.1-whiteboard-improvements' 2017-12-13 10:44:07 -08:00
Anton Georgiev
b450db91f7
Merge pull request #4683 from KDSBrowne/z14-fix-userlist-keyboard-accessibility
Fix user-list keyboard accessibility
2017-12-13 16:25:44 -02:00
Richard Alam
e0d0971070 Merge branch '2.1-whiteboard-improvements' of https://github.com/capilkey/bigbluebutton into capilkey-2.1-whiteboard-improvements 2017-12-13 10:16:43 -08:00
Chad Pilkey
777fe53c39 rearrange WhiteboardMsgs so they are divided by direction 2017-12-13 12:14:39 -05:00
Chad Pilkey
1587b7560c remove SyncWhiteboardAccess from one more place 2017-12-13 12:14:04 -05:00
Chad Pilkey
cf25541a98 fix cursor for presenter 2017-12-13 12:13:30 -05:00
Richard Alam
50e84db985
Merge pull request #4810 from ritzalam/hide-poll-button
- show poll button only in main presentation pod
2017-12-13 10:32:14 -05:00
Chad Pilkey
37f544be93 change whiteboard collection from ArrayCollection to Hashmap for quicker lookup 2017-12-13 02:19:38 -05:00
Chad Pilkey
61a14a0079 completely clear the annotation and cursor holders on whiteboard switch 2017-12-13 02:19:09 -05:00
Chad Pilkey
4881fbbc0b clean up spacing for WhiteboardMsgs so they're easier to read 2017-12-13 02:17:36 -05:00
Chad Pilkey
ccc7e5b0a4 remove third green from whiteboard toolbar colours 2017-12-13 02:15:47 -05:00
Chad Pilkey
1551dcae15 move multiuser to be per-whiteboard 2017-12-13 02:14:43 -05:00
Richard Alam
67c233dd0d - show poll button only in main presentation pod 2017-12-12 12:02:12 -08:00
Anton Georgiev
a30026a5ed
Merge pull request #4804 from OZhurbenko/fix-edge-default-locale
Fixed a problem with the default locale selection in Edge
2017-12-12 16:16:38 -02:00
Anton Georgiev
6e15b91cde
Merge pull request #4800 from OZhurbenko/fix-userlist-sorting
Fixed sorting in the user list
2017-12-12 16:14:24 -02:00