BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
23,662 Commits 13 Branches 260 Tags 1.1 GiB
92bc5847b8
Commit Graph

7288 Commits

Author SHA1 Message Date
Ghazi Triki
3eddc7b585 Only pen for multi-user whiteboard. 2018-07-16 09:50:56 +01:00
Ghazi Triki
991f5144fe Fix camera lock when skipCamSettingsCheck is true. 2018-07-12 14:53:54 +01:00
Chad Pilkey
d1e649189e add option to user gear menu to look up their directory data 2018-07-11 10:33:38 -07:00
Anton Georgiev
f6c02629fb
Merge pull request #5848 from prlanzarin/flash-sfu-stun-turn 
[Flash] Added STUN/TURN config via API to Flash kurento-extension script and re-enabled window sharing
 2018-07-11 10:26:04 -04:00
prlanzarin
ebd70eadfa Added STUN/TURN config via API to Flash kurento-extension script 2018-07-10 19:59:05 +00:00
Anton Georgiev
124ab63193
Merge pull request #5844 from prlanzarin/sfu-kms-conn-fix 
SFU correctly throwing connection error on KMS misconfig
 2018-07-10 15:13:24 -04:00
prlanzarin
94675e8569 Fixed voiceBridge in flash kurento-extension 2018-07-10 17:45:03 +00:00
Ghazi Triki
2a243f50c0 Update multiuser whiteboard tooltips. 2018-07-06 23:23:26 +01:00
Ghazi Triki
eb17100a89 Updated hardware acceleration hint and check. 2018-07-06 15:40:23 +01:00
Richard Alam
020943393e - accidentally deleted when fixing merge conflicts 2018-07-04 08:52:36 -07:00
Anton Georgiev
eca2e50e1a Merge branch 'v2.0.x-release' of github.com:bigbluebutton/bigbluebutton into current 2018-07-03 20:17:42 +00:00
Fred Dixon
854816b053
Merge pull request #5784 from capilkey/2.0-screenshare-sound-n-lock-fix 
Screenshare sound and lock fixes
 2018-06-30 09:20:32 -04:00
Richard Alam
914f36630a Merge branch 'v2.0.x-release' of github.com:bigbluebutton/bigbluebutton into merge-latest-20-branch 2018-06-29 13:25:09 -07:00
Richard Alam
a396791985
Merge pull request #5776 from riadvice/v2.0.x-release-ui-fixes 
V2.0.x release ui fixes
 2018-06-29 15:57:12 -04:00
Chad Pilkey
6dcf3e2dcb force a revalidation of lock state when the local user's role changes 2018-06-29 12:56:40 -07:00
Richard Alam
a6b3a3fe5b
Merge pull request #5771 from riadvice/show-custom-layout-name 
Show layout name as in xml file when its name cannot be matched from locale file
 2018-06-29 15:56:29 -04:00
Chad Pilkey
4b77c38041 play a sound when the either screenshare publish window closes 2018-06-29 12:44:04 -07:00
Chad Pilkey
b0cec4b055 allow changing mute on userlist when mic is locked and you are mod 2018-06-29 12:43:07 -07:00
Ghazi Triki
c5aea3ec40 Minir client UI fixes 2018-06-29 18:52:14 +01:00
Anton Georgiev
2fe38bc936
Merge pull request #5479 from prlanzarin/sfu-opt-audio 
HTML5 WebRTC listen only via Kurento/SFU
 2018-06-29 10:46:56 -04:00
prlanzarin
d4858b6e70 Fixed userId/userName sending to SFU audio component 
Also did some refactoring to kurento-extension parameters
 2018-06-28 18:50:56 +00:00
