BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
40,016 Commits 13 Branches 260 Tags 1.1 GiB
25bb9468ab
Commit Graph

923 Commits

Author SHA1 Message Date
prlanzarin
81868ce922 video-provider: add inline docs for pagination configuration 
Change the default page sizes for mobile to 2
 2020-08-24 21:28:42 +00:00
Anton Georgiev
4fb301c48b
Merge pull request #10293 from prlanzarin/upstream-2.2-vpeg-pagination 
video-provider: first tackle at video pagination
 2020-08-20 15:24:57 -04:00
prlanzarin
a98c476239 video-provider: remove page change lock in favor of a debounced approach 2020-08-20 15:43:02 +00:00
Lars Kiesow
102caa371f
Modern Camera Profiles 
This patch switchessing a somewhat more modern default for the camera
profiles by requesting 720p for the `high` and `hd` profiles like this.

This was discussed on the developers list at:

- https://groups.google.com/g/bigbluebutton-dev/c/PL3kXV9pZmo
 2020-08-19 23:51:05 +02:00
Anton Georgiev
b6d71fd66d
Merge branch 'develop' into issue-9219 2020-08-19 16:02:43 -04:00
Anton Georgiev
b648c26c61
Merge pull request #9012 from Tainan404/issue-9011 
Add preloading for slides
 2020-08-19 15:28:28 -04:00
prlanzarin
2d436977cb video-provider: add pagination page change timer to prevent spamming 2020-08-19 13:56:22 +00:00
Tainan Felipe
5bfeab289c Merge remote-tracking branch 'upstream/develop' into issue-9219 2020-08-19 10:41:03 -03:00
Tainan Felipe
73ba3ef2e9
Merge branch 'develop' into issue-9011 2020-08-19 10:14:12 -03:00
prlanzarin
28e826118a video-provider: first version of video pagination 2020-08-18 17:00:47 +00:00
KDSBrowne
fbeaf87dbd localize the dropdown values for webcam quality 2020-08-17 16:19:45 +00:00
Lars Kiesow
43fc7bf916
Switch to YAML Syntax for Logging 
This patch switches to using a much more readable YAML syntax for the
logging configuration in the HTML5 client.
 2020-08-16 12:08:41 +02:00
Anton Georgiev
5be5aed1d9 Merge branch 'v2.2.x-release' of github.com:bigbluebutton/bigbluebutton into merge-2020-08-12 2020-08-12 17:12:58 +00:00
prlanzarin
c524abf05b video-provider: normalize hidden cameraProfiles constraints 
Also add some inlined docs to settings.yml
 2020-08-11 14:51:50 +00:00
Paulo Lanzarin
629e2dbfd4 Update low-u3 profile to 30kbps/3fps 
1 FPS looks too broken. Lower bitrate as much as we can, leave FPS at 3 which is minimally acceptable.
 2020-08-05 16:56:25 +00:00
prlanzarin
69ad98f7de video-provider: fix threshold profile names 2020-08-05 16:56:12 +00:00
prlanzarin
1453ee560c video-provider: use single values for threshold frameRates to expand compat 2020-08-05 16:56:06 +00:00
prlanzarin
642de5076a video-provider: first, simplified version of dynamic camera profile control 2020-08-05 16:55:41 +00:00
prlanzarin
dac3259c48 Merge remote-tracking branch 'pedrobmarin/bbb-multiple-webcams' into upstream-2.2-vpeg-base 2020-08-05 14:20:58 +00:00
Tainan Felipe
e64c0e1c62
Merge branch 'develop' into issue-9219 2020-07-28 13:28:32 -03:00
KDSBrowne
5a158eaab0 turn on raise hand notification / sound by default 2020-07-28 16:13:20 +00:00
Anton Georgiev
7744817130
Merge branch 'develop' into issue-9647 2020-07-28 10:48:13 -04:00
Anton Georgiev
da8075e2ed
Enable displayBrandingArea in html5 settings.yml 2020-07-22 15:25:43 -04:00
Anton Georgiev
4b2fab6f01
Set bbbServerVersion to 2.3-dev 2020-07-16 15:45:25 -04:00
KDSBrowne
8a9430bf26 Merge branch 'develop' of https://github.com/bigbluebutton/bigbluebutton into issue-9647 2020-07-16 12:05:44 +00:00
prlanzarin
1dbafffa26 audio: make listen only call timeout configurable 2020-07-09 18:02:18 +00:00
prlanzarin
0f8b27d2d8 video-provider: make camera timeouts configurable 
Also add missing settings.yml val for wsConnectionTimeout
 2020-07-09 17:53:24 +00:00
Anton Georgiev
c5e6de2296 Enable multiple webcams and network stats by default 2020-07-07 18:43:46 +00:00
Pedro Beschorner Marin
526f79e8f2 Merge remote-tracking branch 'bigbluebutton/v2.2.x-release' into bigbluebutton/develop 2020-06-30 18:15:18 -03:00
KDSBrowne
0877604d00 improve notification position / prevent state update on unmounted component 2020-06-23 13:38:59 +00:00
KDSBrowne
b3b9a45b35 add config options for muted alert 2020-06-22 16:02:24 +00:00
Anton Georgiev
e7d3487b5d
Merge pull request #9878 from lfzawacki/ending-time-alerts 
Make meeting/breakout ending time alerts configurable
 2020-06-19 16:25:50 -04:00
