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

7276 Commits

Author SHA1 Message Date
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
Richard Alam
07b0ede4b3 - modify connection and flash call logging 2018-05-01 08:05:48 -07:00
Fred Dixon
6767885e6c
Merge pull request #5437 from capilkey/screenshare-type-chooser 
Update WebRTCDesktopViewWindow and add connecting dots for view and publish windows
 2018-05-01 09:38:33 -04:00
Chad Pilkey
c8e12a0839 update WebRTCDesktopViewWindow to match Java view and add connecting dots to view and publish windows 2018-04-30 16:45:02 -07:00
Richard Alam
d29137698b - change format of client logs to easily parse 2018-04-30 14:34:23 -07:00
prlanzarin
9fe4fecf2c Improved chrome screensharing constraints and fixed SFU exception 2018-04-27 14:37:18 +00:00
Richard Alam
f754c5961c - make sure message from user actor to client actor is routed properly 2018-04-26 12:41:02 -07:00
Fred Dixon
adafd44182
Merge pull request #5416 from riadvice/v2.0.x-webcams-late-joiners 
Fix not found onMetaData method in UserVideo
 2018-04-26 15:00:51 -04:00
Fred Dixon
92968d2e6d
Merge pull request #5415 from capilkey/screenshare-type-chooser 
Add a selection popup for screenshare publish type
 2018-04-26 15:00:16 -04:00
Ghazi Triki
f6bb4d6471 Fix not found onMetaData method in UserVideo, and view webcam wehn promoting to moderator if webcamsOnlyForModerator is on. 2018-04-26 19:50:18 +01:00
Chad Pilkey
cb74bf51ad add a selection popup for screenshare publish type 2018-04-26 09:52:19 -07:00
Anton Georgiev
9c82f1486b
Merge pull request #5402 from prlanzarin/screenshare-opt2 
HTML5 Screenshare improvements
 2018-04-25 21:08:47 -04:00
Fred Dixon
59aba69c7c Bump the copyright date 2018-04-25 19:13:44 -05:00
Richard Alam
55b5e1fc66 - log browser info 2018-04-25 16:45:06 -07:00
Richard Alam
d740e36435 - add client connId to client logs so we can correlate client conn logs with red5 side conn logs 2018-04-25 16:00:06 -07:00
Richard Alam
28b83d23ff
Merge pull request #5343 from ritzalam/add-more-info-on-feedback 
- add reason, role, external user id on feedback info when client lo…
 2018-04-25 16:15:17 -04:00
Ghazi Triki
f430f363af Fix role change and page reload not taking in account webcam display when webcamsOnlyForModerator is on? 2018-04-25 20:56:57 +01:00
prlanzarin
5059ccdce6 Merge remote-tracking branch 'upstream/v2.0.x-release' into screenshare-opt2 2018-04-25 16:57:02 +00:00
prlanzarin
4cb7dcab7c Refactored WebRTC screenshare flow and fixed mcs-core event emission 2018-04-25 16:56:16 +00:00
Richard Alam
bfd7738831 Merge branch 'v2.0.x-release' of github.com:bigbluebutton/bigbluebutton into v2.0.x-release 2018-04-24 15:06:33 -07:00
Richard Alam
87a8a03067 Merge branch 'change-user-role-bbb-web' of https://github.com/riadvice/bigbluebutton into riadvice-change-user-role-bbb-web 2018-04-24 14:47:53 -07:00
Richard Alam
de446d379e
Merge pull request #5131 from riadvice/2.0-ui-fixes 
Show lock image if webcamsOnlyForModerator is enabled
 2018-04-24 16:57:37 -04:00