Richard Alam
445d16f27c Merge branch 'implement-meeting-inactivity-timer' of https://github.com/ritzalam/bigbluebutton into ritzalam-implement-meeting-inactivity-timer 2018-06-28 10:32:46 -07:00
Ghazi Triki
bb5b4e4079 Show layout name as in xml file when its name cannot be matched from locale file. 2018-06-28 18:15:58 +01:00
Richard Alam
d891a4e85f Merge branch 'v2.0.x-release' of github.com:bigbluebutton/bigbluebutton into merge-latest-20-branch 2018-06-28 08:30:17 -07:00
Fred Dixon
1ba07296a9 Remove incorrect image 2018-06-27 22:25:17 -04:00
Fred Dixon
6c82c18904
Merge pull request #5762 from riadvice/chrome-hardware-acceleration 
Update hardware acceleration warning style and help page
 2018-06-27 16:36:31 -04:00
Ghazi Triki
cefd078b0a Update hardware acceleration warning style and help page. 2018-06-27 21:30:25 +01:00
Richard Alam
c92635b209 - cheange text to warn user that meeting is inactive 2018-06-27 12:59:33 -07:00
prlanzarin
2f5aa09fe5 Merge remote-tracking branch 'upstream/v2.0.x-release' into sfu-opt-audio 2018-06-27 17:34:33 +00:00
Richard Alam
2f727fe085 - check if chat message is available to prevent NPEs 2018-06-27 08:15:47 -07:00
Richard Alam
d8a4a03cd7 Merge branch 'client-type-get-meetings' of https://github.com/antobinary/bigbluebutton into antobinary-client-type-get-meetings 2018-06-27 07:51:43 -07:00
Anton Georgiev
e2e83e08df plug clientType in UserJoin* messages, not separate ones 2018-06-26 19:27:42 +00:00
Anton Georgiev
67c7b90581 set clientType from Flash clients 2018-06-26 14:13:14 +00:00
Fred Dixon
4c0b783497 fix HT slide title 2018-06-24 13:10:29 -05:00
Richard Alam
f2a7e4d314 - display meeting is about to end warning to user and breakout warning if meeting is breakout room 2018-06-22 11:46:46 -07:00
Richard Alam
578e3acee8 - no locales to update 
- include .tx/config so we can pull locales
 2018-06-22 07:28:29 -07:00
Chad Pilkey
1cf9df21b4 stop chat from scrolling back to a selected chat message 2018-06-21 16:44:15 -07:00
Chad Pilkey
b7031b2b71 attempt to improve chat message render performance 2018-06-21 16:42:30 -07:00
Richard Alam
fc3605f301 - merging latest v20-release branch 2018-06-21 07:38:19 -07:00
Chad Pilkey
f1443aefa9 add a 15s loading bar for WebRTC screenshare start up in the Flash client 2018-06-20 15:14:02 -07:00
Richard Alam
066395c440 - make configurable how client talks to server (default Red5) 2018-06-19 14:40:12 -07:00
Richard Alam
384fdb3e16 Merge branch 'reroute-client-messages' of github.com:ritzalam/bigbluebutton into merge-reroute-client-msgs 2018-06-19 14:28:24 -07:00
Richard Alam
14327a1edf Merge branch 'v2.0.x-release' of github.com:bigbluebutton/bigbluebutton into merge-v20-branch 2018-06-19 12:58:51 -07:00
Chad Pilkey
3a40cf169d make the file upload check for ff60 more explicit 2018-06-15 15:01:17 -07:00
Ghazi Triki
718d65f30b Merge remote-tracking branch 'bigbluebutton/v2.0.x-release' into recording-message 
# Conflicts:
#	bigbluebutton-client/src/org/bigbluebutton/main/views/RecordWindow.mxml
 2018-06-11 18:33:27 +01:00