Lucas Zawacki
3f16d894c3 Configurable ending time and alert values 2020-06-18 15:11:33 -03:00
Lucas Zawacki
a586c7db55 Configuration for remaining time 2020-06-18 15:11:26 -03:00
Joao Siebel
3e95ed0e4b Merge remote-tracking branch 'upstream/v2.2.x-release' into merge-2.2 2020-06-16 16:40:56 -03:00
mw781
bf68d2c76f Refactor code and implement mirroring for video-preview 2020-06-14 20:13:47 +01:00
Fred Dixon
ccf42b0a67
Merge pull request #9836 from lkiesow/html5-camera-profile-docs 
[HTML5 Client] Camera Profile Documentation
 2020-06-13 19:00:57 -04:00
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
Tainan Felipe
5e5f4cc93b Move locales fallback to a json file 2020-05-26 11:15:17 -03: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
Tainan Felipe
aa668e3f91 Merge remote-tracking branch 'upstream/develop' into issue-9219 2020-05-25 17:05:58 -03:00
Tainan Felipe
db8e7fcd39 Update react-intl and add fallback to unsupported languages 2020-05-25 17:00:13 -03: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
Tainan Felipe
1bc8ae0b21 add join audio only, and imporov UX 2018-10-23 14:18:09 -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
Tainan Felipe
bd01d7e4aa to squash 2018-10-16 14:55:20 -03: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
KDSBrowne
14066b4280 Merge branch 'remove-react-router' of https://github.com/antobinary/bigbluebutton into post-router-style-fix 2018-10-15 14:54:15 +00:00
Anton Georgiev
4059fd5fa9 mostly recovered chat. needs UI love and handling of unread 2018-10-11 20:41:37 +00:00
KDSBrowne
5654f08b43 clean up code 2018-10-10 18:25:35 +00:00
KDSBrowne
7673adee1b implement live results for poll 2018-10-10 15:52:39 +00:00
KDSBrowne
c2e785b8c4 add poll max custom fields to config 2018-10-02 23:59:45 +00:00
Anton Georgiev
0c8eafc2c8 Merge branch 'remove-react-router' of github.com:antobinary/bigbluebutton into remove-react-router 2018-10-02 14:47:25 +00:00
KDSBrowne
cf23293e10 Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into start-poll-01 2018-09-25 12:44:38 +00:00
João Francisco Siebel
68aa29de68 rename file and add users-settings subscription 2018-09-25 09:37:45 -03:00
Anton Georgiev
76180a0580
Merge pull request #6076 from jfsiebel/custom-user-settings 
Custom user settings
 2018-09-25 08:29:48 -04:00
KDSBrowne
86d48298c6 add ability to publish / stop poll 2018-09-24 22:43:54 +00:00
João Francisco Siebel
81e6e815d9 remove .ini file 2018-09-24 14:51:07 -03:00
João Francisco Siebel
296ef8fb88 Merge remote-tracking branch 'upstream/master' into HEAD 2018-09-24 14:46:17 -03:00
KDSBrowne
3430321a68 Merge remote-tracking branch 'upstream/master' into start-poll-01 2018-09-23 23:08:24 +00:00
KDSBrowne
8320493e6a add ability to start custom poll 2018-09-23 23:05:13 +00:00
KDSBrowne
f3bd048d56 clean up code / add formatted messages / fix bugs 2018-09-23 22:57:03 +00:00
João Francisco Siebel
a445e0d2e5 make whiteboard tools list configurable 2018-09-21 16:42:39 -03:00
João Francisco Siebel
3c3a5ae59a implement multiUserPenOnly configuration 2018-09-21 13:42:00 -03:00
Anton Georgiev
92732a96e6 WIP removing react-router 2018-09-21 15:43:10 +00:00
Tainan Felipe
3bfce89396 change the setting prod 2018-09-19 12:00:49 -03:00
João Francisco Siebel
09d0a62076 Remove settings files 2018-09-19 11:00:36 -03:00
João Francisco Siebel
6f8a3fd9cd read settings from ini file 2018-09-18 13:12:16 -03:00
Tainan Felipe
210dbbbeaf Merge remote-tracking branch 'upstream/master' into zoom-implementation 2018-09-17 15:20:20 -03:00
João Francisco Siebel
4c35608c2b Add users-settings collection and handle dynamic configuration 2018-09-13 15:09:30 -03:00
Oswaldo Acauan
88f7d6d7dd Merge remote-tracking branch 'upstream/master' into upload-token 2018-09-11 16:17:38 -03:00
Oswaldo Acauan
5c9518bd27 Adjust the presentation upload to use the security token introduced in 2.1. Closes #4948 2018-09-11 16:00:49 -03:00
Anton Georgiev
1462810b96 Merge branch 'v2.0.x-release' of github.com:bigbluebutton/bigbluebutton into merge-2.0 2018-09-06 22:06:40 +00:00
Tainan Felipe
cce66b352e Add hand icon 2018-09-05 16:28:10 -03:00
Tainan Felipe
742229e88f Fix lint errors 2018-08-28 16:30:37 -03:00
Tainan Felipe
25834dd4f8 zoom calc based in flash 2018-08-28 14:13:18 -03:00
Anton Georgiev
aed8577606 Merge branch 'v2.0.x-release' of https://github.com/bigbluebutton/bigbluebutton into log-config-restructure 2018-08-22 18:30:02 +00:00
Anton Georgiev
6da18cd52d made clientLog structure easier to edit via script 2018-08-22 18:25:43 +00:00
Anton Georgiev
778e22d42f
Merge pull request #5991 from prlanzarin/sfu-cam-target-bitrate 
[HTML5] Added target bitrate option for WebRTC screenshare and webcam
 2018-08-21 10:02:56 -04:00
