BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
26,843 Commits 13 Branches 260 Tags 1.1 GiB
e46e6f4fc4
Commit Graph

6188 Commits

Author SHA1 Message Date
Lucas Zawacki
b48e474e84 Make sure stopWatchingExternalVideo works when called as a method and when called from the server 2020-02-27 17:30:35 -03:00
Lucas Zawacki
92a1fba0ae Use extractCredentials in stopWatchingExternalVideo thus fixing it 2020-02-27 16:42:53 -03:00
Lucas Zawacki
0088c348a5 Logic to throttle pause/un-pause messages coming from presenter 2020-02-27 16:42:07 -03:00
Lucas Zawacki
af3ba395ea Change server logger for external-video messages to debug 2020-02-27 15:06:45 -03:00
Lucas Zawacki
2102d0e66f Better handle and explain remote/local timestamp logic 2020-02-27 15:01:04 -03:00
Lucas Zawacki
6cbb4d6592 Adjust seek messages based on local and remote timestamps 2020-02-27 13:39:19 -03:00
Lucas Zawacki
f0d588511c Check presenter status outside of streamer 2020-02-27 13:39:00 -03:00
KDSBrowne
4e045283f4 move remove user option to bottom of dropdown menu 2020-02-27 15:17:24 +00:00
Chad Pilkey
584c115472
Merge pull request #8669 from antobinary/remove-some-atmosphere-packages 
Explicitly import lodash where it is used
 2020-02-26 14:58:52 -05:00
Anton Georgiev
f1fc72bc01 explicitly import lodash where it is used 2020-02-26 14:48:40 -05:00
Chad Pilkey
1912244de2
Merge pull request #8667 from antobinary/remove-some-atmosphere-packages 
Remove some atmosphere packages
 2020-02-26 12:47:50 -05:00
Anton Georgiev
dbc997cc85 explicitly import lodash so we can use _ functions 2020-02-26 10:43:24 -05:00
Anton Georgiev
e6f24fe874
Merge pull request #8650 from KDSBrowne/2.2-shortcut-fix 
Fix broken shortcut keys
 2020-02-24 16:54:38 -05:00
KDSBrowne
3933e04e43 correct typos / fixes broken shortcuts 2020-02-19 18:44:26 +00:00
Chad Pilkey
6a4ba7a300 watch for voice call state updates instead of DTMFs in the client 2020-02-18 14:03:06 -08:00
Pedro Beschorner Marin
8ccd24aefb Fix user-list item text-overflow 2020-02-18 18:31:58 -03:00
Anton Georgiev
4b5c6c65e9
Merge pull request #8613 from antobinary/userId-stuff 
Utilize Meteor session id instead of trusting client side meetingI…
 2020-02-18 11:56:21 -05:00
Anton Georgiev
fafc79b641
Merge pull request #8611 from pedrobmarin/user-list-style 
Unify user-list content style
 2020-02-14 16:54:18 -05:00
Anton Georgiev
4e26af523f
Merge pull request #8639 from antobinary/locales-feb-14-2020 
Pulled HTML5 locales Feb 14, 2020; Added Thai
 2020-02-14 15:48:32 -05:00
Anton Georgiev
9c2797ecd6 Pulled HTML5 locales Feb 14, 2020; Added Thai 2020-02-14 15:46:33 -05:00
Pedro Beschorner Marin
5e3d039ec9
Fixed localization id 2020-02-14 12:12:36 -03:00
Anton Georgiev
11edb3cae9 clear externalvideo stream properly on meeting removed 2020-02-13 16:01:36 -05:00
Anton Georgiev
0834f4bdcc handle edge case for credentials where meeting is removed 2020-02-13 14:40:15 -05:00
Anton Georgiev
1fa426058f corrected issues related to publishing and methods 2020-02-13 14:19:29 -05:00
Lucas Zawacki
c7bba345c6 Remove unused setState playing:true in onReady method 2020-02-12 17:39:45 -03:00
Lucas Zawacki
be9202a648 Adding some checks for null player in getCurrentTime and getCurrentPlaybackRate 2020-02-11 15:08:26 -03:00
Lucas Zawacki
fcecc3bcfe Fix playbackrate state when being set from local player 2020-02-11 15:08:24 -03:00
Lucas Zawacki
a90be659d7 Attempt to limit flow of presenterSync messages just in case 2020-02-11 15:08:21 -03:00
Lucas Zawacki
9f2826949d External video: don't use react state for flags that don't need re-renders 2020-02-11 15:08:18 -03:00
Lucas Zawacki
8165cba402 External video: prevent presenter from sending multiple unecessary play/pause messages 2020-02-11 15:08:13 -03:00
Anton Georgiev
72cb9ae8e0 bind publisher for presentation-upload-token 2020-02-07 17:11:06 -05:00
Anton Georgiev
a8f4827af8 utilize Meteor connection id instead of trusting client side meetingId, userId 2020-02-06 15:48:16 -05:00
Pedro Beschorner Marin
1d87949d65 Unify user-list content style 2020-02-06 16:46:21 -03:00
prlanzarin
10b4a60a57 Fix race condition in video-provider that may cause peers to fail 
The peer object was being fetched only once in the ICE candidate callback, and it would fetch a placeholder empty object (sometimes) which would be kept in the callback closure till the end of the peer lifecycle. With that, the didSDPAnswered state variable which released the outbound ICE queue wouldnt be correctly read and the queue would never be flushed
 2020-01-31 19:32:57 +00:00
Anton Georgiev
e420dc2546 add bbb_show_participants_on_login as a join parameter 2020-01-30 15:43:54 -05:00
Anton Georgiev
de50a4d199 pulled html5 client locales on 2.2 Jan 17, 2020 2020-01-17 20:26:18 +00:00
Chad Pilkey
5ee96f159d
Merge pull request #8507 from capilkey/minor-ext-video-log 
Add the meetingId to the external video sync update logs
 2020-01-17 12:16:09 -05:00
Chad Pilkey
e55d9116a9 add the meetingId to the external video sync update logs 2020-01-17 09:12:44 -08:00
Anton Georgiev
efbe4675b8
Merge pull request #8482 from jfsiebel/streamer-fix 
Fix streamer not working on meteor restart
 2020-01-15 12:25:02 -05:00
