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

28465 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Anton Georgiev
d30f0dc710
Merge pull request #11428 from antobinary/feb18-merge 
Merge 2.2 into 'develop'
 2021-02-18 15:46:45 -05:00
Anton Georgiev
b3b905fd40
Merge pull request #11420 from Tainan404/develop+pr10919+pr10838 
Fix user status in chat
 2021-02-18 15:44:13 -05:00
Anton Georgiev
55e8de4357 Merge branch 'v2.2.x-release' of github.com:bigbluebutton/bigbluebutton into feb18-merge 2021-02-18 20:33:19 +00:00
Anton Georgiev
f2cc9427d4
Merge pull request #11425 from bigbluebutton/dependabot/npm_and_yarn/bigbluebutton-html5/tests/puppeteer/node-notifier-8.0.1 
Bump node-notifier from 8.0.0 to 8.0.1 in /bigbluebutton-html5/tests/puppeteer
 2021-02-18 15:06:07 -05:00
dependabot[bot]
92c6c9a491
Bump node-notifier in /bigbluebutton-html5/tests/puppeteer 
Bumps [node-notifier](https://github.com/mikaelbr/node-notifier) from 8.0.0 to 8.0.1.
- [Release notes](https://github.com/mikaelbr/node-notifier/releases)
- [Changelog](https://github.com/mikaelbr/node-notifier/blob/v8.0.1/CHANGELOG.md)
- [Commits](https://github.com/mikaelbr/node-notifier/compare/v8.0.0...v8.0.1)

Signed-off-by: dependabot[bot] <support@github.com>
 2021-02-18 18:46:41 +00:00
Anton Georgiev
d686f0b04d
Merge pull request #11417 from KDSBrowne/bbb-11097 
Skip publishing poll annotation to whiteboard if presentation swapped
 2021-02-18 13:26:08 -05:00
Anton Georgiev
05354d4cd3
Merge pull request #11424 from KDSBrowne/bbb-add-YNA-poll 
Add yes / no / abstention option to updated Poll UI
 2021-02-18 13:12:26 -05:00
Tainan Felipe
8825cd3789 remove uneeded log 2021-02-18 13:37:10 -03:00
Ramon Souza
3778ccb397 fix layout params not affecting the meeting 2021-02-18 13:11:02 -03:00
KDSBrowne
9aff7ea22b add yes / no / abstention poll btn 2021-02-18 16:06:21 +00:00
Anton Georgiev
e966d6c7b6
Merge pull request #11366 from MaximKhlobystov/updating-poll-ui 
Updated poll UI: question field and typed responses
 2021-02-18 10:32:33 -05:00
Anton Georgiev
d5e7f5cf67
Merge pull request #11339 from basisbit/v2.2.x-release 
Enable video-pagination and cameraQualityThresholds by default
 2021-02-17 18:37:40 -05:00
Anton Georgiev
49cdf9faef
Merge pull request #11413 from gustavotrott/develop 
Include registeredOn date in pubSub user creation messages to replace loginTime creation in Meteor
 2021-02-17 16:56:53 -05:00
Anton Georgiev
d16ee3067d
Merge pull request #11317 from antobinary/2.3-alpha5-with-split-meteor-roles-10349 
Split Meteor roles backend-frontend revisit
 2021-02-17 16:35:23 -05:00
Anton Georgiev
c6253b9953 Merge branch '2.3-alpha5-with-split-meteor-roles-10349' of github.com:antobinary/bigbluebutton into 2.3-alpha5-with-split-meteor-roles-10349 2021-02-17 20:52:33 +00:00
Anton Georgiev
683847304d on frontend attempt to handle events without matching queue 2021-02-17 20:51:36 +00:00
Tainan Felipe
c47b52cf71 Add user online status change 2021-02-17 17:43:41 -03:00