prlanzarin
9f9e248de7 Made webcam constraints configurable, removed fps limitations and resolution floor 
Also fixed handlePlayStop and stopWebRTCPeer exceptions
 2018-08-20 18:08:10 +00:00
KDSBrowne
29bcbea923 rename to alerts / missing from #5973 2018-08-15 02:35:58 +00:00
Bobak Oftadeh
4d0b8418db Added help icon 2018-08-10 08:29:52 -07:00
Bobak Oftadeh
9feb47a1ca Option to disable the help button added 2018-08-09 15:40:52 -07:00
Anton Georgiev
44dc39eaf8
Merge branch 'master' into add-html5-group-chat-support 2018-08-01 14:24:00 -04:00
Anton Georgiev
6533802573
Merge pull request #5932 from oswaldoacauan/presentation-pods 
Presentation pods support
 2018-08-01 13:49:32 -04:00
Bobak Oftadeh
f0d5969b5c Added configurations to the production settings 2018-08-01 09:18:54 -07:00
Bobak Oftadeh
78bcec7553 Implemented adjustments to logClient 2018-07-31 15:28:03 -07:00
Anton Georgiev
78847f89ad attempt to pull 2.0 into 2.2 2018-07-31 16:18:23 +00:00
João Francisco Siebel
655483576f fix unread messages counter on public chat and remove some old chat configurations 2018-07-27 10:44:21 -03:00
Oswaldo Acauan
b7823c406c Merge remote-tracking branch 'upstream/v2.2-dev' into presentation-pods 2018-07-24 17:20:37 -03:00
Bobak Oftadeh
c3172a7691 The client logger can now be configured on the production settings 2018-07-23 09:15:50 -07:00
Ghazi Triki
66a050b00b Merge remote-tracking branch 'bigbluebutton/v2.0.x-release' into 2.2-merge-with-2.0 
# Conflicts:
#	bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/views/WhiteboardToolbar.mxml
#	bigbluebutton-config/bigbluebutton-release
#	bigbluebutton-html5/imports/api/users/server/handlers/guestApproved.js (Not Fixed)
 2018-07-16 16:08:38 +01:00
Bobak Oftadeh
5a2d2934fa Updated settings for client-logger 2018-07-13 12:44:22 -07:00
Bobak Oftadeh
a5354c9c10 Merge branch 'v2.0.x-release' of https://github.com/bigbluebutton/bigbluebutton into fixes3 2018-07-13 12:18:55 -07:00
Bobak Oftadeh
c98bd10024 Replaced console.errors with client logger and alterted logger configurations 2018-07-13 12:16:50 -07:00
Anton Georgiev
5bcbc330af
Merge pull request #5842 from prlanzarin/audio-video-ss-stun-turn 
[HTML5] STUN/TURN config support for SFU client-side apps and general improvements
 2018-07-10 11:24:37 -04:00
prlanzarin
123ec6f3a3 Reverted wrong config changes 2018-07-09 21:33:32 +00:00
prlanzarin
d2bdb67ed3 Propagating configs to WebRTC screenshare script and added support for STUN/TURN config to SFU components 2018-07-09 21:29:59 +00:00
Anton Georgiev
b50dda8566
Merge pull request #5232 from oswaldoacauan/fix-4987 
Implement basic GroupChat messages
 2018-07-06 16:45:14 -04:00
James Jung
82229e1a8a Add 1px option for the pencil thickness 2018-07-06 14:47:50 -04:00
Maxim Khlobystov
f3e8f18a1c DIsabled chat push notifications by default. 2018-07-05 15:04:53 -04:00
Bobak Oftadeh
bc3e068e2e Client logger implemented 2018-07-04 14:02:10 -07:00
prlanzarin
2f5aa09fe5 Merge remote-tracking branch 'upstream/v2.0.x-release' into sfu-opt-audio 2018-06-27 17:34:33 +00:00
Anton Georgiev
a7d5f5d698 enable push chat notifications by default 2018-06-20 17:30:04 +00:00
Maxim Khlobystov
98cf239bc7
Merge pull request #5602 from Tainan404/issue-5470 
Add messages for chat push notifications
 2018-06-13 16:23:21 -04:00
Tainan Felipe
46807039a4 add a small style for toast notification and add a content prop in toast 2018-06-12 14:21:31 -03:00
Anton Georgiev
e4978983ba
Merge pull request #5422 from gutobenn/webrtc_stats 
WebRTC video statistics
 2018-06-08 14:35:16 -04:00
Anton Georgiev
81a6b877b9
Merge pull request #5591 from KDSBrowne/edit/config/locale 
Improve html5 locale fallback selection
 2018-06-08 13:51:53 -04:00