Chad Pilkey
ee1b0278d1 adjust external video logs 2020-01-13 15:07:21 -08:00
Lucas Zawacki
4ade850a5a Pause synced video if presenter exits the room 2020-01-13 13:53:49 -03:00
Lucas Zawacki
14fd979955 Remove viewerJoined logic and prevent handleOnReady from running multiple times 2020-01-13 13:53:47 -03:00
Joao Siebel
f95107e3a0 Remove JSON.parse and JSON.stringfy 2020-01-13 13:43:31 -03:00
Joao Siebel
b6c900ca84 Fix annotations and cursor streamer 
The problem was caused when meteor restarted without reloading the page,
the ddp subscription called a onStop event that set all handlers to undefined
after we set the handlers on the init function.
 2020-01-13 09:34:54 -03:00
Chad Pilkey
162dc4dbe4 the client will end the call when kicked 2020-01-09 15:50:10 -08:00
Pedro Beschorner Marin
9b450ae1d9 Check Safari before listening for ondevicechange 2019-12-20 17:21:40 -03:00
Pedro Beschorner Marin
78b0d0276a Avoid multiple cameras sharing in mobile and safari 2019-12-20 17:21:23 -03:00
Pedro Beschorner Marin
bc463cc8f2 Fixed jitter gathering in stats 2019-12-20 17:21:00 -03:00
Anton Georgiev
28ec57b55d
Merge pull request #8443 from capilkey/sipjs-sdp-logging 
Log the selected sip.js candidate
 2019-12-19 16:23:00 -05:00
Anton Georgiev
2b4506fe2d send redis msg when stopping external video due to screenshare 2019-12-19 16:13:21 -05:00
Pedro Beschorner Marin
0bb4d50522
Included missing constant declaration 2019-12-19 11:36:50 -03:00
Chad Pilkey
f5cb7a64fb log the selected sip.js candidate 2019-12-18 16:11:24 -08:00
Anton Georgiev
4e1d55efd2 Prevent parallel screenshare and external-video 2019-12-18 16:40:04 -05:00
Pedro Beschorner Marin
ebef3f7a15 Linter things 2019-12-18 14:50:16 -03:00
Pedro Beschorner Marin
8e129fb961 Included multiple cameras UI 2019-12-18 14:44:56 -03:00
Pedro Beschorner Marin
801ed30a8e Missing after rebase 2019-12-10 13:02:18 +00:00
Pedro Beschorner Marin
8f8463cf91 Log when stats monitor stop 2019-12-10 09:07:07 -03:00
Pedro Beschorner Marin
5c71e2d0bb Included new getStats monitor for audio and video 2019-12-10 09:07:06 -03:00
Pedro Beschorner Marin
a434f61052 Reverting file mode changes 2019-12-10 09:05:04 -03:00
Pedro Beschorner Marin
f5d7be7f00 Making the interface functional for the multiple webcams. This must change after thinking on a design 2019-12-10 09:05:03 -03:00
Pedro Beschorner Marin
315fa755f0 Removed unused video visibility monitor 2019-12-10 09:02:17 -03:00
Pedro Beschorner Marin
ee4a0ff861 Removed the last remains of videoStats 2019-12-10 09:02:17 -03:00
Pedro Beschorner Marin
3b591a086b Unified video providers 2019-12-10 09:02:16 -03:00
Pedro Beschorner Marin
9fcae355c7 joinVideo gets the deviceId 2019-12-10 08:21:22 -03:00
Pedro Beschorner Marin
59bc7f91a1 Refactored video service 2019-12-10 08:21:21 -03:00
Pedro Beschorner Marin
debd8f714a Removed unused session vars logic 2019-12-10 08:21:21 -03:00
Pedro Beschorner Marin
df6dd33c82 Fix for second camera connection 2019-12-10 08:21:21 -03:00
Pedro Beschorner Marin
3d2dd9b11c Sharing webcam with deviceId prefix 2019-12-10 08:21:20 -03:00
Pedro Beschorner Marin
aa51aadea7 Removed extra events 2019-12-10 08:21:20 -03:00
Pedro Beschorner Marin
85b517c6bf Linter stuff 2019-12-10 08:21:20 -03:00
Pedro Beschorner Marin
9da1c29c88 Cleanup 2019-12-10 08:21:19 -03:00
Pedro Beschorner Marin
4eb67c12be Multiple webcams first commit 2019-12-10 08:21:19 -03:00
Chad Pilkey
771079c8f1
Merge pull request #8412 from capilkey/sipjs-sdp-logging 
Fix a typo in the SDP candidate parsing
 2019-12-09 16:17:25 -05:00
Chad Pilkey
ae0ad7ff3b fix a typo in the SDP candidate parsing 2019-12-09 13:16:29 -08:00
Anton Georgiev
a952efe4b2
Merge pull request #8397 from KDSBrowne/update-whos-talking 
Fix elements overlapping whos talking
 2019-12-09 15:28:30 -05:00
Anton Georgiev
c2d90b1d2d
Merge pull request #8323 from KDSBrowne/issue-8290 
Fix restore presentation button overlap (Mobile - Presenter)
 2019-12-09 15:26:32 -05:00
Joao Siebel
88fad50233 WIP streamer stuff 2019-12-06 14:46:58 -03:00
Chad Pilkey
1b94039a4f move sipjs sdp logging properties under extraInfo 2019-12-06 08:40:58 -08:00
Chad Pilkey
50365aa4da extra log messages for sipjs candidates 2019-12-05 16:33:38 -08:00
KDSBrowne
d71b3e67ab clean up css values 2019-12-04 19:48:06 +00:00
Joao Siebel
17a4ad1249 Add cursorUpdate catch log 2019-12-04 15:43:01 -03:00
Joao Siebel
b623f5360e Add settings to enable/disable cursor streamer log 2019-12-04 15:22:31 -03:00
Joao Siebel
209c34f703 Remove allowWrite log 2019-12-04 13:00:55 -03:00
Joao Siebel
8e252500ec Add debug messages to cursor streamer 2019-12-04 12:42:41 -03:00
Chad Pilkey
972b556452
Merge pull request #8389 from capilkey/listenonly-logging-imp 
Listen only logging improvements (2.2 version)
 2019-12-03 12:39:14 -05:00