Richard Alam
f7f291e70e Merge branch 'global-exception-catcher' of https://github.com/riadvice/bigbluebutton into riadvice-global-exception-catcher 2018-06-11 08:52:08 -07:00
Richard Alam
9c776579c4 Merge branch 'popups-style' of https://github.com/riadvice/bigbluebutton into riadvice-popups-style 2018-06-11 08:33:52 -07:00
Ghazi Triki
9b274dd1f8 Fix locale Haitian Creole name. 2018-06-11 15:09:43 +01:00
Ghazi Triki
e5e0bdcd21 Switch LogoutWindow confirmation buttons order. 2018-06-11 15:04:48 +01:00
Ghazi Triki
fd91ed72e1 Fixed locale typo. 2018-06-11 11:29:24 +01:00
Richard Alam
dc62b89691 Merge branch 'v2.0.x-release' of github.com:bigbluebutton/bigbluebutton into 21-and-20-merge-working-branch 2018-06-08 17:49:13 -07:00
Richard Alam
83ac942452 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into 21-and-20-merge-working-branch 2018-06-08 17:23:49 -07:00
Ghazi Triki
4fdc77f2a5 Make sytle consistent for popups and buttons. 2018-06-09 00:07:37 +01:00
Richard Alam
277dcc3b38 - remove logging of messages 
- do not instantiate main app shell twice. Otherwise, we'll get lots of exceptions.
 2018-06-08 15:57:47 -07:00
Ghazi Triki
1a9374f19d Add Haitian locale to flash client. 2018-06-08 14:02:42 +01:00
Ghazi Triki
dc5ff6e2b4 Bigger recording timer label & sync recording label with locale 2018-06-08 10:21:39 +01:00
Richard Alam
224aa19254 - fix merge conflicts 2018-06-07 14:18:46 -07:00
Richard Alam
7dfe3f3093
Merge pull request #5651 from ritzalam/download-presentation 
- toggle presentation downloads
 2018-06-07 15:32:08 -04:00
Richard Alam
5df4bef903 - toggle presentation downloads 2018-06-07 12:13:00 -07:00
Ghazi Triki
ec29839034 Add new reportErrorsInUI to config.xml 2018-06-07 18:49:32 +01:00
Ghazi Triki
337c260bcf Globally catch any unhandled exception. 2018-06-07 18:11:38 +01:00
Chad Pilkey
13da7042b3 add option to save user names to a file to gear button 2018-06-06 16:17:57 -07:00
Chad Pilkey
d04610a237
Merge pull request #5644 from riadvice/exceptions-fixes 
Fix flash null exceptions
 2018-06-06 15:28:38 -04:00
Ghazi Triki
28e67148ad Fix flash null exceptions. 2018-06-06 17:23:48 +01:00
Richard Alam
a2eaa9babd Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into 21-and-20-merge-working-branch 
- some conflicts have been fixed.

The following needs working on:

       both modified:   ../bigbluebutton-client/src/org/bigbluebutton/modules/chat/services/ChatCopy.as
        both modified:   ../bigbluebutton-client/src/org/bigbluebutton/modules/chat/services/ChatSaver.as
        both modified:   ../bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatTab.mxml
        both modified:   ../bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatWindowEventHandler.as
        both modified:   ../bigbluebutton-client/src/org/bigbluebutton/modules/users/services/MessageReceiver.as
        both modified:   ../bigbluebutton-client/src/org/bigbluebutton/modules/users/services/MessageSender.as
        both modified:   ../bigbluebutton-client/src/org/bigbluebutton/modules/users/views/MediaItemRenderer.mxml

Parking as need to work on something else.
 2018-06-06 08:23:13 -07:00
Ghazi Triki
acc9c2006a Put focus on PollResultsModal when it shows to avoid changing slides. 2018-06-05 14:59:28 +01:00
Chad Pilkey
1001cc1ecd
Merge pull request #5638 from capilkey/show-individual-votes 
Improve the PollResultsModal spacing and sort
 2018-06-04 19:13:16 -04:00
Chad Pilkey
ca66c177e9 improve PollResultsModal sorting 2018-06-04 16:08:27 -07:00
Chad Pilkey
6f1884ed1c update PollResultsModal spacing and grid header text 2018-06-04 12:37:53 -07:00
Fred Dixon
f0ab539e33
Merge pull request #5633 from riadvice/record-window-position 
Put back recording window under the recording button
 2018-06-04 11:42:50 -04:00