prlanzarin
6f78cf057c Merge remote-tracking branch 'gutobenn/webrtc_stats' into webrtc_stats 2018-06-08 16:36:41 +00:00
Anton Georgiev
21dcb0eaeb html5 client title - same format as Flash client 2018-06-07 15:18:11 +00:00
Anton Georgiev
1b755bfb24 make window title configurable 2018-06-01 18:31:41 +00:00
Maxim Khlobystov
80da44bb26
Merge pull request #5594 from oswaldoacauan/streams-cursor-wb 
Whiteboard and Cursor performance update
 2018-05-30 11:42:52 -04:00
Oswaldo Acauan
0eb4752818 Clean up 2018-05-30 11:19:19 -03:00
Tainan Felipe
61baba9a53 change last message time 2018-05-29 13:59:44 -03:00
Oswaldo Acauan
ec07b4434d Change cursor and annotation to user streams and add optimistic updates 
WIP | Use streams to cursor and optimistic updates

WIP | Use streamss to whiteboard and optimistic updates

WIP | Remove fake delay

Add two way batching (server/client client/server)

Fix null userId exception and remove logs

wip

Add two way batching (server/client client/server) for cursor

Remove message frequency from draw-listeners component since we handle on message publication

Handle clear and undo messages
 2018-05-28 14:46:14 -03:00
KDSBrowne
a750e2b2a0 edit config prop / startup-server-index variable names 2018-05-22 12:57:43 -07:00
Augusto Bennemann
5f142fa793 Fix merge conflicts 2018-05-17 14:49:35 -03:00
Anton Georgiev
13e6eb1a05
Merge pull request #5404 from Tainan404/implement-feedback-screen 
Implement feedback screen
 2018-05-14 10:19:53 -04:00
Maxim Khlobystov
e5c6e098f4
Merge pull request #5451 from KDSBrowne/xx.new-accessKey-Modal 
Adds shortcut modal
 2018-05-08 13:30:47 -04:00
prlanzarin
42ed428461 Added config to enable kurento listen only bridge 2018-05-02 15:49:57 +00:00
KDSBrowne
2ed76aa244 add shortcut config to settings-production.json 2018-04-30 12:20:27 -07:00
KDSBrowne
819839cb4e add shotcuts keys to dev-config 2018-04-30 12:18:29 -07:00
Tainan Felipe
e92bea9312 Merge remote-tracking branch 'upstream/v2.0.x-release' into implement-feedback-screen 2018-04-27 11:35:33 -03:00
Anton Georgiev
8e6e14f902 add custom vs default key and link 2018-04-26 22:55:45 +00:00
Anton Georgiev
6aea0b6297 add custom vs default key and link 2018-04-26 22:52:46 +00:00
Augusto Bennemann
1985958191 WebRTC stats for each video 2018-04-26 22:19:15 +00:00
Anton Georgiev
25f3ced26c set default KEY and LINK for Chrome screenshare extension - the one from BBB open source 2018-04-26 16:48:25 +00:00
Anton Georgiev
cffe245c12
Revert "[HTML5 Client] Whiteboard Bulk Operations" 2018-04-25 20:41:19 -04:00
Tainan Felipe
8c7ce5b2be change askForFeedbackonLogout for false 2018-04-25 16:35:49 -03:00
Tainan Felipe
d515a3cbe2 WIP feedback modal 2018-04-25 12:33:05 -03:00
Maxim Khlobystov
4067f5f808 Merge branch 'v2.0.x-release' of https://github.com/bigbluebutton/bigbluebutton into whiteboard-bulk-upsert 2018-04-25 14:39:48 +00:00
Maxim Khlobystov
8d1e80fbf0 Put the bulk lifespan value into configs. 2018-04-25 14:27:53 +00:00
Tainan Felipe
2e76439395 Change hand to pointer icon 2018-04-18 16:32:13 -03:00
Oleksandr Zhurbenko
7c61e4c4b9 Corrected a publisher for presentation-pods 2018-04-09 20:57:24 -07:00
Anton Georgiev
21b6dab852
Merge pull request #5267 from Tainan404/issue-5237 
Add custom logo area
 2018-04-05 15:08:05 -04:00
Tainan Felipe
539d9b7b15 Add branding setting on setting-production.json 2018-04-05 15:48:56 -03:00
Anton Georgiev
38aeba2c31
Merge pull request #5221 from jfsiebel/handle-audio-configuration 
Handle audio configuration
 2018-03-26 11:05:06 -04:00
Tainan Felipe Pauli de Almeida
978b8c7cdc switch displayBrandingArea for false 2018-03-21 15:46:33 -03:00
Tainan Felipe Pauli de Almeida
505a00daba add custom logo area 2018-03-21 15:19:09 -03:00
Tainan Felipe Pauli de Almeida
938bac7527 Merge remote-tracking branch 'upstream/v2.0.x-release' into issue-5160 2018-03-15 16:55:54 -03:00
Anton Georgiev
d17ca71a60
Merge pull request #5157 from jfsiebel/implement-start-stop-recording-html5 
Implement start stop recording html5
 2018-03-09 14:28:14 -05:00