Chad Pilkey
7218f36e44 listen only logging improvements 2019-12-02 14:15:46 -08:00
KDSBrowne
a0374d61f6 fix indicator being overlapped (mobile portrait) 2019-11-29 15:19:48 +00:00
Pedro Beschorner Marin
cb53b1b5b7 Getting user name from Auth object 2019-11-28 19:00:31 +00:00
prlanzarin
4e55145381 Change VideoService userName fetch to Auth and pass it again to video-provider 2019-11-28 18:49:20 +00:00
prlanzarin
19bf430760 Add userId and userName to the SFU start calls where they were missing 2019-11-28 18:46:23 +00:00
prlanzarin
52d69156ca Fix viewer camera reconnection timers 
Also try to reconnect when ICE fails, a server-side error comes through or the WebRTC stack throws a tantrum, not only when the first connection fails.
 2019-11-28 18:03:14 +00:00
prlanzarin
d3fa2f6508 Add an outbound ice queue to video-provider peers 
Only send candidates after the SDP exchange was locked due stop-start glare
 2019-11-28 18:01:32 +00:00
Richard Alam
bea18c31ce
Merge pull request #8369 from antobinary/audio-log 
Replaced "Audio Error" with a template literal of the error
 2019-11-28 09:56:04 -05:00
Anton Georgiev
2d2c09e914 Replaced "Audio Error" with a template literal of the error 2019-11-27 13:47:40 +00:00
Anton Georgiev
c7c29e37e9
Merge pull request #8368 from felcaetano/enable-change-slides-with-page-up-down 
Swapping PAGE_UP and PAGE_DOWN key bindings
 2019-11-26 17:13:34 -05:00
felcaetano
e13cf362b2
Swapping PAGE_UP and PAGE_DOWN key bindings 
Swapping the keys as requested by @kaitkrull  to fit most of the remotes.
 2019-11-26 19:00:28 -03:00
KDSBrowne
3cd81682f7 make talking indicator display users with the same name 2019-11-26 16:44:58 +00:00
KDSBrowne
7e1727f652 make talking indicator scrollable horizontally 2019-11-26 15:59:26 +00:00
KDSBrowne
b61fa7f9fc fix indicator clipping on safari 2019-11-25 19:24:12 +00:00
KDSBrowne
feba820568 Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into update-whos-talking 2019-11-25 15:41:48 +00:00
KDSBrowne
a3350b6f63 increase padding for talking indicator elements 2019-11-23 17:42:26 +00:00
KDSBrowne
17996bd742 use actual Buttons in indicator / imp spacing 2019-11-22 22:29:41 +00:00
KDSBrowne
2fb55a9325 sort talking users by start time 2019-11-22 22:29:28 +00:00
Anton Georgiev
4ccec9203f
Merge pull request #8358 from capilkey/audio-improvements 
Hangup sip.js on timeout and stop audio join double click
 2019-11-22 17:23:10 -05:00
Chad Pilkey
e2eabfb44f attempt to stop accidental audio join double clicks 2019-11-22 13:55:26 -08:00
Chad Pilkey
66a705a87d hangup the sip.js call when a timeout hits 2019-11-22 13:48:46 -08:00
Tainan Felipe
6e7cdb1f6b Don't skip video preview if called via interface 2019-11-21 14:18:42 -03:00
Anton Georgiev
fc663a1547
Merge pull request #8319 from Tainan404/issue-8297 
Add Skip video preview
 2019-11-20 14:53:07 -05:00
Tainan Felipe
310f5efb4b
Update bigbluebutton-html5/imports/ui/components/video-preview/component.jsx 
Co-Authored-By: Anton Georgiev <antobinary@users.noreply.github.com>
 2019-11-20 16:51:14 -03:00
Tainan Felipe
3bc9933960 Remove preview timer 2019-11-20 15:35:16 -03:00
Tainan Felipe
f908972cec Remove changes on unecessary components 2019-11-20 14:24:54 -03:00
Tainan Felipe
6e9b2da562 Remove auto play component and reuse Video preview gUM 2019-11-20 14:17:42 -03:00
Anton Georgiev
98f4f731d0
Merge pull request #8235 from jfsiebel/update-annotations-streamer 
Update annotations/cursor streamer logic
 2019-11-19 11:56:49 -05:00
Anton Georgiev
1561c7dbea
Merge pull request #8330 from KDSBrowne/who-is-talking 
Add mute functionality to talking indicator
 2019-11-19 11:56:06 -05:00
Anton Georgiev
b2ac52036a
Merge pull request #8333 from antobinary/locales-- 
Pulled HTML5 locales Nov 15
 2019-11-15 18:03:42 -05:00
Anton Georgiev
1c886347a2
Merge pull request #8329 from antobinary/log-tag 
Allow for logTag parameter in settings.yml
 2019-11-15 18:02:45 -05:00
Anton Georgiev
5558399247 Pulled HTML5 locales Nov 15 2019-11-15 17:13:43 -05:00
Anton Georgiev
d0e20d5b96 moved logTag setting into clientLog object for consistency 2019-11-15 16:46:42 -05:00
Richard Alam
1f0e0d1037
Merge pull request #8326 from ritzalam/add-sess-info-for-client-webrtc-calls 
Track client's webrtc call session
 2019-11-15 16:25:59 -05:00
KDSBrowne
24146cfa44 fix RTL position for taking indicator 2019-11-15 17:11:58 +00:00
KDSBrowne
5419ddd965 add formatted messages for aria tags 2019-11-15 15:54:07 +00:00
Anton Georgiev
171d073a45 allow for logTag parameter in settings.yml 2019-11-14 18:09:15 -05:00
Anton Georgiev
52d52cd0d1
Merge pull request #8327 from prlanzarin/2.2-mdns-only 
Account for mDNS candidates on gUM fallback for recvonly peers
 2019-11-14 16:09:40 -05:00
KDSBrowne
a6389c863f reduce navbar height 2019-11-14 20:20:02 +00:00
prlanzarin
b52214f0b5 Make some imports use absolute paths 
Some more linting as well
 2019-11-14 19:07:35 +00:00
KDSBrowne
9b42db0815 use overflow hidden to hide names when width is limited 2019-11-14 18:47:27 +00:00
Anton Georgiev
f8ba84637e
Merge pull request #8128 from felcaetano/enable-change-slides-with-page-up-down 
Added event listener to change slides with Page Up and Page Down
 2019-11-14 13:25:19 -05:00
Anton Georgiev
a221f72702
Merge pull request #8318 from capilkey/cue-on-joins 
Add audio cue and toast on user join settings
 2019-11-14 12:57:33 -05:00
