Commit Graph

19773 Commits

Author SHA1 Message Date
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
9e62dfb979 Merge branch 'riadvice-2.0-updates' into v2.0.x-release 2018-02-01 08:00:21 -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
Fred Dixon
4d9138300a
Merge pull request #5075 from riadvice/2.0-ui-fixes
Show "Viewers Locked" when webcamsOnlyForModerator is on
2018-02-01 09:03:07 -05:00
Tainan Felipe Pauli de Almeida
fd9dfbf89b fix more linter errors 2018-02-01 09:31:17 -02:00
Tainan Felipe Pauli de Almeida
1bdf08b260 lock logic passed to the parent 2018-02-01 09:09:33 -02: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
c0f0303051
Merge pull request #4027 from hakaz/patch-1
Issue #3985: bbb-conf --debug incorrectly flags
2018-01-31 20:08:08 -05: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
Fred Dixon
af9d70896e
Merge pull request #5071 from ffdixon/fix-bbb-conf-4
Fix bbb-conf to correctly use rtmp[s] with porttest
2018-01-31 17:37:48 -05:00
Fred Dixon
1a6b5b1aac Fix bbb-conf to correctly use rtmp[s] with porttest 2018-01-31 16:36:48 -06: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
bdf6f6c953 - new signed screenshare jar 2018-01-31 10:32:18 -08:00
Richard Alam
6485110a72 - clean up logging 2018-01-31 08:38:54 -08:00
Anton Georgiev
528f94b15a
Merge pull request #5062 from antobinary/html5-daily-log-rotation-2
Added daily log rotation in production env
2018-01-31 11:11:58 -05: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
Anton Georgiev
f789842ccb
Merge pull request #5009 from KDSBrowne/z.0.6-prevent-ghost-user
Prevent kicked user's ability to rejoin meeting via back btn
2018-01-30 15:10:46 -05:00
Anton Georgiev
ef9c21cadf
Merge pull request #5053 from prlanzarin/sfu-logging
Added better logging capabilities to bbb-webrtc-sfu
2018-01-30 15:01:59 -05:00
Ghazi Triki
017e324496 Highlight microphone icon in users list when microphone is locked. 2018-01-30 18:30:57 +01:00
Tainan Felipe Pauli de Almeida
ff7273973a fix some linter errors 2018-01-30 14:41:45 -02:00
KDSBrowne
5b93033126 remove window.popstate and add onLeave to meeting-ended route 2018-01-30 08:39:43 -08:00
Tainan Felipe Pauli de Almeida
cba6628de0 add to the functionality of deactivating the videodock via settings 2018-01-30 14:32:37 -02: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
KDSBrowne
2809b6a825 remove setTimeout and add handler 2018-01-30 08:12:05 -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
Richard Alam
fb08ced80f - add exception logging on jws 2018-01-30 07:43:07 -08:00
Anton Georgiev
ab39163070 put month before day in log rotation name 2018-01-30 10:37:00 -05:00
prlanzarin
5e384e2d4a bbb-webrtc-sfu now rotates logs daily 2018-01-30 13:50:43 +00:00
Fred Dixon
a43a16c695
Merge pull request #5063 from riadvice/chrome-graphic-callout
Add a new graphic callout for chrome permissions on windows
2018-01-30 07:48:55 -05:00
Tainan Felipe Pauli de Almeida
0bfe3093c0 add interface for data saving tab 2018-01-30 09:20:51 -02: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
KDSBrowne
6b1e39008c move if condition for User.ejected 2018-01-29 20:23:56 -08:00
prlanzarin
281a14baf8 Merge remote-tracking branch 'upstream/v2.0.x-release' into sfu-logging 2018-01-29 22:51:53 +00:00
Anton Georgiev
9e05f346c7 added daily log rotation in production env 2018-01-29 16:50:32 -05:00
KDSBrowne
aa4a7ef48c clean up code 2018-01-29 11:07:02 -08:00
Fred Dixon
d33ac4a273
Merge pull request #5059 from riadvice/remove-java-check
Remove Java check in bbb-client-check
2018-01-29 13:39:45 -05:00
KDSBrowne
90bfea5d77 check if user was ejected 2018-01-29 10:17:52 -08:00
Ghazi Triki
0ae70f4d4d Remove Java check from bbb-client-check. 2018-01-29 18:19:37 +01: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