Oswaldo Acauan
8b9cc79c3d Implement basic GroupChat messages. Closes #4987 2018-03-09 15:42:14 -03:00
Joao Siebel
48cc9f3ca9 Handle join audio connection errors and update production settings 2018-03-08 10:38:18 -03:00
Anton Georgiev
34a2959b34
Merge pull request #5222 from antobinary/increase-logging 
Increase logging - needed to detect audio state inconsistencies
 2018-03-07 11:42:58 -05:00
Anton Georgiev
d29af2bf25 increase logging level in production 2018-03-07 11:18:02 -05:00
João Francisco Siebel
1cd8aab376 Fix handling audio options 2018-03-06 11:36:49 -03:00
Tainan Felipe Pauli de Almeida
2c5d894d05 add webcam controls in videoMenu button 2018-03-06 10:52:16 -03:00
Anton Georgiev
42809a61f0
Merge pull request #5099 from jfsiebel/screenshare-data-saving-setting 
Implement screen share data saving setting
 2018-03-05 11:54:48 -05:00
João Francisco Siebel
85b8769ad5 Handle autoJoin, listenOnlyMode and skipCheck 2018-03-02 09:01:34 -03:00
Maxim Khlobystov
c58fa045e9 Removed the filename field from development and production settings. 2018-02-28 11:20:58 -05:00
João Francisco Siebel
4d8d522bb8 Fix settings file 2018-02-19 14:04:26 -03:00
João Francisco Siebel
6bb031076b Resolve merge problems 2018-02-19 14:00:43 -03:00
João Francisco Siebel
919c2aa644 Implement start/stop recording logic 2018-02-15 17:42:50 -02:00
Joao Siebel
eddc480851 Implement screenshare data saving setting. Fix #5029 2018-02-06 11:33:48 -02:00
Oleksandr Zhurbenko
6e1102999d Turned on logging for the production 2018-02-05 12:39:08 -08:00
Oleksandr Zhurbenko
e1568baa24 Fixed the logging of the Meteor serser-side methods 2018-02-05 12:34:03 -08:00
Anton Georgiev
d2709c9d9d adjust production settings to match changes on dev settigns 2018-01-26 11:22:17 -05:00
Joao Siebel
a42d88250e Resolve merge conflict in english locales file 2018-01-19 17:43:11 -02:00
Anton Georgiev
2ba9433c1d change copyright year to 2018 2018-01-17 16:31:50 -05:00
Joao Siebel
0764ae867c Remove old whiteboard toolbar items config 2018-01-11 08:51:37 -02:00
Joao Siebel
0b02d90927 Resolve merge conflicts 2018-01-10 17:22:42 -02:00
Oleksandr Zhurbenko
7871681448 Changed all the references of kick to remove, to be consistent 2018-01-09 14:28:48 -08:00
Oleksandr Zhurbenko
4af6d30f6a Switched from the broken 4commerce:env-settings package to native Meteor.settings 2018-01-07 16:24:05 -08:00
Oleksandr Zhurbenko
b3ceb4d5f6 Updated the html5 client's font to use the latest icons 
Fixes #4715
 2018-01-03 12:35:01 -08:00
prlanzarin
31fb95bf72 Removed wrong video peer stop procedure and reset the kurento.yaml config file 2017-12-22 12:30:24 +00:00
prlanzarin
3a72afa350 Merge remote-tracking branch 'upstream/v2.0.x-release' into video-reconnection 2017-12-21 17:37:07 +00:00
prlanzarin
362335f727 Made the users own webcam local instead of server-side 2017-12-20 20:06:27 +00:00
Joao Siebel
45ec92c230 Merge remote-tracking branch 'upstream/v2.0.x-release' into whiteboard-toolbar-locale 2017-12-14 08:47:45 -02:00
Anton Georgiev
085eb57556 add ejectUserFromVoice for moderator 2017-12-08 11:40:52 -05:00
João Francisco Siebel
950eb488a0 Add locale to whiteboard toolbox items 2017-12-08 11:28:02 -02:00
Anton Georgiev
48bf163559 linting and clean-up 2017-12-07 17:13:44 -05:00
Tainan Felipe
6845aed0e0 localize message from when clear the chat 2017-11-21 16:31:53 -02:00
Anton Georgiev
51652fc790
Merge pull request #4669 from jfsiebel/add-moderator-unmute-config 
add moderatorUnmute feature in HTML5 client
 2017-11-14 16:49:41 -02:00
prlanzarin
f43b77c19f Merge branch 'node-bbb-apps-packaging' into bbb-webrtc-sfu 
Conflicts:
	bigbluebutton-html5/imports/startup/client/base.jsx
	bigbluebutton-html5/imports/ui/components/actions-bar/actions-dropdown/component.jsx
	bigbluebutton-html5/imports/ui/components/actions-bar/component.jsx
	bigbluebutton-html5/imports/ui/components/app/container.jsx
	bigbluebutton-html5/imports/ui/components/screenshare/service.js
	bigbluebutton-html5/imports/ui/components/video-dock/component.jsx
	bigbluebutton-html5/imports/ui/components/video-dock/container.jsx
	bigbluebutton-html5/private/locales/en.json bigbluebutton-html5/server/main.js
 2017-11-11 03:41:37 +00:00
prlanzarin
2166b56304 Added toggle options for kurento video/screensharing in the HTML5 config yaml 
Also made cam button respond to those config values
 2017-11-10 21:08:40 +00:00