KDSBrowne
3e51d8dc76 extract timeoutHandles to helper 2019-11-14 17:07:02 +00:00
prlanzarin
215f79f383 Account for mDNS candidates on gUM fallback for recvonly peers 
Also added some client logging for those cases

Moved video-provider gUM fallback detection to be used only on recvonly streams
 2019-11-14 16:35:56 +00:00
KDSBrowne
cc11f4d82c clear existing timeout handles 2019-11-14 15:58:07 +00:00
KDSBrowne
4ba3136ec2 fix closed captions position for RTL in userlist 2019-11-14 13:44:00 +00:00
KDSBrowne
a4b46ef3ff fix talking indicator position for RTL 2019-11-14 13:12:22 +00:00
Chad Pilkey
c70577b05f add a counter to sipjs caller id 2019-11-13 16:00:47 -08:00
Chad Pilkey
7fc1e61c48 user join cue improvements 2019-11-13 14:36:23 -08:00
KDSBrowne
a3ee4e7e59 use Date.now() to get current time 2019-11-13 22:11:46 +00:00
KDSBrowne
3e23631389 add ability for moderators to mute users via talking indicator 2019-11-13 17:56:26 +00:00
Joao Siebel
9ed813ea3a Remove streamers on meeting end 2019-11-13 13:53:45 -03:00
KDSBrowne
77acab79bc revert to using Meteor.setTimeout 2019-11-13 16:24:38 +00:00
Anton Georgiev
3cd21c6b28
Merge pull request #8322 from KDSBrowne/text-style-changes 
Update text style
 2019-11-13 10:20:17 -05:00
Chad Pilkey
d81fe936d4 add toast on user join option 2019-11-12 10:00:48 -08:00
KDSBrowne
de48d26106 fix padding for RTL layout 2019-11-12 15:32:11 +00:00
Anton Georgiev
8df82b2676
Merge pull request #8292 from KDSBrowne/who-is-talking 
Add talking indicator to displaying voice users
 2019-11-12 10:24:42 -05:00
Tainan Felipe
278e3eebfc Merge remote-tracking branch 'upstream/master' into issue-8297 2019-11-11 15:17:40 -03:00
Tainan Felipe
fbd8831355 Remove console.log 2019-11-11 15:03:44 -03:00
Tainan Felipe
744b442e14 Remove logs 2019-11-11 14:59:01 -03:00
Tainan Felipe
10d53afeb4 add skip video preview parameter 2019-11-11 14:54:46 -03:00
Chad Pilkey
549804c281 add audio cue on user join setting 2019-11-11 09:53:58 -08:00
KDSBrowne
e718be6936 remove spoke prop from removeVoiceUser modifier 2019-11-11 17:24:36 +00:00
Anton Georgiev
cfb58749e4
Merge pull request #8303 from vitormateusalmeida/webcam-resizable 
Webcam resizable
 2019-11-08 15:28:58 -05:00
Anton Georgiev
938ebbb0ad
Merge pull request #8261 from KDSBrowne/issue-8231 
Add notification when recording started with no mic users
 2019-11-08 14:37:16 -05:00
KDSBrowne
b94ceefef5 change audio_off to warning icon 2019-11-08 19:26:37 +00:00
Anton Georgiev
52a0586431
Merge branch 'master' into issue-8293 2019-11-07 15:55:04 -05:00
Anton Georgiev
81d4a6bed1
Merge pull request #8305 from antobinary/test-7805 
Wrapper for #7805 Add support to new parameter names
 2019-11-07 14:15:09 -05:00
KDSBrowne
2024918a70 fix restore presentation btn overlap on mobile for presenter 2019-11-07 17:33:03 +00:00
Anton Georgiev
1042974f69 sort parameters alphabetically 2019-11-06 15:53:24 -05:00
Vitor Mateus
f1733d0c02 Fix minimum size 2019-11-05 18:42:35 -03:00
Anton Georgiev
43f0ec01a4 accommodate for configuration without shortcuts - do not show error 2019-11-05 16:36:03 -05:00
Chad Pilkey
3565331d7a send user's role with feedback 2019-11-05 13:16:34 -08:00
Tainan Felipe
ca144ea73e Add bbb_preferred_camera_profile to user data parameters 2019-11-05 17:23:13 -03:00
KDSBrowne
1e9d689733 remove Meteor.setTimeout 2019-11-05 20:19:50 +00:00
Vitor Mateus
62ea5f247c Fix webcam size when minimize presentation 2019-11-05 16:40:29 -03:00
Vitor Mateus de Almeida
3f1ff2c65c Fix webcam size when minimize presentation 2019-11-05 16:26:45 -03:00
Vitor Mateus
c345be954e Fix re-render in draggable component 2019-11-05 16:23:40 -03:00
Vitor Mateus
4254bcb4ca Change the video height to avoid webcam overflow 2019-11-05 16:23:23 -03:00
Vitor Mateus
0e67c0e523 Resize improvements 2019-11-05 16:23:00 -03:00
Vitor Mateus
67e6b90fae Anable resize when single webcam 2019-11-05 16:22:38 -03:00
Vitor Mateus
c0005b93c1 Webcams area resizable 2019-11-05 16:22:01 -03:00
Anton Georgiev
ecb89b0d92 Pulled html5 locales Nov 5, added Romanian 2019-11-05 13:05:41 -05:00
KDSBrowne
ae5286264b add sorting to users in talking indicator 2019-11-05 17:10:59 +00:00
Anton Georgiev
42d640f3e2 Merge branch 'issue7791-add-support-to-new-parameters-name' of github.com:diegobenetti/bigbluebutton into test-7805 2019-11-05 11:59:00 -05:00
KDSBrowne
b07b26d95b bold user names in typing indicator 2019-11-04 16:29:14 +00:00
KDSBrowne
e242d26f2d remove bold text from .joinedUserNames in breakoutroom panel 2019-11-04 15:08:44 +00:00
KDSBrowne
8b4247f5e4 add height to navbar 2019-11-04 14:45:52 +00:00
KDSBrowne
4a6bdbf028 add talk indicator displaying voice users 2019-11-01 19:29:33 +00:00
Anton Georgiev
8da73912f5
Revert "Webcams area resizable" 2019-11-01 14:24:18 -04:00
Joao Siebel
72cc05abee Merge with cursor streamer stuff 2019-10-31 19:20:46 -03:00
Joao Siebel
2443515cef Merge remote-tracking branch 'upstream/master' into update-annotations-streamer 2019-10-31 19:18:23 -03:00
Vitor Mateus de Almeida
02732a8dbe Merge remote-tracking branch 'upstream/master' into issue-7855 2019-10-31 18:17:30 -03:00
Vitor Mateus de Almeida
5686bb223a Fix webcam size when minimize presentation 2019-10-31 18:11:26 -03:00
Richard Alam
4c6bdebd00
Merge pull request #8225 from riadvice/big-pdf-conversion 
Detect big PDF files and check the page size
 2019-10-29 16:47:26 -04:00