Ghazi Triki
2700995876 Fix centering screenshare video. 2018-04-24 21:41:28 +01:00
Richard Alam
e3f1405746 - re-route messages 2018-04-24 12:53:36 -07:00
Ghazi Triki
310759b7b3 Delete centering videoHolder in all cases from ScreenshareViewWindow.mxml 2018-04-24 20:52:53 +01:00
Richard Alam
e58c0a33ca - wire up message path 2018-04-24 11:26:00 -07:00
Ghazi Triki
f26490a4e3 Fix full-size screen-sharing issue. 2018-04-24 18:39:17 +01:00
Richard Alam
bea20eafcb - try to wire up message bus 2018-04-23 15:49:07 -07:00
Richard Alam
e08680987d - use one common bus 2018-04-20 20:28:27 -07:00
Richard Alam
97056da519 - try to use flash to go through vertx 2018-04-20 14:13:31 -07:00
Ghazi Triki
722decd85f Remove remnant verto screensharing and use kurento instead. 2018-04-19 22:45:22 +01:00
prlanzarin
1f057bb267 Improved Chrome WebRTC screenshare constraints 2018-04-17 15:23:25 +00:00
Richard Alam
0f1081a449 - set up actors 2018-04-12 19:17:26 -07:00
Anton Georgiev
45a9a4f331
Merge pull request #5333 from prlanzarin/sft 
SFU improvements
 2018-04-12 14:28:09 -04:00
prlanzarin
0429c2032f Removed uneeded audio negotiation from screenshare viewers 2018-04-12 18:25:51 +00:00
Richard Alam
309f909ae5 - add reason, role, external user id on feedback info when client logs out. 2018-04-12 10:33:41 -07:00
Richard Alam
8ead6d6713 Merge branch 'master' of /home/ubuntu/dev/bigbluebutton into reroute-client-messages 2018-04-11 13:10:22 -07:00
Richard Alam
483f057b8e - update locales 2018-04-10 07:32:44 -07:00
Richard Alam
25f4566c6a - try to display audit window 2018-04-09 14:03:21 -07:00
Richard Alam
d8976e3f79 - handle user inacitivity audit message on the client 2018-04-09 12:22:58 -07:00
Richard Alam
baadb8bb68 Merge branch 'master' of /home/ubuntu/dev/bigbluebutton into reroute-client-messages 2018-04-09 08:27:41 -07:00
Richard Alam
39284f1d18 - start implementing user inactivity timer 2018-04-06 14:52:21 -07:00
Richard Alam
5440bdd1a5 - setup wss in haproxy 2018-03-28 12:31:19 -07:00
Richard Alam
54fcaf70ef - send message through vertx 2018-03-27 17:40:31 -07:00
Richard Alam
b1a56ac285 - add vertx lib 2018-03-25 18:27:57 -07:00
Richard Alam
1eece33887 - send messages 2018-03-23 18:57:58 -07:00
Richard Alam
ef2f7740fc - reroute message 2018-03-23 14:18:04 -07:00
Richard Alam
efaf450472 - allow promoting of non-guest viewers to moderator role 2018-03-23 12:34:50 -07:00
Richard Alam
e6fb4d886d - update locales 2018-03-15 17:59:57 -07:00
Anton Georgiev
77dd01b715
Merge pull request #5228 from MaximKhlobystov/flash-load-without-html5-fix 
[HTML5 Client] Hide client type option when already detected. Vol. 2.
 2018-03-14 17:18:52 -04:00