Anton Georgiev
8853d562ce
Merge pull request #4497 from Gcampes/audio-refactor 
[HTML5] Refactor Audio
 2017-10-31 15:39:37 -02:00
Joao Siebel
86264dcb11 Read allowModeratorToUnmuteAudio property from config 2017-10-30 17:15:43 -02:00
Joao Siebel
4a0fedce3d Remove the unmute flag from config, fix mute and unmute options for listen only user and check server-side 2017-10-30 16:27:17 -02:00
Gabriel Carvalho de Campes
81f35bac4f Fix concerns from review 2017-10-26 15:14:56 -02:00
Joao Siebel
d349150bae add moderatorUnmute feature in HTML5 client 2017-10-26 10:50:55 -02:00
KDSBrowne
34313c6eaa replace strings with constants 2017-10-25 12:00:31 -07:00
gcampes
d1bc675465 changes setdevices to bridge 2017-10-17 17:16:42 -02:00
gcampes
fafbba06cb Merge remote-tracking branch 'upstream/v2.0.x-release' into audio-refactor 2017-10-12 13:58:39 -03:00
gcampes
6b44504e5d Adds timeout to transfer, fix css, remove logs 2017-10-12 11:49:50 -03:00
Oleksandr Zhurbenko
015ca3d719 Changed imports and removed 'initializeCursor.js' since it's not needed 2017-10-11 19:00:28 -07:00
gcampes
3cba60201e Merge remote-tracking branch 'upstream/v2.0.x-release' into audio-refactor 2017-10-11 18:22:36 -03:00
gcampes
f943e5dd08 changes error handlers in audio 2017-10-11 18:04:10 -03:00
Anton Georgiev
a850d1c9c1 Merge pull request #4494 from oswaldoacauan/redis-queue-rewrite 
[HTML5] Redis class refactor
 2017-10-11 17:40:28 -03:00
Anton Georgiev
aa39361360 Merge pull request #4483 from OZhurbenko/presenter-functionality-2x 
Fix for the Pencil Mongo additions
 2017-10-11 15:22:39 -03:00
Anton Georgiev
351a0e43cb Merge pull request #4470 from KDSBrowne/xx-07-allow-html5-modorator 
[HTML5] -Allow HTML5 Moderator
 2017-10-11 09:04:54 -03:00
Oleksandr Zhurbenko
bbe1f99527 Improvements 2017-10-10 16:20:52 -07:00
Oleksandr Zhurbenko
8b5a53a59a Moved pencil_chunk_size to the config 
... And adjusted the way we fetch annotation statuses from the config
 2017-10-10 14:50:11 -07:00
Oswaldo Acauan
80a318309c Implement multi queues and async messages on Redis class 2017-10-10 14:43:42 -03:00
Maxim Khlobystov
d1f6d7c4e0 Replaced double quotes with single ones in the YAML file. 2017-10-06 18:05:30 +00:00
KDSBrowne
d89f0e511f Merge branch 'v2.0.x-release' into xx-07-allow-html5-modorator 2017-10-06 11:02:17 -07:00
Maxim Khlobystov
5f79db2554 Fixed the issue with the Bulgarian locale always displaying as a default one in the Settings modal. 2017-10-06 16:29:52 +00:00
KDSBrowne
4191ce56ed set allowHTML5Moderator to true 2017-10-06 06:27:45 -07:00
Oleksandr Zhurbenko
76bcdd55d6 Merge branch 'v2.0.x-release' of https://github.com/bigbluebutton/bigbluebutton into presenter-functionality-2x 2017-10-03 10:34:10 -07:00
Oswaldo Acauan
89c2947d78 Merge remote-tracking branch 'upstream/v2.0.x-release' into presentation-manager-merge 2017-09-29 17:32:31 -03:00
Oswaldo Acauan
2a7fd5ba4d Rename share method to set to match akka 2017-09-29 10:01:01 -03:00
Oswaldo Acauan
e699c342b6 Add missing suported mimes 2017-09-29 09:31:38 -03:00
Oleksandr Zhurbenko
e0a7bfc9fa Refactored whiteboard-toolbar 2017-09-22 23:27:55 -07:00
Oswaldo Acauan
cca1e58167 Move default presentation name to config file 2017-09-22 17:49:11 -03:00
Oswaldo Acauan
36699bedb1 Merge remote-tracking branch 'upstream/master' into presentation-manager-merge 2017-09-22 15:11:48 -03:00
Oleksandr Zhurbenko
e054358947 Created a whiteboard config and moved static values there 2017-09-21 16:44:32 -07:00
Klaus
29922c896a Merge remote-tracking branch 'upstream/bbb-2x-mconf' into html5-refactor-userlist 2017-09-21 15:40:18 -03:00
Oswaldo Acauan
c0307e36a6 Presentation Uploader to 2.0 2017-09-07 15:18:14 -03:00
Oleksandr Zhurbenko
65da71c12a Merge branch 'bbb-2x-mconf' of https://github.com/bigbluebutton/bigbluebutton into presenter-functionality-2x 2017-09-05 18:53:51 -07:00
Augusto Bennemann
5ec827e17d HTML5 video with kurento (port) 2017-09-01 12:26:57 -03:00
Oswaldo Acauan
6070a4ea25 Merge remote-tracking branch 'upstream/bbb-2x-mconf' into presentation-uploader-2x 2017-08-31 09:49:59 -03:00
Oleksandr Zhurbenko
d5f07a574c Fixed publishShape message for 4 common shapes 
Line, Rectangle, Triangle, Ellipse
 2017-08-18 19:47:31 -07:00
