Commit Graph

1398 Commits

Author SHA1 Message Date
Anton Georgiev
a165d3a7e3
Merge pull request #11606 from prlanzarin/u22-sadl1
video-provider: add video pagination UI toggle (was #10970)
2021-03-11 16:05:33 -05:00
Ramon Souza
150bedf16d fix locales url settings + captions locales order 2021-03-11 15:33:48 -03:00
Tainan Felipe
87ebdbd02a Merge remote-tracking branch 'upstream/develop' into fix-chat-issues 2021-03-11 10:07:16 -03:00
prlanzarin
d00e8e0436 Merge remote-tracking branch 'origin/develop' into u22-sadl1 2021-03-11 12:31:10 +00:00
Ramón Souza
0105373cee
Applies changes needed to serve locale files as static content (#11234)
* moving locales folder to /public and applying changes needed to serve locales as static files

* better dev/prod check

* transifex pull script changes to match new locales directory + ignore locales with less than 100 lines

* fix local/prod locales path

* merge fallback messages

* applies new locale changes to legacy client

`bbb-html5.nginx` file content should also be changed to the following:

```
location /html5client/locales {
  alias /usr/share/meteor/bundle/programs/web.browser/app/locales;
}

location /html5client/compatibility {
  alias /usr/share/meteor/bundle/programs/web.browser/app/compatibility;
}

location /html5client/resources {
  alias /usr/share/meteor/bundle/programs/web.browser/app/resources;
}

location /html5client/svgs {
  alias /usr/share/meteor/bundle/programs/web.browser/app/svgs;
}

location /html5client/fonts {
  alias /usr/share/meteor/bundle/programs/web.browser/app/fonts;
}

location /html5client {
  # proxy_pass http://127.0.0.1:4100; # use for development
  proxy_pass http://poolhtml5servers; # use for production
  proxy_http_version 1.1;
  proxy_set_header Upgrade $http_upgrade;
  proxy_set_header Connection "Upgrade";
}
```
2021-03-11 06:42:41 -05:00
Anton Georgiev
c280769ebf
Merge pull request #11559 from MaximKhlobystov/dragndrop-poll-23
Editing poll options via drag and drop
2021-03-10 16:40:00 -05:00
prlanzarin
25439dfdbd video-provider: add pagination toggle en locale 2021-03-10 18:45:48 +00:00
prlanzarin
cf8b5e422f video-provider: add pagination settings toggle 2021-03-10 18:44:23 +00:00
Maxim Khlobystov
619c5ed176 Make the poll drag and drop feature optional 2021-03-10 18:23:25 +00:00
Anton Georgiev
47b685003e
Enable enableGuestLobbyMessage by default (html5) 2021-03-10 12:24:09 -05:00
Anton Georgiev
bbec7efb57
Merge pull request #11593 from pedrobmarin/2.3-lobby-message
Add guest lobby messages
2021-03-10 11:35:35 -05:00
Anton Georgiev
65fd2d434a
Merge pull request #11584 from ramonlsouza/issue-9856
When a moderator ends a meeting, indicate to viewers who ended the meeting
2021-03-10 05:59:43 -05:00
Tainan Felipe
927e2167bc Re-implements chat sync and clear 2021-03-09 17:52:20 -03:00
Pedro Beschorner Marin
0365018e92 Add guest lobby messages
Moderators are able to send a message to the meeting's guest lobby. This new
event reaches bbb-web and is sent to the guest user with her/his status response
while polling. All guest users that are waiting for acceptance will be able to
read this message.

enableGuestLobbyMessage is disabled by default.
2021-03-09 11:02:25 -03:00
Ramon Souza
0a09112f80 split end meeting message in two parts 2021-03-08 16:14:09 -03:00
Ramon Souza
c9ac737207 display name of the user who ended the meeting 2021-03-08 13:05:33 -03:00
Anton Georgiev
68cfcd0215
Merge pull request #11544 from pedrobmarin/guest-doorbell
Waiting users audio and push alerts
2021-03-05 09:13:29 -05:00
Anton Georgiev
c9bbcebe59
Revert "Add reconnection and sync handler" 2021-03-05 03:53:36 -05:00
Anton Georgiev
228bad03d5 Merge branch 'v2.2.x-release' of github.com:bigbluebutton/bigbluebutton into march4-merge 2021-03-04 21:25:47 +00:00
gersti07
ae25bb4895 add locales 2021-03-04 19:22:13 +00:00
gersti07
b36042babd implemented add polloptions via drag and drop
(merging with 2.3)
2021-03-04 19:20:17 +00:00
Tainan Felipe
51f073197b put enable to top 2021-03-04 14:10:08 -03:00
Tainan Felipe
21045abf16 Merge remote-tracking branch 'upstream/develop' into issue-11438 2021-03-04 11:29:01 -03:00
Pedro Beschorner Marin
e08af4b43e Include waiting users push alert in settings
Since we added audio alert notifications in settings controls there was an ampty
grid gap reserved for the push alerts.
2021-03-03 16:26:15 -03:00
Vitor Vanacor
65ceb37872 Change default guestWaitingAudioAlerts to false
Co-authored-by: Pedro Beschorner Marin <pedrobmarin@gmail.com>
2021-03-03 15:26:26 -03:00
Vitor Vanacor
f2e40d3286 guestWaitingAudioAlert moved to settings 2021-03-03 15:24:54 -03:00
Anton Georgiev
de3cbec87a
Revert custom changes to settings.yml
Inadvertently introduced by #11514
2021-03-03 13:09:00 -05:00
Vitor Vanacor
d9007d2ce6 Add sound notification for waiting guest
Both debounce or throttle could be used to prevent a spammer from
annoying the moderators.
With debounce, a spammer won't even be noticed by the mods, but
there won't be new notifications for legit guests during the spam.
With throttle, a spammer could still annoy the mods, we would only make
the interval between notifications bigger.
It is a tradeoff. An ideal solution would be preventing spamming from
the same user, but probably unnecessarily complex.
2021-03-03 15:03:00 -03:00
Anton Georgiev
eba2d0ab58
Merge pull request #11535 from pedrobmarin/etherpad-patch
Rework padIds and turn bbb-web pad aware
2021-03-02 14:48:34 -05:00
Anton Georgiev
9848672775
Bumped up copyright year to 2021. Closes #11519 2021-03-02 14:20:27 -05:00
Tainan Felipe
71e0ca9d92 Add sync and reconnection handler 2021-03-02 11:35:26 -03:00
Mohamed Amine Ben Salah
4dc679d000 Adds tests recording + updates some outdated tests + linting 2021-02-26 12:52:17 -03:00
Louis-Michel Couture
33c8bf1416
Remove extra period 2021-02-25 10:04:39 -05:00
Anton Georgiev
dce2c1a219
Reworded app.connection-status.empty 2021-02-24 13:29:52 -05:00
Anton Georgiev
382e661b92 disable customHeartbeat #10826 2021-02-24 13:00:59 -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
Mohamed Amine Ben Salah
5fbca007c4 removes unused 'app.poll.yn' from locales/en.json 2021-02-23 12:09:36 -03: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
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
Ramon Souza
043fa4bac8 fix user-sent poll result messages 2021-02-19 10:57:11 -03:00
hiroshisuga
195bb8363d
Update en.json 2021-02-19 17:18:26 +09:00
Anton Georgiev
ca9a3a6500 Pulled HTML5 locales on Feb 18, 2021 2021-02-18 22:15:35 +00: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
Ramon Souza
3778ccb397 fix layout params not affecting the meeting 2021-02-18 13:11:02 -03: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
b2c4244276 Merge branch 'develop' of github.com:bigbluebutton/bigbluebutton into 2.3-alpha5-with-split-meteor-roles-10349 2021-02-16 19:55:10 +00:00
Anton Georgiev
adefc6a20c
Merge pull request #11341 from ramonlsouza/breakout-invitation-settings
Add property to settings.yml to enable/disable breakout invitations to moderators
2021-02-09 15:50:24 -05:00
Pedro Beschorner Marin
c0a7f9cd92 Replace FNV32a pad's id generator with salted SHA1
When managing Etherpad's pads, Meteor makes API calls to initiate the closed captions
and shared notes modules. The pad id was being mapped to a shorter id than the meeting
id because of a Etherpad lenght limitation.

Changed to something less guessable.
2021-02-09 12:59:59 -03:00
Anton Georgiev
e2e0b78d40 Merge branch 'develop' of github.com:bigbluebutton/bigbluebutton into split-meteor-roles-on-top-of-2.3-alpha6 2021-02-08 23:39:42 +00:00