KDSBrowne
655af26b32 replace negative lookahead (not supported by firefox) 2019-10-27 14:18:16 +00:00
Fred Dixon
4abbc27776
Merge pull request #8262 from KDSBrowne/issue-8197 
Fix quick poll detecting wrong options
 2019-10-26 15:03:38 -04:00
KDSBrowne
84d109fe2e improve yes / no and true / false detection 2019-10-26 13:38:04 +00:00
KDSBrowne
7339686b69 fix quickpoll showing invalid option 2019-10-26 13:37:24 +00:00
KDSBrowne
919a84d1d6 fix quick poll btn placement 2019-10-26 13:19:13 +00:00
Chad Pilkey
927cbf35bb add option to reconnect audio with relay only 2019-10-26 02:57:49 +00:00
KDSBrowne
b84fb714f5 add notification when starting recording with no mic users 2019-10-25 20:34:28 +00:00
Chad Pilkey
37b5286d3b throttle the pencil updates and increase cursor throttle 2019-10-24 15:25:50 -07:00
Joao Siebel
d5865d49db Update cursor streams logic 2019-10-24 17:49:21 -03:00
Chad Pilkey
fe654539a0
Merge pull request #8226 from KDSBrowne/issue-8214 
Exit main audio when moderator joins breakoutroom via panel
 2019-10-24 14:36:54 -04:00
Joao Siebel
eecf0bcfd1 Update streamer to use Meteor.StreamerCentral 2019-10-24 15:03:05 -03:00
Chad Pilkey
5f356338c8
Merge pull request #8241 from capilkey/adj-extvideo-sync-interval 
Adjust external video sync interval and emit check
 2019-10-24 13:43:28 -04:00
Anton Georgiev
3d3e5d0c17
Merge pull request #8245 from capilkey/fix-breakout-joinURL 
Only request a breakout join URL once
 2019-10-24 13:11:04 -04:00
Chad Pilkey
297c06e507 only request a join URL once 2019-10-24 10:01:39 -07:00
Chad Pilkey
6cccfb2ada
Merge pull request #8168 from KDSBrowne/issue-8112 
Extend help text shown when getUserMedia with microphone fails
 2019-10-24 12:28:53 -04:00
Joao Siebel
bbbd97929d Merge remote-tracking branch 'upstream/master' into update-annotations-streamer 2019-10-24 10:41:20 -03:00
Chad Pilkey
51b70a1361 only attempt to stop ext video if it's sharing 2019-10-23 14:20:57 -07:00
Chad Pilkey
7174050fb3 adjust external video sync interval and emit check 2019-10-23 13:29:06 -07:00
Chad Pilkey
5966923ae9
Merge pull request #8232 from lfzawacki/detect-autoplay-problems-external-video 
Fix multiple external videos synced to different meetings
 2019-10-23 16:18:23 -04:00
Lucas Zawacki
a17b28b23f Fix variable definition in initializeExternalVideo 2019-10-23 16:24:34 -03:00
Lucas Zawacki
47661f2b08 Don't initialize streamer more than once, delete streamer object when meeting ends 2019-10-23 16:21:10 -03:00
Joao Siebel
d0f0d91c01 Update annotations streams logic 2019-10-22 22:26:25 -03:00
Lucas Zawacki
16c1931eed Add initializeExternalVideo 2019-10-22 18:18:54 -03:00
Lucas Zawacki
9c76f62e63 Fix multiple external videos synced to different meetings 2019-10-22 17:19:57 -03:00
KDSBrowne
c548332b94 improve audio modal help content spacing 2019-10-22 19:32:04 +00:00
Chad Pilkey
692eec9a94
Merge pull request #8192 from lfzawacki/detect-autoplay-problems-external-video 
Don't run synchronization code on a player with autoplay blocked and add an autoplay warning
 2019-10-21 18:22:57 -04:00
Chad Pilkey
9b0b92b6a2
Merge pull request #8174 from KDSBrowne/issue-8160 
Fix actions button misplacement in RTL mode
 2019-10-21 17:05:47 -04:00
Ghazi Triki
cd944d4770 Add missing PdfConversionInvalidErrorEvtMsg event to be sent to the web client. 2019-10-21 13:33:40 +01:00
Richard Alam
62e5e599d3 - add timestamp field to messages sent from html5 server 2019-10-18 09:50:38 -07:00
KDSBrowne
6b556c6d1b make audio exit when moderator joins breakoutroom via panel btn 2019-10-17 20:42:14 +00:00
Lucas Zawacki
25b4c93283 Better style for autoplay blocked message that does not obscure play button 2019-10-16 14:48:12 -03:00
Lucas Zawacki
ceb8853231 Prevent problems if presenter reconnects while sharing a video 2019-10-16 14:48:09 -03:00
Lucas Zawacki
926d4bb36e Destructure assignments and fix wrong assignment for isPresenter 2019-10-16 14:47:22 -03:00
Ghazi Triki
ba109530ae Disallow converting PDF files that have at least one big weighted page. 2019-10-16 08:37:03 +01:00
Vitor Mateus
a7b05b3b49 Fix re-render in draggable component 2019-10-14 18:30:13 -03:00
Lucas Zawacki
24198c48a6 Prevent erroneous autoplay warning if video player sends multiple ready messages 2019-10-10 19:09:39 -03:00
Lucas Zawacki
30b303a6d4 Making sure we show controls for all video formats because viewer always need to change volume 2019-10-10 19:09:39 -03:00
Lucas Zawacki
dcd0ea7d5d Fix style of external video modal after adding new note 2019-10-10 19:09:31 -03:00
Lucas Zawacki
22be388b70 Remove unused intl variable from external-video 2019-10-10 18:01:27 -03:00
Lucas Zawacki
0b99a4cf63 Add supported video urls in external video modal note 2019-10-09 12:51:17 -03:00
Lucas Zawacki
1fb6922712 Properly show/hide controls for more kinds of external video players 2019-10-09 11:54:54 -03:00
Chad Pilkey
782b705f66 limit width of the webcam preview video 2019-10-08 14:16:16 -07:00
Chad Pilkey
42bad2142e fix check for heapdump enabled 2019-10-08 10:40:53 -07:00
Lucas Zawacki
ec88bd24e4 Prevent viewers from playing before video has loaded for presenter 2019-10-07 15:42:37 -03:00
Lucas Zawacki
290cd481e5 Don't run synchronization code on a player with autoplay blocked and add an autoplay warning 2019-10-07 14:45:16 -03:00
Chad Pilkey
c0066f4969
Merge pull request #8187 from capilkey/invert-lock-colours 
Invert toggle colours in the lock settings
 2019-10-04 17:46:35 -04:00