JaeeunCho
73b6054b42 [HTML5] implemented promote/demote user 2017-08-18 11:23:05 -07:00
Oleksandr Zhurbenko
643d55938c Merge branch 'bbb-2x-mconf' of https://github.com/bigbluebutton/bigbluebutton into presenter-functionality-2x 2017-08-16 19:24:59 -07:00
JaeeunCho
1dff7f0ef2 Merge remote-tracking branch 'upstream/bbb-2x-mconf' into destroy_meeting_users 2017-08-14 12:56:56 -07:00
Klaus
e996bea1e9 Handling separate redis channel 2017-08-14 15:55:17 -03:00
JaeeunCho
b20ea78e2a fixed conflict 2017-08-10 14:34:21 -07:00
JaeeunCho
8590d2f414 Merge remote-tracking branch 'upstream/bbb-2x-mconf' into destroy_meeting_users 2017-08-08 12:31:56 -07:00
Klauswk
0ce41afabb Merge branch 'bbb-2x-mconf' into html5-toggle-mute 2017-08-08 13:59:00 -03:00
Oswaldo Acauan
716ee5902f Merge remote-tracking branch 'upstream/bbb-2x-mconf' into userlist-2x-design 2017-08-08 11:52:26 -03:00
Klaus
0807960da4 Fix missing method for mute user 2017-08-04 17:05:18 -03:00
Oswaldo Acauan
0022c121d3 Fix chat bug and styles 2017-08-04 14:58:55 -03:00
Oleksandr Zhurbenko
227f9d540f Added permissions to Move Cursor presenter action 2017-08-03 14:18:01 -07:00
Oleksandr Zhurbenko
43566245ac Added permissions to Undo and Clear All presenter actions 2017-08-03 14:09:19 -07:00
Klaus
e02e5d75ce Merge remote-tracking branch 'upstream/bbb-2x-mconf' into html5-2x-chat-options 2017-08-03 09:17:50 -03:00
Oleksandr Zhurbenko
fa1458c3eb Handling and publishing multi-user mode switch 2017-08-02 18:24:38 -07:00
Klaus
63fee3b615 Merge remote-tracking branch 'upstream/bbb-2x-mconf' into html5-2x-chat-options 2017-08-02 11:36:16 -03:00
Klaus
d45ae64558 Merge remote-tracking branch 'upstream/bbb-2x-mconf' into slides-refactor-2x 2017-08-02 11:29:33 -03:00
Oleksandr Zhurbenko
b207a1275e Merge branch 'bbb-2x-mconf' of https://github.com/bigbluebutton/bigbluebutton into presenter-functionality-2x 2017-08-01 13:49:46 -07:00
JaeeunCho
04636ca25b [HTML5] added endMeeting by moderator 2017-08-01 08:53:05 -07:00
Klaus
9d42ca9bd7 Move from users to voice-users 2017-08-01 10:10:12 -03:00
Klaus
9bc9116e5c handling a few messages 2017-07-31 08:10:52 -03:00
Klaus
e43a44e828 Merge remote-tracking branch 'upstream/bbb-2x-mconf' into html5-2x-chat-options 2017-07-28 08:47:56 -03:00
Klauswk
e751bcdadf Merge branch 'bbb-2x-mconf' into slides-refactor-2x 2017-07-27 17:27:35 -03:00
Klaus
c13155aa6a Move shapes to annotations 2017-07-27 09:35:55 -03:00
Anton Georgiev
5ca6f63d7e Merge branch 'bbb-2x-mconf' of github.com:bigbluebutton/bigbluebutton into html5-2x-fix-audio 2017-07-26 13:49:57 -04:00
Klaus
745b9070f6 Merge remote-tracking branch 'upstream/bbb-2x-mconf' into slides-refactor-2x 2017-07-26 11:11:40 -03:00
Oleksandr Zhurbenko
6ea4d39da9 Merge branch 'bbb-2x-mconf' of https://github.com/bigbluebutton/bigbluebutton into presenter-functionality-2x 2017-07-25 15:08:29 -07:00
Klaus
9cd3ac3f87 Merge branch 'bbb-2x-mconf' into fix-presenter-rule 2017-07-25 13:43:26 -03:00
Oleksandr Zhurbenko
5aed767436 Moved SwitchSlide method to 2.0 2017-07-24 14:04:49 -07:00
Anton Georgiev
b7d6427e63 rename deskshare to screenshare and adjust condition for viewing 2017-07-24 15:29:34 -04:00
Klaus
78a6fee038 Slides reflecting akkaApps 2017-07-24 14:50:44 -03:00
Klaus
7cf05cdbf5 Add public history clear eventHandler and method 2017-07-21 11:39:40 -03:00
Oswaldo Acauan
c6f517b3cb Fix selector and get welcomeMessage from meeting object 2017-07-18 10:25:11 -03:00
Klaus
b630fcd632 Fix presenter assign 2017-07-17 09:00:18 -03:00
Anton Georgiev
2e0f6d8610 trigger syncing with state from akka-apps 2017-06-30 11:19:11 -04:00
Anton Georgiev
724e21a0d6 we do not have 1.0 user messages coming from bbb so use 2.0 only 2017-06-27 18:14:53 -04:00
Anton Georgiev
91cfc02d13 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into handle-messages 2017-06-26 17:21:42 -04:00
Anton Georgiev
16168ddd5b Merge pull request #3997 from Klauswk/DetectSystemLang 
[HTML5] Add support to default system/browser language
 2017-06-26 16:18:22 -04:00