Ghazi Triki
b5a66652ed Put back recording window under the recording button. 2018-06-04 16:02:58 +01:00
Ghazi Triki
a6e239c875 Show new chat messages ribbon only if no scrolling is to be expected. 2018-06-04 15:02:17 +01:00
Fred Dixon
1668b60069
Merge pull request #5628 from capilkey/show-individual-votes 
Add a table showing individual votes in the PollResultsModal
 2018-06-02 08:00:53 -04:00
Chad Pilkey
f7a5f675b6 add a table showing individual votes in the PollResultsModal 2018-06-01 16:06:49 -07:00
Richard Alam
17b66b9b97 Merge branch 'chat-scroll' of https://github.com/riadvice/bigbluebutton into riadvice-chat-scroll 2018-06-01 12:59:00 -07:00
Ghazi Triki
024016f527 Added a new option to xml.config to enable/disable clearing recording markers. 2018-05-31 14:16:47 +01:00
Richard Alam
9179d4d61c - reverting toasts so we can perform emergency upgrade of red5 through packages 2018-05-30 14:59:37 -07:00
Ghazi Triki
78681bf9b2 Added new unread message ribbon to chat. 2018-05-30 16:59:10 +01:00
Ghazi Triki
a589f0142e Remove toaster for recording status change. 2018-05-30 11:04:51 +01:00
Ghazi Triki
391aa3f43f Update toast style. 2018-05-29 16:40:23 +01:00
Richard Alam
07a8466a28
Merge pull request #5596 from riadvice/toast-message 
Toast message into Flash client
 2018-05-29 11:09:25 -04:00
Ghazi Triki
db112d23d8 Added toaster for start and stop recording only for moderator. 2018-05-29 16:00:10 +01:00
Ghazi Triki
2c752ff4cb Deactivate sound and add missing class. 2018-05-29 15:24:15 +01:00
Ghazi Triki
6e336fa36d Added "Resume Recording" title to RecordWindow. 2018-05-29 15:14:17 +01:00
Ghazi Triki
a39081afb3 Use toast notification at some application events. 2018-05-29 11:28:31 +01:00
Ghazi Triki
0fe52111a2 Improve toast display by moving timer to the renderer and adding a display progress bar. 2018-05-29 10:07:55 +01:00
Anton Georgiev
658b9d81b3
Merge pull request #5512 from lfzawacki/use-get-recording-status 
Use GetRecordingStatus message to start recordings from the bbb-webrtc-sfu side
 2018-05-28 13:55:30 -04:00
Ghazi Triki
7de1159f20 Initial implementation of Flash client Toaster component. 2018-05-28 15:24:29 +01:00
Richard Alam
39558cd805 Merge branch 'recording-timer' of https://github.com/riadvice/bigbluebutton into riadvice-recording-timer 2018-05-23 10:11:09 -07:00
Richard Alam
b3b9411587
Merge pull request #5575 from ritzalam/shorten-reconn-timer 
- shorten timer to wait in case other red5 conn disconnect. Need to …
 2018-05-23 13:00:02 -04:00
Lucas Fialho Zawacki
09166db2c9 Rename variable in WebRTCDesktopPublishWindow.mxml 2018-05-23 16:32:00 +00:00
Ghazi Triki
eab45f7fa5 Fix event name typo. 2018-05-23 17:26:05 +01:00
Richard Alam
316986bf1d
Merge pull request #5570 from ritzalam/put-back-screenshare-stop-reason 
- put back accidentally deleted log to show why screenshare failed t…
 2018-05-23 11:23:35 -04:00
Richard Alam
17f228fba9 - make reconnect wait timer configurable. This timer waits for a period of time in case other connections 
disconnects before initiating reconnection. Default is 2 seconds.
 2018-05-23 08:13:34 -07:00