Chad Pilkey
c2fe9ec62b invert toggle colours in the lock settings 2019-10-04 14:45:09 -07:00
prlanzarin
3ac4acde6f Remove screensharing option from Safari by UA checks 2019-10-04 17:10:30 +00:00
Lucas Zawacki
0af7534c96 A few more checks to prevent errors with the Arc Player 2019-10-03 17:50:59 -03:00
Chad Pilkey
9a0c97e50c
Merge pull request #8077 from jfsiebel/lock-modal-update 
Update lock viewers modal
 2019-10-03 13:27:28 -04:00
Joao Siebel
f17e9fc879 Tweak css 2019-10-03 11:23:10 -03:00
Chad Pilkey
8a2a289803
Merge pull request #8033 from KDSBrowne/issue-8003 
Prevent multiple long names in typing indicator from moving input
 2019-10-02 16:41:25 -04:00
KDSBrowne
31ea62d71f make indicator names use full panel width / add blank space 2019-10-02 20:33:45 +00:00
KDSBrowne
6a478d1409 fix actions button misplacement in RTL 2019-10-02 16:51:53 +00:00
KDSBrowne
d3750c7bc0 change delimiter to and instead of comma / fix word spacing 2019-10-02 05:02:51 +00:00
Chad Pilkey
873f9f5f47 add the breakout number to the tab title 2019-10-01 11:42:10 -07:00
Joao Siebel
85b1070179 Update labels and css 2019-10-01 15:15:49 -03:00
KDSBrowne
4fd06509e4 fix chrome on ios error being displayed incorrectly 2019-10-01 14:28:06 +00:00
Chad Pilkey
62872c50e8
Merge pull request #8054 from jfsiebel/multiple-upload-problem 
Fix multiple clicks on upload button
 2019-09-30 17:26:15 -04:00
Chad Pilkey
660d5ff290
Merge pull request #8150 from jfsiebel/add-heapdump-dependency 
Add heapdump dependency
 2019-09-30 16:15:10 -04:00
KDSBrowne
cce5755b2c typing indicator remove elipsis animation / reduce to show max 2 names 2019-09-30 19:50:35 +00:00
KDSBrowne
89853dc026 move microphone error codes to const 2019-09-30 14:54:34 +00:00
Chad Pilkey
f8dedc1538 remove redundant lookups to Breakouts 2019-09-27 22:59:55 +00:00
Chad Pilkey
1695352300 Merge remote-tracking branch 'upstream/master' into fix-breakout-start-stop-notify 2019-09-27 22:40:38 +00:00
Chad Pilkey
64c3bcce13
Merge pull request #8158 from capilkey/bo-user-list 
List users in a breakout in the breakout panel
 2019-09-27 18:35:17 -04:00
Chad Pilkey
6a4cd316ed fix breakout panel bg and simplify sort 2019-09-27 22:33:18 +00:00
Chad Pilkey
3dd4761889
Merge pull request #8157 from capilkey/viewer-webcam-lock-unshare 
Viewer webcam lock unshare
 2019-09-27 18:20:26 -04:00
Chad Pilkey
7753750721 fix video provider option property name 2019-09-27 22:18:16 +00:00
Chad Pilkey
71902c9dc0
Merge pull request #8114 from KDSBrowne/issue-8002 
Fix unread indicator not displaying with long names
 2019-09-27 16:57:40 -04:00
Chad Pilkey
946471c4b7
Merge pull request #8028 from KDSBrowne/issue-8026 
Prevent close btn remaining visible on mobile (user dropdown)
 2019-09-27 16:31:27 -04:00
KDSBrowne
efc2307467 Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into issue-8003 2019-09-27 20:18:45 +00:00
Chad Pilkey
f40048cbd6
Merge pull request #8130 from jfsiebel/limit-join-breakout-room 
Prevent user to connect again if already in breakout room
 2019-09-27 16:18:38 -04:00
Chad Pilkey
d87bd8d058
Merge pull request #8134 from KDSBrowne/issue-8049 
Fix mis-aligned audio permission hint modal (RTL)
 2019-09-27 16:05:29 -04:00
Tainan Felipe
9f360a3181 Add comma to join paramenter, key for breakout item and fix class typo 2019-09-27 16:45:55 -03:00
Chad Pilkey
8de091ddf3
Merge pull request #8154 from capilkey/bitrate-only-profiles 
Bitrate only webcam profiles and error handling
 2019-09-27 15:35:38 -04:00
Chad Pilkey
cf1a444c4c
Merge pull request #8103 from KDSBrowne/issue-8102 
Remove Viewers from Users Typing when User list is locked
 2019-09-27 14:37:49 -04:00
Tainan Felipe
b0f2e16f86 Add propTypes and redo variable types 2019-09-27 15:01:11 -03:00
KDSBrowne
636f49cd5d add error messages for getUserMedia failing with mic 2019-09-27 13:52:29 +00:00
KDSBrowne
81c8f2221f replace string literal with value from settings.yml 2019-09-27 13:45:01 +00:00
Chad Pilkey
c7d481c042
Merge pull request #8110 from lfzawacki/fix-8044 
Detect presenter change and reassign external video to new presenter
 2019-09-26 19:24:29 -04:00
Joao Siebel
f365c50fd0 Relax autoSwapLayout constraints 
now it's possible to minimize the presentation even if there
is no webcam being shared.

close #8129
 2019-09-26 17:14:05 -03:00
