Anton Georgiev
dce2c1a219
Reworded app.connection-status.empty
2021-02-24 13:29:52 -05:00
Anton Georgiev
875f9c1ca9
Merge pull request #11477 from KDSBrowne/bbb-10774
...
Fix whiteboard text-area not allowing input on Firefox
2021-02-24 10:20:36 -05:00
Anton Georgiev
41723e57cd
Merge pull request #11485 from ramonlsouza/issue-11475-fix
...
Fix unnecessary re-renders caused by #11480 changes
2021-02-24 10:17:14 -05:00
Ramon Souza
ea59f59376
fix many re-renders
2021-02-24 12:06:49 -03:00
Anton Georgiev
e0db693ffd
Merge pull request #11483 from ramonlsouza/issue-11445
...
Add break-word to system messages
2021-02-24 10:03:48 -05:00
Anton Georgiev
6472ff8533
Merge pull request #11480 from ramonlsouza/issue-11475
...
Fix moderator welcome message closing border
2021-02-24 08:56:21 -05:00
Anton Georgiev
0111871ee1
Merge pull request #11482 from mariogasparoni/develop
...
Do not return empty array when groupChats is empty
2021-02-24 08:42:52 -05:00
Ramon Souza
b66a7e20fd
add break-word on system messages
2021-02-24 10:33:47 -03:00
Ramon Souza
bf914dd7ff
fix moderator message closing border
2021-02-24 09:07:27 -03:00
KDSBrowne
d2c36c1c94
update handleClick condition (fix text-area for FireFox)
2021-02-24 02:05:23 +00:00
Mario Jr
19c1626c39
Do not return empty array when groupChats is empty
...
Instead, return empty array when both users and groupChats arrays are empty.
The public chat and user chats may be active when groupChats array is empty.
Fixes #11476
2021-02-23 17:52:19 -03:00
Anton Georgiev
416eb512e1
Merge pull request #11426 from Tainan404/fix-nav-bar-notification
...
Fix nav-bar unread message indicator
2021-02-23 13:53:16 -05:00
Anton Georgiev
3c4212cdb2
Merge pull request #10613 from hiroshisuga/fsshortcuthelp
...
Shortcut help for toggle fullscreen
2021-02-23 12:45:48 -05:00
Anton Georgiev
91b09418f7
Merge pull request #11471 from ramonlsouza/pr-11408
...
Show polling button over the full-screened shared-screen
2021-02-23 12:41:10 -05:00
Ramon Souza
08067e905f
polling component also checks if screenshare is fullscreen
2021-02-23 14:04:00 -03:00
Anton Georgiev
4b1ae5e63f
Merge pull request #11398 from hiroshisuga/patch-18
...
Enable arrow keys immediately after fullscreen
2021-02-23 10:35:15 -05:00
Anton Georgiev
bfd564233d
Merge pull request #11468 from mariogasparoni/fix-11029
...
Prevent ejecting user from them main room when leaving breakout room
2021-02-23 10:22:03 -05:00
Anton Georgiev
ff8d157476
Merge pull request #11469 from daminebenq/fix-poll-option-yes-no-abstention
...
Remove unused 'app.poll.yn' from locales/en.json
2021-02-23 10:14:25 -05:00
Mohamed Amine Ben Salah
5fbca007c4
removes unused 'app.poll.yn' from locales/en.json
2021-02-23 12:09:36 -03:00
Ramon Souza
76c4bb6c85
Merge remote-tracking branch 'upstream/develop' into pr-11408
2021-02-23 11:35:21 -03:00
Anton Georgiev
fc001a142c
Merge pull request #11443 from mariogasparoni/develop
...
Do not uncessarily fetch locales at first time you open/save settings menu
2021-02-23 09:31:24 -05:00
Anton Georgiev
777bf01e8b
Merge pull request #11451 from hiroshisuga/patch-23
...
Show modals overlaid on full-screen slide or shared screen
2021-02-23 09:18:50 -05:00
Anton Georgiev
29ffa54044
Merge pull request #11466 from ramonlsouza/fix-skip-check-test
...
Fix skip check test
2021-02-23 09:04:38 -05:00
Ramon Souza
6eaa0c8079
fix skip check test
2021-02-23 10:53:37 -03:00
Anton Georgiev
b8eaf47263
Merge pull request #11454 from schrd/akka-config
...
Akka config
2021-02-23 08:44:00 -05:00
Daniel Schreiber
d53a5f52a5
let bbb-apps-akka read an override config file from /etc/bigbluebutton
...
This change introduces a config file
`/etc/bigbluebutton/bbb-fsesl-akka.conf` which reads the default config
from packages and allows operators to keep their own config file changes
across package upgrades.
bbb-conf is adjusted to deal with this change.
2021-02-23 12:55:48 +01:00
Daniel Schreiber
f3771268f5
adjust bbb-conf to configure bbb-apps-akka in /etc
...
config files from packages should not be changed unless they reside in
/etc
2021-02-23 12:55:23 +01:00
Anton Georgiev
111109674e
Merge pull request #11247 from ramonlsouza/language-dropdown
...
Reduces the number of options displayed on locale settings dropdown
2021-02-22 15:44:29 -05:00
Anton Georgiev
dfa754af79
Merge pull request #11436 from AadityaPrakash/meteor-config
...
Implemented merge option for default and local settings.
2021-02-22 15:30:15 -05:00
Anton Georgiev
aed438b949
Merge pull request #11453 from ramonlsouza/fix-check-on-join
...
Fix bbb_skip_check_audio_on_first_join parameter
2021-02-22 15:29:42 -05:00
Ramon Souza
b01246f23f
rework on echo test flow
2021-02-22 15:09:14 -03:00
Ramon Souza
11d924af70
fix bbb_skip_check_audio_on_first_join
2021-02-22 10:43:58 -03:00
hiroshisuga
f6b7ca779f
show modal over fullscreen
2021-02-22 18:30:33 +09:00
Mario Jr
6508674d38
Prevent ejecting user from them main room when leaving breakout room
...
When user observing changes, we must guarantee these changes are from main room, and not from breakout one.
Fixes #11029
2021-02-21 01:07:25 -03:00
Mario Jr
d961dea594
Do not uncessarily fetch locales at first time you open/save settings menu
...
Locales would be fetched even if you simply open and save settings window (without changing any setting)
We now test it similarly we do on 2.2
Closes #11318
2021-02-20 11:47:46 -03:00
Anton Georgiev
6c5a0de107
Merge pull request #11439 from antobinary/feb18-merge
...
Remove setNumberOfHTML5Processes
2021-02-19 17:01:03 -05:00
Anton Georgiev
feb83f57f3
Remove setNumberOfHTML5Processes
2021-02-19 21:51:56 +00:00
Anton Georgiev
3589ee5232
Merge pull request #11423 from ramonlsouza/fix-layout-params
...
Fix layout params (show participants + show public chat) not affecting the meeting
2021-02-19 11:51:55 -05:00
Daniel Schreiber
98e994c1c5
adjust bbb-conf to change the secret in /etc
2021-02-19 16:56:42 +01:00
Anton Georgiev
100d089246
Merge pull request #11437 from ramonlsouza/new-poll-results
...
Fix user-sent poll result messages
2021-02-19 10:38:34 -05:00
Anton Georgiev
d3a33382fe
Propagate typo fix from #11432
...
Needed for https://github.com/bigbluebutton/bigbluebutton/pull/11432
2021-02-19 10:34:20 -05:00
Ramon Souza
043fa4bac8
fix user-sent poll result messages
2021-02-19 10:57:11 -03:00
Aaditya Prakash
c3a7fde807
Implemented merge option for default and local settings.
2021-02-19 14:44:23 +01:00
Daniel Schreiber
5d620e7acd
let bbb-apps-akka read an override config file from /etc/bigbluebutton
...
This change introduces a config file
`/etc/bigbluebutton/bbb-apps-akka.conf` which reads the default config
from packages and allows operators to keep their own config file changes
across package upgrades. This removes the workaround of copying the
config file to /tmp in preinst and then extracvting API URI and secret
and then in postinst inject it back to the config file in /usr/share
If the config file in /usr does not have the "changeme" secret, then API
URI and secret are extracted and injected to the generated file /etc, so
packages would upgrade in a clean way.
The postrm script removes the config file in /etc if the package is
purged but not if it is just uninstalled.
bbb-install and bbb-conf must reflect this change and replace the API
secret and URL in /etc, not /usr/share
2021-02-19 13:55:36 +01:00
Fred Dixon
901571e807
Merge pull request #11432 from hiroshisuga/patch-22
...
Typo "qestion"
2021-02-19 07:16:51 -04:00
hiroshisuga
195bb8363d
Update en.json
2021-02-19 17:18:26 +09:00
Anton Georgiev
b853b1c9c1
Merge pull request #11431 from antobinary/feb18-merge
...
Pulled HTML5 locales on Feb 18, 2021
2021-02-18 17:16:56 -05:00
Anton Georgiev
ca9a3a6500
Pulled HTML5 locales on Feb 18, 2021
2021-02-18 22:15:35 +00:00
Anton Georgiev
35ea07b4cd
Merge pull request #11429 from antobinary/feb18-merge
...
Remove duplicate import of throttle
2021-02-18 15:54:29 -05:00
Anton Georgiev
58be3d42ef
remove duplicate import of throttle
2021-02-18 20:52:23 +00:00