Klaus Klein
ca09b69555 Merge branch 'Acl' into Refactor2x 
* Acl:
  Add check to undefined role
  Lint to eslint
  Missing merge file
  Fix lint problems
  Change Acl lookup
  Change ACL to be more extensible
  Fix a few review comments
  Acl refactor working
  Mostly working, still problems with user subs
  Code refactored
 2017-06-19 11:28:17 -03:00
Klaus Klein
d88d4fb0bc Add stuff from 2.x 2017-06-19 10:13:35 -03:00
Maxim Khlobystov
237bcd7f9b Remove the old Meteor shell configs 
Those values are now in .npmrc file.
 2017-06-15 05:15:26 +00:00
Oswaldo Acauan
ccb6fd2a53 Fix merge conflicts 2017-06-07 12:01:18 +00:00
Klaus Klein
0d9525164f Add support to default system/browser language 2017-06-06 09:33:53 -03:00
Klaus Klein
a96393e23c Change Acl lookup 2017-06-05 11:16:19 -03:00
Klaus Klein
9b41e3a475 Merge remote-tracking branch 'upstream/master' into Acl 
* upstream/master:
  HTML5 - added new line at the end of the file
  Add check for min/max length for chat message
  HTML5 - fixed setting's dropdown re-render issue
 2017-06-05 08:37:17 -03:00
Klaus Klein
fc73992a63 Fix a few review comments 2017-06-01 17:40:55 -03:00
Klaus Klein
8a31d29e17 Acl refactor working 2017-06-01 14:32:04 -03:00
Oswaldo Acauan
3702da3e08 Add check for min/max length for chat message 2017-06-01 14:24:29 +00:00
Klaus Klein
a4c8ff493a Code refactored 2017-05-31 14:54:43 -03:00
Anton Georgiev
3dc21e2cae increase the connectionTimeout value for production 2017-05-11 15:20:59 -04:00
Klaus Klein
b2195da345 Fix client reconnection timeout 2017-05-05 11:30:15 -03:00
Oswaldo Acauan
71fc15a803 Add presenter upload capabilities 2017-05-03 13:36:16 -03:00
Anton Georgiev
9684195c5f minor changes in strings 2017-04-27 17:23:43 -04:00
Anton Georgiev
684f87e77a demote html5 moderator user to viewer based on flag 2017-04-27 16:07:27 -04:00
gcampes
ded1de0b40 Adds localization dropdown 2017-04-06 09:36:59 -03:00
gcampes
3ea21df973 Fix closed captions settings issue 2017-04-06 08:46:15 -03:00
gcampes
acb8b1155b Merge conflicts 2017-03-20 15:00:04 -03:00
Oswaldo Acauan
be7f36e00c Refactor the i18n server code 2017-03-09 19:50:21 +00:00
Oswaldo Acauan
886edff059 Add missing configuration file 2017-02-06 19:14:48 +00:00
Anton Georgiev
1b950f5e78 limit sound on unread chat via Settings and Config 2017-01-24 17:32:25 -05:00
KDSBrowne
08e6a32e2b Show audio modal on client load 2017-01-10 15:14:23 -08:00
Anton Georgiev
8608c6b716 comply with feedback - about component 2016-12-08 15:59:52 +00:00
Anton Georgiev
b56ee1e553 add client information in About 2016-12-07 21:14:14 +00:00
Anton Georgiev
3ed395d079 update client information 2016-12-07 20:52:07 +00:00
KDSBrowne
bf3a65ccf2 added 'warn' level to production 2016-12-01 10:59:58 -08:00
KDSBrowne
24643f01dd using config file for logger level 2016-12-01 08:15:57 -08:00
Matthew Marangoni
d21545c847 added html5 stun request and reply 2016-10-25 07:59:14 -07:00
Oswaldo Acauan
79cdf636eb Rewrite Redis related classes 2016-10-18 12:03:51 +00:00
KDSBrowne
db461591d4 HTML5 Welcome Chat Message Fixed 2016-09-14 07:26:45 -07:00
Anton Georgiev
cf45e2ab96 remove obsolete package version and environment path 2016-08-24 22:50:57 +00:00
Laily Ajellu
361ce7f19f HTML5 - adds captions to config file 2016-08-23 16:48:11 -07:00
Laily Ajellu
2105e911ef HTML5 - Adds more yaml, adds correct properties to objects in Gruntfile, cleans up logger.js 2016-08-23 14:35:28 -07:00
Laily Ajellu
ce50f58c36 HTML5 - removes old settings and changes setting dependant files 2016-08-23 07:35:06 -07:00
Lajellu
8e7b1d6317 HTML5 - Changes config organization and all files dependant on config files 2016-08-17 08:48:03 -07:00