Chad Pilkey
5b3cb27c63
Merge pull request #8126 from lfzawacki/fix-swap-no-presentation 
Fix auto swap race condition
 2019-09-26 15:28:46 -04:00
Chad Pilkey
6c0358ae90 bitrate only webcam profiles and error handling 2019-09-26 18:28:37 +00:00
Joao Siebel
678e81e8f2 Add configuration to enable the heap dump file 
and create a rule to only generate a new heap dump
if the current memory usage is bigger than the given threshold
 2019-09-24 18:50:37 -03:00
Joao Siebel
35061811b7 Add heapdump dependecy 2019-09-24 17:09:56 -03:00
Vitor Mateus
f91f0a20da Change the video height to avoid webcam overflow 2019-09-23 14:58:03 -03:00
KDSBrowne
830fb4252d remove unused css variables 2019-09-19 13:43:53 +00:00
felcaetano
83c1cba273 Added a switch statment to keep the code cleaner as suggested by @capilkey 2019-09-18 20:29:09 -03:00
Chad Pilkey
0a9854aa59 fix issues related to breakouts start/stop and page reload 2019-09-18 13:11:25 -07:00
Joao Siebel
feec32313b Add key property to button 2019-09-18 17:00:32 -03:00
Joao Siebel
07ff12ce53 Prevent user to connect multiple times in a breakout room 
Disable the option to join a room in breakout room panel
if the user is already connected to the breakout room

close #8029
 2019-09-18 15:55:06 -03:00
KDSBrowne
8593b8607c center permission hint on safari 2019-09-18 18:02:29 +00:00
felcaetano
de22a644d6 Added event listener to change slides with Page Up and Page Down 
This used to be a feature in the Flash client and this is necessary for presentation remotes to work with the HTML client.
 2019-09-18 14:12:05 -03:00
Tainan Felipe
6b78a203b9 Fix typos and user list service export function 2019-09-18 09:32:00 -03:00
Lucas Zawacki
5dd46f8f48 Fix video swap when there's no presentation and/or screenshare/external video 2019-09-17 16:55:52 -03:00
Tainan Felipe
4ebe787c76 Add breakout room members under the breakout room name 2019-09-17 16:36:39 -03:00
Vitor Mateus
5d7470a251 Resize improvements 2019-09-17 15:25:28 -03:00
KDSBrowne
e7b53d34eb fix position of audio permission modal in RTL (chrome / firefox) 2019-09-17 15:07:31 +00:00
Lucas Zawacki
f548281a07 Fix random swappings happening outside of the media service 2019-09-16 19:06:02 -03:00
Tainan Felipe
966debb341 Fix viewer webcam not unsharing when lock setting is enable 2019-09-16 11:15:18 -03:00
KDSBrowne
680e6cceb2 fix unread indicator not showing with long names 2019-09-13 18:00:02 +00:00
Anton Georgiev
80486f8f5d
Merge pull request #8078 from Tainan404/move-time-remaing-to-own-collection 
Move meeting time remaining to own collection.
 2019-09-12 15:48:33 -04:00
Lucas Zawacki
4f7cfb8198 Detect presenter change and reassign external video to new presenter 2019-09-12 14:15:35 -03:00
Anton Georgiev
620fe746da
Merge pull request #8098 from antobinary/external-video-player 
Use react-player for external video playback and add arc player support
 2019-09-12 08:18:17 -04:00
Lucas Zawacki
00684f72ac Send most updated version of state.playing into the external video handlers 2019-09-11 18:43:25 -03:00
Anton Georgiev
884c5bcdc4
Merge pull request #8063 from Tainan404/video-performance 
Move hasStream to video-users collection
 2019-09-11 17:43:01 -04:00
KDSBrowne
dc1dd17d8a prevent viewers seeing other viewers when hidden from userlist 2019-09-11 16:43:11 +00:00
Chad Pilkey
7d04a33993 restore breakout name in invitation modal 2019-09-10 16:26:54 -07:00
Anton Georgiev
208007926d improve on muting externalVideo while in echoTest 2019-09-10 16:36:56 -04:00
Anton Georgiev
dc0f68ba89 unsubscribe listeners when unmounting externalVideoPlayer 2019-09-10 16:36:35 -04:00
Anton Georgiev
4e38e08ec0 tweaks to #8006 share external video 2019-09-10 16:36:19 -04:00
Anton Georgiev
43c0670ed8 Merge branch 'new-arc-player' of github.com:lfzawacki/bigbluebutton into external-video-player 2019-09-10 16:35:50 -04:00
Vitor Mateus
04a709cd32 Anable resize when single webcam 2019-09-10 16:41:11 -03:00
Anton Georgiev
504e1197a1
Merge pull request #8093 from prlanzarin/2.2-ss2 
Display error toasts on screenshare failures, more log improvements
 2019-09-10 13:48:38 -04:00
prlanzarin
7779a5e3a9 Display error toasts for screensharing, improve logs a bit more 2019-09-10 16:20:40 +00:00
KDSBrowne
3d74e3c5c9 update arrow char so it works with ios and others 2019-09-10 14:20:37 +00:00
Joao Siebel
a69509110a Merge remote-tracking branch 'upstream/master' into lock-modal-update 2019-09-10 10:52:17 -03:00
Joao Siebel
520861e05f Update lock modal and toggle component 
With this commit is possible to have a toggle without text
just need to pass a showToggleLabel prop with a false value.
 2019-09-10 10:43:06 -03:00
Chad Pilkey
2d12b01fef
Merge pull request #8084 from antobinary/memory-usage 
Add monitor for memory usage in nodejs html5
 2019-09-09 16:37:00 -04:00
Tainan Felipe
d1a0286c06 Fix wrong data fetch 2019-09-09 16:30:14 -03:00
Anton Georgiev
8172da84af
Bumped up loglevel of memwatch to 'info' 
in settings.yml we have set to not log < info so these would not be logged if 'debug'
 2019-09-09 15:21:27 -04:00
Anton Georgiev
7cf742ad6e
Merge pull request #8080 from capilkey/fastdom-chat 
Improve chat rendering performance and rework read message detection
 2019-09-09 15:19:39 -04:00
