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

646 Commits

Author SHA1 Message Date
Lars Kiesow
f1763cede6
[HTML5 Client] Camera Profile Documentation 
This patch adds a short comment block to the HTML5 client's
configuration file explaining the options available for the camera
profiles. Having this in the configuration file helps as a quick
reference and means that administrators do not need to find external
sources of information.
 2020-06-14 00:37:59 +02:00
mw781
17350a57fe Implement own video mirroring 2020-06-12 23:39:41 +01:00
Anton Georgiev
1ba6d10c0a
Update copyright year in html5 client 2020-06-05 09:20:18 -04:00
Anton Georgiev
f510fdc484
Merge pull request #9517 from KDSBrowne/2.2-restore-presentation-on-update 
Restore minimized presentation for viewer on (slide or zoom change / pub…
 2020-05-29 13:20:31 -04:00
Anton Georgiev
29afdafd3e
Merge pull request #9658 from konkret-devils/v2.2.x-release 
Add bbb_show_public_chat_on_login as a join (co-) parameter
 2020-05-29 12:42:59 -04:00
Anton Georgiev
ac6fd2824c
Merge branch 'develop' into 2.3-audio-stats 2020-05-26 12:36:15 -04:00
Martin Beckmann
630f3393aa Integration of PR #9292 (by weeman1337) and PR #9658 (by mantridereso) 
..oops, forgot to update settings.yml
 2020-05-26 15:17:11 +02:00
Anton Georgiev
c9e996de21 Merge branch 'v2.2.x-release' of github.com:bigbluebutton/bigbluebutton into merge-2.2-into-develop 2020-05-25 17:32:24 +00:00
Anton Georgiev
66f11468ac
Merge pull request #9631 from KDSBrowne/issue-9592 
Fix userData-shortcuts causing client crash
 2020-05-21 15:01:49 -04:00
Anton Georgiev
ead986e3e2
Merge pull request #9542 from prlanzarin/upstream-2.2-safari-ss 
Screenshare: add support on Safari 13+ and make constraints configurable
 2020-05-21 14:38:32 -04:00
prlanzarin
2cba85e866 html5: refactor STUN/TURN fetch, add fallback STUN, fix deadlock in audio join 
Refactored STUN/TURN fetch to be done only once, when successful, per session and cache it in mem to avoid too many reqs. Current way is a bit dumb, this should increase reliability a bit more. The caching is configurable so folks who want to use very short lived TURN credentials can disable it

Add a fallback STUN config option to be used when the default STUN/TURN fetch fails

Clean the safari/no candidate generation pre flight check from 3rd party STUNs

Fix deadlock in audio join when STUN/TURN fetch failed
 2020-05-21 04:35:17 +00:00
KDSBrowne
13cf0799a1 fix shortcuts passed as userData not activating 2020-05-20 13:47:04 +00:00
prlanzarin
e875408f8d screenshare: add support on Safari 12.1+ and make constraints configurable 
This adds support for screensharing on Safari 12.1+ or whichever has getDisplayMedia enabled

To be conservative and backwards compatible, I`ve maintained the current gUM-based code available as a fallback for those still using older versions of FF or Chrome

Made screenshare constraints configurable. The constraints config will be piped directly to gDM, so it`s just a regular gDM constraint dictionary
 2020-05-14 16:54:54 +00:00
Pedro Beschorner Marin
366ea0ce40 Included stats help URL 2020-05-14 10:20:10 -03:00
KDSBrowne
f5d004c322 restore minimized presentation for viewer (slide or zoom change / published poll / added annotation) 2020-05-12 12:58:14 +00:00
Anton Georgiev
cc79c4b6ae merge 2.2.10 into 2.3 2020-05-05 19:52:44 +00:00
Richard Alam
ac78fd5913 - revert back value for wsUrl 2020-04-24 09:39:21 -07:00
Richard Alam
79096d0c55 Increase voice conf length 
We need to increase the length of the voice conference. If we have lots of meetings running,
 there is a high chance of collision.

 Need corresponding changes to FreeSWITCH dialplan.

 In bbb_echo_test.xml, change to `expression="^echo(\d{5,11})$"`.

 In bbb_conference.xml, change to `expression="^(\d{5,11})$"`.
 2020-04-24 09:22:46 -07:00
basisbit
f16772818d
add support for upload of '.jpeg' files (not just '.jpg') 
apply previously merged PR #9025 into v2.2.x-release
 2020-04-16 23:16:48 +02:00
Anton Georgiev
eccc4dd377
Update settings.yml 2020-04-15 09:45:43 -04:00
basisbit
78d47767d1
add support for upload of '.jpeg' files (not just '.jpg') 2020-04-09 18:49:19 +02:00
Tainan Felipe
1bed0fee22 Add preloading for slides 2020-04-07 18:19:16 -03:00
Anton Georgiev
b1ebd79d51
Update settings.yml 2020-03-31 16:29:32 -04:00
KDSBrowne
d9f3cd0d34 add notification tab to settings modal 2020-03-19 14:19:40 +00:00
Anton Georgiev
4b0452d1fd Merge branch 'v2.2.x-release' of github.com:bigbluebutton/bigbluebutton into feb14-merge-2.2-into-master 2020-02-14 21:43:35 +00:00
Chad Pilkey
d9eae9d2b4 increase the pingpong removal timeout to reduce false positives 2020-02-07 11:02:39 -08:00
Anton Georgiev
e420dc2546 add bbb_show_participants_on_login as a join parameter 2020-01-30 15:43:54 -05:00
Pedro Beschorner Marin
11cfea2359 Logging audio stats 2020-01-29 14:54:35 -03:00
Tainan Felipe
e276b5b570
Change to bbb extension key 2020-01-29 13:30:20 -03:00
Tainan Felipe
8a7a58d243 update chrome version requirement to 72 2020-01-28 17:52:05 -03:00
Tainan Felipe
568e937a91 Fix mistype on edge version 2020-01-28 16:53:15 -03:00
Tainan Felipe
191867ffe0 set new minimum browsers verions to run html5 client 2020-01-28 16:34:23 -03:00
Pedro Beschorner Marin
1103663d86 Monitoring audio WebRTC stats 2020-01-28 10:07:21 -03:00
Anton Georgiev
00df15720a
Merge pull request #8536 from vitormateusalmeida/issue-8531 
Fixes resizing bar appearing while there are no webcams shared
 2020-01-27 15:09:36 -05:00
Tainan Felipe
a652538b50 Add Yandex browser to the list of supported browser 2020-01-24 14:22:45 -03:00
Vitor Mateus
35a5b45b1c Fixes resizing bar appearing while there are no webcams shared #8531 2020-01-23 15:09:39 -03:00
Anton Georgiev
01371b7bb5
Merge pull request #8461 from KDSBrowne/issue-8449 
Add config to show download option in the Upload presentation dialog
 2020-01-15 14:39:50 -05:00
KDSBrowne
87d39421f7 add allowDownloadable prop to presentation config in settings.yml 2020-01-02 15:00:50 +00:00
Pedro Beschorner Marin
8e129fb961 Included multiple cameras UI 2019-12-18 14:44:56 -03:00
Pedro Beschorner Marin
ee4a0ff861 Removed the last remains of videoStats 2019-12-10 09:02:17 -03:00
Joao Siebel
b623f5360e Add settings to enable/disable cursor streamer log 2019-12-04 15:22:31 -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
3bc9933960 Remove preview timer 2019-11-20 15:35:16 -03:00
Tainan Felipe
6e9b2da562 Remove auto play component and reuse Video preview gUM 2019-11-20 14:17:42 -03:00
Anton Georgiev
c7cea9ce84 reset clientLog defaults 2019-11-15 16:54:14 -05:00
Anton Georgiev
d0e20d5b96 moved logTag setting into clientLog object for consistency 2019-11-15 16:46:42 -05:00
Anton Georgiev
171d073a45 allow for logTag parameter in settings.yml 2019-11-14 18:09:15 -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
Chad Pilkey
7fc1e61c48 user join cue improvements 2019-11-13 14:36:23 -08:00
Chad Pilkey
d81fe936d4 add toast on user join option 2019-11-12 10:00:48 -08: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
ef3f022845 Add setting option 2019-11-11 15:21:48 -03:00
KDSBrowne
4a6bdbf028 add talk indicator displaying voice users 2019-11-01 19:29:33 +00:00
Paulo Lanzarin
0fd2c106d9
Default config relayOnlyOnReconnect set to false 2019-10-28 11:10:49 -04:00
Chad Pilkey
927cbf35bb add option to reconnect audio with relay only 2019-10-26 02:57:49 +00:00
Chad Pilkey
660d5ff290
Merge pull request #8150 from jfsiebel/add-heapdump-dependency 
Add heapdump dependency
 2019-09-30 16:15:10 -04:00
Chad Pilkey
6c0358ae90 bitrate only webcam profiles and error handling 2019-09-26 18:28:37 +00:00
Joao Siebel
a942a90ffc Add settings to enable heap dump 2019-09-25 08:14:22 -03:00
Anton Georgiev
c8e9eb9bbc
Default to disabled memory monitor 2019-09-09 16:36:07 -04:00
Anton Georgiev
f0a35a7381 add monitor for memory usage in nodejs html5 2019-09-09 14:45:54 -04:00
KDSBrowne
4e837a1ac1 add typing indicator config setting 2019-08-23 15:17:32 +00:00
Anton Georgiev
4aad0a35a2
Merge pull request #7853 from jfsiebel/save-local-settings 
Save local settings in a different collection
 2019-08-06 12:50:24 -04:00
Joao Siebel
44c660cf48 remove lock from local settings 2019-08-02 10:15:50 -03:00
Chad Pilkey
3781a94a23 move slide position data into its own collection 2019-07-31 12:22:32 -07:00
Anton Georgiev
fd894a4d2c
Merge pull request #7753 from Tainan404/Add-pong-time-to-settings 
Add pong and clear users intervals times to settings
 2019-07-30 13:18:26 -04:00
Vitor Mateus
3c0898b7aa Merge remote-tracking branch 'upstream/master' into issue-7022-2 2019-07-29 17:10:34 -03:00
Chad Pilkey
e69931a0af Merge remote-tracking branch 'upstream/master' into fix-pan-lag 2019-07-25 16:29:52 -07:00
Chad Pilkey
c344a17adb pan/zoom and cursor refactor for better performance 2019-07-25 15:55:25 -07:00
Vitor Mateus
120764ee33 Adjustments to fullscreen toggle #7022 #7067 2019-07-23 16:56:39 -03:00
Anton Georgiev
33f2cc398b
Merge pull request #7804 from KDSBrowne/issue-7768 
Add enabled parameter to chat in settings.yml
 2019-07-18 16:53:09 -04:00
KDSBrowne
bd9ed853a7 add enabled config to chat in settings.yml 2019-07-17 21:00:33 +00:00
Anton Georgiev
d385466398
Merge pull request #7784 from diegobenetti/issue7769-change-enableExternalVideo-parameter 
Changes the position of the parameter enableExternalVideo in the settings.yml
 2019-07-17 16:53:42 -04:00
Diego Benetti
e9e177d84f Creates parameter to enable or disable the Logout option 2019-07-16 10:55:56 -03:00
Diego Benetti
aa0c777cee Parameter enableExternalVideo changed to externalVideoPlayer 2019-07-15 16:31:28 -03:00
Diego Benetti
f7a58c3279 Changes the position of the parameter enableExternalVideo in the settings.yml file 2019-07-15 13:26:57 -03:00
Anton Georgiev
15c4e09bd6
Merge pull request #7770 from antobinary/clean-settings-yml 
Remove unused `httpsConnection` flag in settings.yml
 2019-07-15 08:46:39 -04:00
KDSBrowne
22a94260dc change undefined to null 2019-07-15 02:59:55 +00:00
Anton Georgiev
4c547d8a42
Rmv unused httpsConnection flag in settings.yml 2019-07-12 11:59:31 -04:00
KDSBrowne
5c8407ccb6 add undefined as default setting 2019-07-10 15:25:30 +00:00
KDSBrowne
4a9a833755 add browser locale detection override prop to settings.yml 2019-07-10 13:19:00 +00:00
Tainan Felipe
8ffa84e39b Add pong and clear users intervals times to settings 2019-07-08 16:49:09 -03:00
Anton Georgiev
f095f04fd3
Merge pull request #7702 from capilkey/fix-user-roles 
Clean up user roles
 2019-07-04 14:57:19 -04:00
KDSBrowne
ba9c9c431a add enabled poll prop in settings.yml 2019-07-02 14:54:37 +00:00
Chad Pilkey
f0930e2d23 refactor user role management to follow proper format 2019-06-28 21:02:12 +00:00
Anton Georgiev
35b8563219
Merge pull request #7606 from Tainan404/issue-7556 
Add toast for webcam lock suggestion
 2019-06-26 12:17:30 -04:00
Anton Georgiev
283c4a8fcc
Enable closed captions by default 2019-06-25 16:26:23 -04:00
Anton Georgiev
c18910966c
Merge pull request #7645 from KDSBrowne/0TF-SpeechRecognition-captions 
Add speech recognition functionality to writing captions
 2019-06-24 10:10:14 -04:00
Anton Georgiev
684197bbdc
Merge pull request #7661 from KDSBrowne/issue-7346 
Add Chrome on iOS to legacy detection
 2019-06-21 15:08:27 -04:00
Maxim Khlobystov
34eef01460 Update browser-bunyan and enable flushOnClose 2019-06-21 14:21:22 -04:00
KDSBrowne
4796f19cde add Chrome on iOS to legacy detection 2019-06-21 17:45:34 +00:00
Anton Georgiev
5fb0c10ea6
Merge branch 'master' into issue-7556 2019-06-21 10:44:32 -04:00
KDSBrowne
c36f25c748 add enableDictation prop in settings.yml / bug fixes 2019-06-18 14:36:22 +00:00
Paulo Lanzarin
74b194cb13
Tune medium profile bw down to 200kbps 2019-06-13 16:08:44 -03:00
prlanzarin
47b297fdf2 Add bitrate specs to existing profiles 2019-06-13 18:25:16 +00:00
Joao Siebel
63a2df07cb Merge remote-tracking branch 'upstream/master' into parameterize-network-monitoring-threshold 2019-06-13 09:21:17 -03:00
Fred Dixon
2c617fed7b
Merge pull request #7610 from capilkey/ipv4-audio-fallback 
IPv4 FS audio fallback, auto-reconnect, and fixed input select
 2019-06-12 19:41:15 -04:00
Chad Pilkey
cc7513279e IPv4 FS audio fallback, auto-reconnect, and fixed input select 2019-06-12 21:01:20 +00:00
Joao Siebel
16f20db001 parameterize the packet lost threshold 2019-06-12 17:27:49 -03:00
Tainan Felipe
d948a6a008 Add toast for webcam lock suggestion 2019-06-12 15:03:23 -03:00
Anton Georgiev
5db7311a07
Merge pull request #6885 from vitormateusalmeida/issue-6724 
Make webcam draggable
 2019-06-03 12:42:42 -04:00
Anton Georgiev
ac36732849
Merge branch 'master' into closed-captions-prototype 2019-05-29 11:51:45 -04:00
Vitor Mateus
6de7650ec9 Merge remote-tracking branch 'upstream/master' into issue-6724 2019-05-27 19:18:26 -03:00
Vitor Mateus
d1b910a558 Fix errors in grid layout 2019-05-27 19:06:52 -03:00
Joao Siebel
8ba90b2121 Merge remote-tracking branch 'upstream/master' into network-indicator 2019-05-23 15:42:38 -03:00
Pedro Beschorner Marin
741122df96 Closed captions cleanup 2019-05-23 11:51:01 -03:00
Pedro Beschorner Marin
77420a4c24 Cleaning captions if data is idle 2019-05-22 18:33:20 -03:00
Pedro Beschorner Marin
34b39a2b0a Closed captions prototype in a big commit 2019-05-22 18:33:20 -03:00
Chad Pilkey
af4c4059e8 add option to force server to use http slide uris 2019-05-20 15:00:36 -07:00
Anton Georgiev
7937a779a6
Merge pull request #7231 from BobakOftadeh/redis-password 
Add password field for redis settings
 2019-05-15 14:49:20 -04:00
Joao Siebel
acc7c91b9f set default value to false 2019-05-10 18:13:48 -03:00
Joao Siebel
5a22f91572 Merge remote-tracking branch 'upstream/master' into network-indicator 2019-05-10 11:09:42 -03:00
Joao Siebel
fea22d5eef add flag to enable monitoring, correct who can see network problems and update logic 2019-05-09 18:25:29 -03:00
Pedro Beschorner Marin
c27f409def Locking shared notes from akka-apps up to the Flash client 2019-05-08 20:36:36 +00:00
Pedro Beschorner Marin
9867aa6b78 Shared notes lock settings first commit 2019-05-08 20:36:36 +00:00
Joao Siebel
10c0e7dd24 Merge remote-tracking branch 'upstream/master' into network-indicator 2019-05-06 14:12:04 -03:00
Anton Georgiev
214f447bd8
Merge pull request #7335 from capilkey/legacy-browser-settings 
Move legacy browser versions into settings.yml
 2019-05-03 13:23:26 -04:00
Chad Pilkey
0cd79b7c05 move legacy browser versions into settings.yml 2019-05-01 17:33:03 -07:00
Chad Pilkey
2aeed72c8d refactor video preview media selection 2019-04-30 12:54:56 -07:00
Vitor Mateus
e73246ee0d Merge remote-tracking branch 'upstream/master' into issue-6724 2019-04-23 17:27:04 -03:00
Joao Siebel
5ad451cfff prevent unnecessary network information update 2019-04-23 09:02:15 -03:00
Joao Siebel
c98db398fc Merge remote-tracking branch 'upstream/master' into network-indicator 2019-04-22 09:18:02 -03:00
Joao Siebel
08d177dac0 add initial network logic 2019-04-18 18:15:48 -03:00
bobakoftadeh
6871b5d35c Add password field for redis settings 2019-04-10 21:20:36 +00:00
Maxim Khlobystov
d7d69d1c98 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into user-information-lookup 2019-04-05 18:46:47 -04:00
Maxim Khlobystov
3fa22c6908 User information lookup feature in HTML5 client. 2019-04-05 18:32:21 -04:00
Joao Siebel
6bbaeea0a0 Merge remote-tracking branch 'upstream/master' into network-indicator 2019-04-03 09:01:32 -03:00
Joao Siebel
701911734b Merge remote-tracking branch 'upstream/master' into network-indicator 2019-03-25 09:52:33 -03:00
Vitor Mateus
90290c6b67 Merge remote-tracking branch 'upstream/master' into issue-6724 2019-03-22 17:54:23 -03:00
Ghazi Triki
106058e1dd Support loading the HTML5 main JS file and its assets from a CDN. 2019-03-18 09:57:43 +01:00
Anton Georgiev
af4edb7cbc
Merge pull request #6884 from eduardohfnascimento/fix-upload-types 
Change as mime types are coded
 2019-03-14 12:57:31 -04:00
gustavotrott
e5c26c60ef Implement slow connection indicator 2019-03-11 21:34:34 -03:00
Anton Georgiev
8380875e70 remove Verto code 2019-03-08 19:41:19 +00:00
Anton Georgiev
48163aaac2 set enableScreensharing to true by default 2019-03-08 17:40:46 +00:00
eduardohfnascimento
4e25463d8f fix Drop and upload files 2019-03-07 16:53:01 -03:00
Maxim Khlobystov
2f8e9801da Sending the feedback log before going to logout URL 2019-03-04 17:41:04 -05:00
Vitor Mateus
db7b66f7f7 Removed settings modifications 2019-03-04 17:31:58 -03:00
Fred Dixon
44330fea49 Make Kurento enableListenOnly true and update help URL 2019-03-04 08:57:51 -06:00
Paulo Lanzarin
fdb8d889c7
[HTML5] Change default resolution for webcams to 320x240 
- This was done to mitigate packet loss and flickering and better abide to our default configured bitrate (300kbps).
This goes alongside updates to bbb-webrtc-sfu and kurento-media-server to increase reliablity and diminish stream artifacts.
I'll probably revisit this resolution change once I can correctly identify the source of corrupted frames, but I really think we should
maintain this as 320x240 for the time being. 640x480 would only be feasible if we increased our default bitrate config to 500kbps.
 2019-03-01 16:20:08 -03:00
Vitor Mateus
e1616c0a3b Make sigle webcam draggable #6724 2019-02-28 18:39:57 -03:00
eduardohfnascimento
5b1b24a366 Change as mime types are coded 2019-02-28 17:47:34 -03:00
KDSBrowne
80e29254c3 move help link to settings.yml 2019-02-20 16:01:40 +00:00
Anton Georgiev
b126c2b08b
Merge pull request #6637 from BobakOftadeh/add-webcam-flag 
Added flag to hide dropdown menu in webcam
 2019-02-06 13:41:55 -05:00
Fred Dixon
79e94c2390
Enable external video (YouTube) by default 2019-02-05 12:37:59 -05:00
bobakoftadeh
ea078b07a4 Improved implementation of flag for hide webcam dropdown 2019-02-04 16:44:28 +00:00
Vitor Mateus
64210cc610 Fixes 2019-01-30 15:43:11 -02:00
Vitor Mateus
c140acbd6b Merge remote-tracking branch 'upstream/master' into issue-5846 2019-01-28 10:14:46 -02:00
bobakoftadeh
f7074e5548 Renamed flag for hiding webcam menu 2019-01-24 22:08:47 +00:00
bobakoftadeh
a3f20aa281 Added flag to hide dropdown menu in webcam 2019-01-24 21:15:43 +00:00
Vitor Mateus
b6d5b15e3e Implement enable/disable Animations issue-5846 2019-01-24 14:16:23 -02:00
Anton Georgiev
acaeafdea0
Merge pull request #6598 from bigbluebutton/antobinary-video-enable 
Enable kurento webcams [video] by default
 2019-01-21 12:35:10 -05:00
Anton Georgiev
3fe058db31
Enable kurento webcams [video] by default 2019-01-21 12:08:04 -05:00
Anton Georgiev
51f7645607 remove REDIS pubsub html5 logs; turned off debug 2019-01-21 17:00:24 +00:00
Lucas Zawacki
57fc7a81f0 Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into youtube-2.2 2019-01-21 02:50:56 -03:00
Anton Georgiev
3365cabc72
Update year in html5 settings.yml 2019-01-17 15:15:10 -05:00
Lucas Zawacki
9b2bc7c219 Correctly unmount youtube player area 2019-01-16 10:40:49 -03:00
Pedro Beschorner Marin
824b6c83c9 Extra config to be used with generic Etherpad servers 2019-01-10 10:12:33 -02:00
Anton Georgiev
0466189624
Merge pull request #6491 from Tainan404/issue-6335 
Add custom font feature and define desktop version to 14px
 2019-01-09 15:27:29 -05:00
Pedro Beschorner Marin
a8517638c0 Shared notes title and extra config 2019-01-08 13:26:33 +00:00
Pedro Beschorner Marin
e413d0a5c3 Included shared notes feature 2019-01-08 13:24:34 +00:00
Tainan Felipe
38a91e4559 rename settings variables 2019-01-03 15:55:10 -02:00
Tainan Felipe
c1aacc8823 Add custom font feature and define desktop version to 14px 2019-01-03 15:35:52 -02:00
KDSBrowne
418d0ee5a3 set showParticipantsOnLogin flag default to true 2018-12-21 20:24:53 +00:00
KDSBrowne
7c0bef6256 add config param to show userlist on join 2018-12-21 20:16:36 +00:00
Anton Georgiev
c69cb2d454
Update html5 client BBB version 2018-12-03 17:34:11 -05:00
Anton Georgiev
a236fd071b modify clientLog structure for easier parse-edit 2018-12-03 21:36:40 +00:00
Bobak Oftadeh
7edb133825 removed allowModeratorToUnmuteAudio property from settings.yml 2018-11-20 18:29:49 +00:00
Bobak Oftadeh
5fb58cd604 Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into user-manage-b 2018-11-15 12:55:57 -08:00
Anton Georgiev
98ac77dc03 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into iframe-outside-commands 2018-11-12 17:01:06 +00:00
bobakoftadeh
04421e631b Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into user-mange-b 2018-11-12 08:40:47 -08:00
Anton Georgiev
ce26a3ed5e
Merge branch 'master' into remove-client-side-acl 2018-11-12 11:29:43 -05:00
Tainan Felipe
460cbdbcde Re-add settings 2018-11-12 09:46:20 -02:00
João Francisco Siebel
076864ffd0 merge with master 2018-11-09 13:54:33 -02:00
Anton Georgiev
adbe9bb546 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into iframe-outside-commands 2018-11-08 19:34:57 +00:00
João Francisco Siebel
016efcc0eb Remove ACL from client side. close #6138 2018-11-05 17:30:37 -02:00
Tainan Felipe
fd8a63fbbb Change the method permissions for moderator 2018-11-05 10:27:56 -02:00
KDSBrowne
538e248058 Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into start-poll-01 2018-11-02 21:25:40 +00:00
Bobak Oftadeh
a97a1ece37 Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into user-manage-b 2018-11-02 09:17:07 -07:00
Tainan Felipe
5ea3ff2a7c Add permissioin on acl to moderator end breakout 2018-11-01 15:04:56 -03:00
Anton Georgiev
04883ffcdb handle iframe toggleRecording and toggle self muting 2018-11-01 15:03:16 +00:00
Bobak Oftadeh
6bde6b06f5 Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into user-manage-b 2018-10-29 14:39:25 -07:00
Tainan Felipe
fceeca3795 Merge remote-tracking branch 'upstream/master' into breakout-room-html5 2018-10-26 11:52:54 -03:00
KDSBrowne
47218ea351 Merge branch 'remove-react-router' of https://github.com/antobinary/bigbluebutton into test-merge-anton 2018-10-25 16:18:31 +00:00
Anton Georgiev
cde6311a5d Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into remove-react-router 2018-10-24 18:26:13 +00:00
Anton Georgiev
57dc55b559 drop metadata configs; use userdata configs for autoSwap 2018-10-23 20:44:17 +00:00
Tainan Felipe
958bd406a6 Merge remote-tracking branch 'upstream/master' into breakout-room-html5 2018-10-23 14:53:46 -03:00
Bobak Oftadeh
0cde376e67 Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into user-manage-b 2018-10-22 10:06:18 -07:00
João Francisco Siebel
f936e319de implement configurable whiteboard tools. close #5826 2018-10-19 14:05:56 -03:00
João Francisco Siebel
252bacb917 Add multiUserPenOnly parameter in yml 2018-10-18 14:03:11 -03:00
KDSBrowne
bae71203a5 Merge branch 'remove-react-router' of https://github.com/antobinary/bigbluebutton into poll-with-no-router 2018-10-17 20:34:05 +00:00
KDSBrowne
51e14946db fix live results not being reset 2018-10-16 17:22:12 +00:00
Anton Georgiev
8ebb71322b remove chat url from settings.yml 2018-10-16 15:58:41 +00:00
KDSBrowne
cb6e988134 add missing items from setting.yml after merge 2018-10-16 15:25:45 +00:00
KDSBrowne
45eeb1d400 Merge remote-tracking branch 'Upstream/master' into start-poll-01 2018-10-16 15:19:24 +00:00
Bobak Oftadeh
0a3568cc74 Added mute meeting settings to yml file 2018-10-15 15:24:56 -07:00
João Francisco Siebel
68aa29de68 rename file and add users-settings subscription 2018-09-25 09:37:45 -03:00
João Francisco Siebel
296ef8fb88 Merge remote-tracking branch 'upstream/master' into HEAD 2018-09-24 14:46:17 -03:00