Ghazi Triki
4eebdf00fa Add a new message RecordAndClearPreviousMarkersCmd. 2018-05-23 16:09:15 +01:00
Richard Alam
ffd4347867 - shorten timer to wait in case other red5 conn disconnect. Need to initiate reconnect as soon as possible. 2018-05-22 13:38:44 -07:00
Ghazi Triki
a4fef6ff8a Fix server recording timer and correctly save MettingState2x 2018-05-22 18:07:06 +01:00
Richard Alam
414498d0d2 - allow to configure using config.xml that region is default choice for JWS screenshare 2018-05-22 07:51:14 -07:00
Richard Alam
f2330333d6 - put back accidentally deleted log to show why screenshare failed to start 2018-05-22 07:02:14 -07:00
Chad Pilkey
6d0e00a109 add a 64-bit check to the Firefox 60+ upload block 2018-05-20 09:25:36 -07:00
Chad Pilkey
f2025b658b temporarily disable uploading on Win FF60+ 2018-05-19 18:16:42 -07:00
Ghazi Triki
634635c8cd Update recording confirmation window and add recording timer (Work In Progress) 2018-05-18 15:58:08 +01:00
Richard Alam
e72ed00a6c - webrtc screenshare should not create another connection to red5 screenshare app 2018-05-17 12:53:44 -07:00
Chad Pilkey
8fc80492b6 redesign of screenshare select with win10 chrome warning 2018-05-16 20:01:34 -07:00
Fred Dixon
efc36045a3
Merge pull request #5536 from capilkey/fix-mic-perm-img 
Use Mac mic permission image everywhere, but Windows
 2018-05-14 14:58:32 -04:00
Chad Pilkey
3c2325a7ba use Mac mic permission image everywhere, but Windows 2018-05-14 11:47:19 -07:00
Chad Pilkey
6d973c178f
Merge pull request #5523 from ritzalam/cleanup-video-stream-on-reconnect 
Cleanup video stream on reconnect
 2018-05-11 15:38:30 -04:00
Chad Pilkey
714d7fe243 hide audio callout when button is clicked 2018-05-11 09:38:14 -07:00
Richard Alam
9d4926eab8 - handle stream stopped event by checking if stream is present 2018-05-11 08:47:50 -07:00
Richard Alam
7701b70842 - the bbb-video red5 app is not responsible for sending the start/stop webcam message 2018-05-11 08:47:03 -07:00
Fred Dixon
d4b412e884
Merge pull request #5517 from capilkey/update-ss-selectwindow 
Fix WebRTCDesktopViewWindow not being closed properly
 2018-05-10 19:52:04 -04:00
Chad Pilkey
166a32ec6a fix WebRTCDesktopViewWindow not being closed properly 2018-05-10 16:12:04 -07:00
Lucas Fialho Zawacki
d83178c196 Merge branch 'v2.0.x-release' of https://github.com/bigbluebutton/bigbluebutton into use-get-recording-status 2018-05-10 17:39:14 +00:00
Ghazi Triki
dd3f530872 Improve BreakoutRoomSettings layout. 2018-05-10 15:55:01 +01:00
Anton Georgiev
292e9a8f02
Merge pull request #5505 from prlanzarin/fix-ss-distortion 
Fixed screenshare resolution limit
 2018-05-10 09:28:06 -04:00
Fred Dixon
082792c720
Merge pull request #5503 from riadvice/choose-breakout-room 
Improve BreakoutRoomSettings layout and free-join behaviour.
 2018-05-09 19:41:22 -04:00
prlanzarin
060e8abf32 Fixed screenshare resolution limit 2018-05-09 23:38:20 +00:00
Fred Dixon
42750408d3
Merge pull request #5504 from capilkey/update-ss-selectwindow 
Updates to WebRTC screenshare in Flash
 2018-05-09 18:55:55 -04:00