Anton Georgiev
f0a35a7381 add monitor for memory usage in nodejs html5 2019-09-09 14:45:54 -04:00
Chad Pilkey
872681a699 improve chat rendering performance and rework read message detection 2019-09-09 17:08:36 +00:00
Vitor Mateus
4d14604bf1 Merge remote-tracking branch 'upstream/master' into issue-7855 2019-09-09 13:40:10 -03:00
Tainan Felipe
80a8d29113 Fix typo 2019-09-09 11:48:50 -03:00
Tainan Felipe
d3b9db47e8 Move remaining time from meeting collection to meetingRecordingTime collection 2019-09-09 11:29:59 -03:00
Joao Siebel
4f00c6b994 Update lock viewers modal 
With this changes you need to click apply button
in order to lock have effect, also update the lock text.

close #7766
 2019-09-09 11:21:54 -03:00
Chad Pilkey
f471b1e2b9
Merge pull request #8072 from prlanzarin/2.2-abort-play 
Fixes to client-side screenshare/listen only code and log improvements
 2019-09-06 18:37:22 -04:00
Chad Pilkey
bd01ab02aa
Merge pull request #8073 from antobinary/clear-chat 
Reduce db probes for getAvailableActions; Simplify SaveUsernames
 2019-09-06 18:11:15 -04:00
Anton Georgiev
9e41cbf877 remove incorrectly duplicated import 2019-09-06 18:08:37 -04:00
Anton Georgiev
03653df5fb obtain actions from container closer to where used 2019-09-06 18:01:12 -04:00
prlanzarin
73698b1064 Fix playAndRetry import 2019-09-06 20:54:48 +00:00
Anton Georgiev
c410098fd3
Merge pull request #8066 from antobinary/clear-chat 
Reliably check mod status for clearing chat
 2019-09-06 16:28:34 -04:00
Anton Georgiev
4a335a1db6 reduce db probes for getAvailableActions; simplify SaveUsernames 2019-09-06 16:28:02 -04:00
prlanzarin
c8a88148e1 Improve log message for screenshare/listen only/autoplay and harden media play with retries 2019-09-06 18:58:22 +00:00
Anton Georgiev
a98c515fae
Merge pull request #8070 from capilkey/fix-mic-failures 
Fix microphone failure detection
 2019-09-06 12:59:18 -04:00
Anton Georgiev
d0540c3f7e
Merge pull request #8069 from KDSBrowne/issue-8052 
Fix chat error message alignment (RTL)
 2019-09-06 12:57:55 -04:00
Tainan Felipe
957225fabf Rename collection to video-streams 2019-09-06 13:50:31 -03:00
Chad Pilkey
def6fe607a fix video preview select box warning 2019-09-06 09:38:08 -07:00
Chad Pilkey
35595a18ba fix microphone failure code 2019-09-06 09:35:55 -07:00
Anton Georgiev
c646351823
Merge pull request #8068 from KDSBrowne/issue-8051 
Fix space next to current presentation (RTL)
 2019-09-06 11:42:24 -04:00
KDSBrowne
cbf69ecd63 fix chat error / info message alignment in rtl 2019-09-06 15:37:08 +00:00
KDSBrowne
e9b28b8848 add space between current presentation / presentation file name (rtl) 2019-09-06 15:35:47 +00:00
KDSBrowne
b081a0f5dc increase spacing for keyboard shortcuts modal (rtl) 2019-09-06 15:34:15 +00:00
Anton Georgiev
c4dde48190 reliably check mod status for clearing chat 2019-09-06 11:15:42 -04:00
Tainan Felipe
a4b532e814 Fix typo 2019-09-06 10:22:57 -03:00
Tainan Felipe
7e8de34583 Remove index from userId 2019-09-06 10:19:18 -03:00
Tainan Felipe
c27ff18958 Merge remote-tracking branch 'upstream/master' into video-performance 2019-09-06 10:16:22 -03:00
Tainan Felipe
3d8e0be9fe Filter user collection fields 2019-09-05 17:03:22 -03:00
Tainan Felipe
060e82dddf Move hasStream to video-users collection 2019-09-05 15:29:30 -03:00
Chad Pilkey
3003afd13e fix chat sort and private chat close/restore 2019-09-05 11:26:54 -07:00
Chad Pilkey
fd8d4fa76f remove duplicate User and VoiceUser fetch in user-list-item 2019-09-05 11:21:07 -07:00
Chad Pilkey
304bb2c103
Merge pull request #8030 from antobinary/chat-ids-2 
Reduced client load via slight refactor
 2019-09-05 13:23:37 -04:00
Anton Georgiev
c5856d43c8 moved static code outside of tracker 2019-09-04 14:32:58 -04:00
Chad Pilkey
b33e247f44 change audio error code log property 2019-09-04 11:16:14 -07:00
Anton Georgiev
841e04fa0f pass count of breakout users rather than calculate on component 2019-08-30 16:14:42 -04:00
Anton Georgiev
7ec10d779a adjust flipped check for Moderator, isGuest, etc 2019-08-30 16:13:40 -04:00
Anton Georgiev
8b1f6913c4 move componentWillUnmount after componentDidUpdate 2019-08-30 16:05:30 -04:00
Anton Georgiev
2cbe91e222
Merge pull request #7996 from KDSBrowne/issue-7994 
Fix join by phone icon placement in RTL
 2019-08-30 09:43:31 -04:00
Joao Siebel
5a4ae178ec Fix multiple clicks on upload button 
close #8016
 2019-08-30 09:48:59 -03:00
KDSBrowne
06d61cfc00 prevent multiple long names moving chat input 2019-08-29 18:50:33 +00:00
Anton Georgiev
f9efd8db96 remove unnecessary prop isBreakoutRoom 2019-08-29 12:32:29 -04:00
Anton Georgiev
ea18b09311 add a few more collection lookups "fields" delimiters 2019-08-29 12:26:07 -04:00
KDSBrowne
201c46f502 prevent user dropdown close btn remaining visible on mobile 2019-08-29 14:57:40 +00:00
KDSBrowne
3e38a4f7d2 move arrow position 2019-08-29 14:26:51 +00:00
Anton Georgiev
b71dba2299
Merge pull request #7955 from KDSBrowne/001-fix-audio-logs 
Fix mute audio log
 2019-08-29 09:59:49 -04:00
Anton Georgiev
02b73c491a
Merge pull request #8012 from KDSBrowne/issue7734 
Update join breakout room modal RTL style
 2019-08-29 09:56:53 -04:00
KDSBrowne
e535d890d0 switch to moderator_action to user_action 2019-08-28 20:42:55 +00:00