Anton Georgiev
c52ce83ab4 set max height and width for screenshare to 1080 x 1920 2018-03-09 13:35:37 -05:00
Anton Georgiev
8e0f57c941 linting of kurento-extension.js 2018-03-07 16:23:40 -05:00
Maxim Khlobystov
6a1b70c552 Handling the case when we need to load Flash client and HTML5 client is not installed. 2018-03-07 15:31:01 -05:00
Maxim Khlobystov
cc582eb586 Getting back the code for hiding the client type screen if the type is already detected. 2018-03-07 15:28:20 -05:00
Anton Georgiev
fab5ea6bd7 revert pr 5181 2018-03-05 10:56:42 -05:00
Anton Georgiev
ebfa7214bf revert pr 5181 2018-03-05 10:49:08 -05:00
Anton Georgiev
9219852a95
Merge pull request #5172 from prlanzarin/webrtc-screenshare-fix 
Fixing WebRTC screensharing ICE processing (#4932) and limiting Firefox screensharing choices
 2018-02-28 16:39:01 -05:00
Maxim Khlobystov
5decf88456 Hiding the screen with client options (Flash/HTML5) when it is already detected which one to show. 2018-02-28 11:13:35 -05:00
prlanzarin
ba5f295624 Limited Firefox WebRTC screenshare options to screen only 2018-02-26 18:42:53 +00:00
Anton Georgiev
417acf4d9d
Merge pull request #5125 from prlanzarin/screenshare-fps-ext-prompt 
Limited screensharing FPS to 5-10, resolution to screen size and fixed chrome extension prompt
 2018-02-12 10:39:48 -05:00
Ghazi Triki
a7671dc765 Show lock image if webcamsOnlyForModerator is enabled. 2018-02-10 21:26:06 +01:00
Chad Pilkey
8e5f3093e6 improve interaction between multiuser and cursors 2018-02-09 19:02:34 -05:00
prlanzarin
81afe84079 Limiting screensharing FPS to 5-10 and resolution to screen size 
Also fixes the extension prompt for chrome users in the HTML5 client
 2018-02-08 22:53:18 +00:00
Ghazi Triki
00734d8018 Store role change in session and registered users then propagate the change from akka-apps to bbb-web. 2018-02-08 19:57:57 +01:00
Chad Pilkey
c1fbb22c79
Merge pull request #5106 from antobinary/redirect-mobile-to-html5 
Redirect Android, iOS users to html5 except on Puffin browser
 2018-02-07 16:13:57 -05:00
Richard Alam
34bc824472 - hide broadcast layout button for viewers 2018-02-07 12:36:12 -08:00
Anton Georgiev
cf42513f2b redirect Android, iOS to html5 except on Puffin browser 2018-02-06 18:25:44 -05:00
Fred Dixon
f311422069 Remove 1935 from firewall message 2018-02-06 13:50:43 -06:00
Ghazi Triki
9067baf215 Show record button for all users. 2018-02-05 20:19:49 +01:00
Richard Alam
96a77ef9c6 - remove trace logs 2018-02-05 11:08:56 -08:00
Richard Alam
8188dff9dc - fix double welcome messages 2018-02-05 08:47:41 -08:00
Richard Alam
b91f2abde5 Merge branch 'v2.0.x-release' of github.com:bigbluebutton/bigbluebutton into merge-20-with-master 2018-02-01 12:50:43 -08:00
Richard Alam
5a5232d43d - put logos into its own directory 2018-02-01 08:47:36 -08:00
Richard Alam
6f7669c390 Merge branch 'moderator-message-ui' of https://github.com/riadvice/bigbluebutton into riadvice-moderator-message-ui 2018-02-01 08:26:15 -08:00
Richard Alam
d58f1ec5e7 Merge branch '2.0-updates' of https://github.com/riadvice/bigbluebutton into riadvice-2.0-updates 2018-02-01 07:40:27 -08:00
Fred Dixon
feff36a352
Merge pull request #5076 from riadvice/remove-spark 
Replace remnant spark labels by mx label and text
 2018-02-01 09:03:29 -05:00
Ghazi Triki
26aa84c4cc Replace remnant spark labels by mx label and text. 2018-02-01 11:17:34 +01:00
Ghazi Triki
47cd5309b0 Show "Viewers Locked" when webcamsOnlyForModerator is on. 2018-02-01 10:26:09 +01:00
Fred Dixon
7617828770
Merge pull request #5064 from riadvice/microphone-highlight 
Highlight microphone icon in users list when microphone is locked
 2018-01-31 20:03:53 -05:00
Richard Alam
06faa8a448 Merge branch 'v2.0.x-release' of github.com:bigbluebutton/bigbluebutton into merge-20-with-master 2018-01-31 14:38:43 -08:00
Richard Alam
40b3c6aff8
Merge pull request #5069 from ritzalam/backport-rtmps-support-to-2.0 
Backport rtmps support to 2.0
 2018-01-31 16:43:36 -05:00
Ghazi Triki
e407060486 Fully rely on binding to display chat messages. 2018-01-31 21:40:18 +01:00
Richard Alam
6485110a72 - clean up logging 2018-01-31 08:38:54 -08:00
Richard Alam
c4085c4482 - use proper video context url 2018-01-30 13:17:23 -08:00
Richard Alam
0bc3a06837 - backpot rtmp support 2018-01-30 12:54:20 -08:00
Ghazi Triki
017e324496 Highlight microphone icon in users list when microphone is locked. 2018-01-30 18:30:57 +01:00
Richard Alam
f88f6c3d64 - determine voice connection type 2018-01-30 08:31:20 -08:00
Richard Alam
77a477b5cc - port test connection 2018-01-30 08:16:24 -08:00
Richard Alam
b0e5d61dee - determine port test connection type 2018-01-30 08:16:08 -08:00
Richard Alam
3f467cb579 - remove port test server url 2018-01-30 08:09:10 -08:00
Richard Alam
418d2184a4 - add protocol for bwmon and port test 2018-01-30 07:47:29 -08:00
Richard Alam
e388173f1f - bw mon determine connection type 2018-01-30 07:45:17 -08:00
Richard Alam
a3f3760d49 - add bw mon options and some string constants 2018-01-30 07:43:33 -08:00
Ghazi Triki
018e23d149 Add a new graphic callout for chrome permissions on windows. 2018-01-30 11:45:19 +01:00
Ghazi Triki
83f8d4d393 Merge remote-tracking branch 'bigbluebutton/v2.0.x-release' into 2.0-updates 
# Conflicts:
#	bigbluebutton-client/src/org/bigbluebutton/util/QueryStringParameters.as
 2018-01-30 07:13:54 +01:00
Richard Alam
962b520d6a Merge branch 'v2.0.x-release' of github.com:bigbluebutton/bigbluebutton into merge-20-with-master 2018-01-29 12:53:20 -08:00
Richard Alam
1354b065be Merge branch 'require-auth-token-on-red5-connect' of github.com:ritzalam/bigbluebutton into merge-20-with-master 2018-01-29 12:36:41 -08:00
Richard Alam
b0ce2ac0c1
Merge pull request #5057 from ritzalam/log-network-change-event 
- add more logging when screenshare auto-reconnects
 2018-01-29 10:35:45 -05:00
Richard Alam
e2416dc665 - add more logging when screenshare auto-reconnects 2018-01-29 07:34:41 -08:00
Ghazi Triki
4e46ad806a Acoid null params array in QueryStringParameters. 2018-01-29 14:23:19 +01:00
Ghazi Triki
718d260c9b Do not display user feedback window in breakout rooms. 2018-01-29 07:59:57 +01:00
Ghazi Triki
4c039507e0 Keep only one green color in color pickers. 2018-01-29 07:58:14 +01:00
Fred Dixon
036a23cfb1 Updated copyright date 2018-01-28 13:33:18 -05:00
Fred Dixon
189c05001e Adjusting the wording in Lock Settings dialog 2018-01-28 13:06:58 -05:00
Fred Dixon
728c71c327 Minor tweek in wording for Polling dialog 2018-01-28 12:17:16 -05:00
Richard Alam
7d1d0b55f8
Merge pull request #5026 from ritzalam/require-auth-token-on-red5-connect 
Require auth token on red5 connect
 2018-01-26 17:22:07 -05:00
Richard Alam
4bb9f22a12 - log flash network change event to figure out if that is the one causing reconnects 2018-01-26 13:24:56 -08:00
Richard Alam
b05237b075 Merge branch 'v2.0.x-release' of github.com:bigbluebutton/bigbluebutton into merge-20-with-master 2018-01-26 12:51:39 -08:00
Richard Alam
0985750ae6
Merge pull request #5038 from riadvice/2.0-ui-fixes 
Use a separate label for LoadingBar
 2018-01-26 12:02:37 -05:00
Ghazi Triki
2fc30ec310 Use a separate label for LoadingBar. 2018-01-26 17:06:00 +01:00
Ghazi Triki
5cdf27120e Update ChatMessageRenderer style. 2018-01-26 10:31:59 +01:00
Richard Alam
2297ca50b9 - validate auth token for bbb-voice 2018-01-24 13:58:16 -08:00
Richard Alam
1e60930bc5 - track port test connection and exclude from validating with akka-apps 2018-01-24 08:16:00 -08:00