Chad Pilkey
2584352675 refactor flash webrtc ss sizing to use metadata w/h 2018-05-09 15:50:48 -07:00
Ghazi Triki
72bbc49e60 Improve BreakoutRoomSettings layout and free-join behaviour. 2018-05-09 22:52:37 +01:00
Chad Pilkey
679cbbffc9 remove unused loading state from webrtc publish win 2018-05-09 14:33:23 -07:00
Chad Pilkey
c7a2af5682 reset screenshare publish window after extension is installed 2018-05-09 14:20:14 -07:00
Chad Pilkey
04f4fc8eb9 remove last remnants of verto from the Flash client 2018-05-09 14:07:44 -07:00
Chad Pilkey
a4695c6688 update screenshare select window to match #5463 2018-05-09 13:56:59 -07:00
Lucas Fialho Zawacki
2d222b7b2e Merge branch 'v2.0.x-release' of https://github.com/bigbluebutton/bigbluebutton into use-get-recording-status 2018-05-09 19:02:31 +00:00
Lucas Fialho Zawacki
c2801f4476 Send userId as calername in screenshare instead of username 2018-05-09 18:48:14 +00:00
Anton Georgiev
8327e6fb94
Merge pull request #5501 from prlanzarin/fix-ss-distortion 
Preserving WebRTC screenshare aspect ratio in video-broadcast
 2018-05-09 12:47:15 -04:00
prlanzarin
9d26a83514 Removed application support for chrome screensharing 
Also reverted the track resolution to the screen res. The WebRTC getSettings is buggy for chrome <= 65
 2018-05-09 16:39:59 +00:00
prlanzarin
1a16e5a0b1 Fixed screenshare resolutions to preserve aspect ratio 2018-05-09 14:21:03 +00:00
Richard Alam
e16123f979 - add streamId on screenshare logs 2018-05-08 10:36:15 -07:00
Ghazi Triki
138663dc77 Allow chat with moderators when private chat is locked. 2018-05-08 16:56:36 +01:00
Fred Dixon
70c31c1a50
Merge pull request #5475 from riadvice/choose-breakout-room 
Add new feature to breakout rooms that allows to freely join them
 2018-05-08 11:06:55 -04:00
Ghazi Triki
a75173fd90 Locale typo fix. 2018-05-08 08:56:28 +01:00
Fred Dixon
80b959f5b9
Merge pull request #5482 from capilkey/audio-callout 
Change style of the audio call out
 2018-05-07 22:00:47 -04:00
Chad Pilkey
aa2ed93e5b restyle the callout when user doesn't join audio 2018-05-07 16:12:11 -07:00
prlanzarin
5375eb2836 Removed uneeded dispose func and updated flash kurento-extension with listen only hooks 2018-05-07 17:44:18 +00:00
prlanzarin
14f74fb223 Merge remote-tracking branch 'upstream/v2.0.x-release' into sfu-opt-audio 2018-05-07 17:43:42 +00:00
Richard Alam
1be8ba7f98 - update locales to latest 2018-05-07 08:36:50 -07:00
Ghazi Triki
54ae79d533 Add new feature to breakout rooms that allows to freely join them. 2018-05-07 16:03:53 +01:00
Fred Dixon
723b30dbd9
Merge pull request #5466 from capilkey/audio-callout 
Show a call out when a user doesn't join audio
 2018-05-06 08:42:53 -04:00
Chad Pilkey
cb8878d078 show callout when user doesn't join audio 2018-05-04 16:25:31 -07:00
Richard Alam
59da111033 - missing logCode 2018-05-04 14:37:28 -07:00
Richard Alam
49ce5f58f6 Merge branch 'v2.0.x-release' of github.com:bigbluebutton/bigbluebutton into improve-client-logging 2018-05-04 10:28:38 -07:00
Richard Alam
d0fe175220 - organize client logs better 2018-05-04 08:48:32 -07:00
Chad Pilkey
28e0627bde fallback to simple pencil line drawing if commands are missing 2018-05-03 15:04:28 -07:00
prlanzarin
01f87d2718 Added websocket ping pong to SFU clients 
Also updated SFUs package-lock
 2018-05-03 13:57:03 +00:00
Richard Alam
7080871401 - use JSON stringify to convert Object to JSON 2018-05-01 15:07:20 -07:00
Richard Alam
8c123fcd8e
Merge pull request #5440 from ritzalam/improve-client-logging 
Improve client logging
 2018-05-01 13:39:15 -04:00
Richard Alam
e1e0f8b9b4 - change client log format 2018-05-01 10:34:27 -07:00
Richard Alam
107a359e86 - do not log filename as we don't need it 2018-05-01 10:31:45 -07:00