Commit Graph

573 Commits

Author SHA1 Message Date
Pedro Beschorner Marin
1949da3513 feat(playback): add theme toggle's locale
Reference: https://github.com/bigbluebutton/bbb-playback/pull/183
2022-03-29 17:42:07 -03:00
Daniel Petri Rocha
b29175a6c5
Merge branch 'develop' into pads-shared-notes-upload 2022-03-27 23:21:32 +02:00
muhammadameen252
ce590fc1c3 Merge branch 'v2.5.x-release' of https://github.com/bigbluebutton/bigbluebutton into HEAD 2022-03-24 20:14:43 +05:00
Joao Victor
0ea405b67f feat: allow for moving users among breakouts + modal design updates 2022-03-24 10:56:07 -03:00
KDSBrowne
369638e758 add notification labels 2022-03-23 18:22:42 +00:00
KDSBrowne
3bb184f3a4 add lock viewers cursor setting UI 2022-03-22 03:14:40 +00:00
muhammadameen252
2b353d62e7 changed name of warning locale and resolved pasting text warning bug 2022-03-22 00:44:21 +05:00
muhammadameen252
7b7f3ff41c added auto optioning feature in poll 2022-03-21 22:58:11 +05:00
Ramon Souza
a89e9da4ea Merge remote-tracking branch 'upstream/develop' into issue-14382 2022-03-16 16:53:17 -03:00
Daniel Petri Rocha
78f5a248f4 Refactoring: push business logic and custom UI into their own containers 2022-03-15 16:12:46 +01:00
Ramón Souza
b4bf65ffe1 improve accessibility of notification modal 2022-03-14 16:48:17 +00:00
Ramón Souza
35ae2a9e77 record notify modal 2022-03-11 20:26:26 +00:00
Ramón Souza
cc54f167f7 remove unused code 2022-03-11 17:16:39 +00:00
Ramón Souza
902899ba2c modal consent meeting can be recorded 2022-03-11 17:10:54 +00:00
Pedro Beschorner Marin
5cd2b0b635 Merge remote-tracking branch 'bigbluebutton/v2.5.x-release' into f-v-amccc 2022-03-10 12:25:17 -03:00
Max Franke
57a71e7703 Revert "feat(layout): locales"
This reverts commit 8bc8f85d
2022-03-09 17:13:52 -03:00
Max Franke
0f27b1add4 feat(layout): new layout modal
Add a new modal that makes it easier to switch between layouts
Adds a new flag in html5 settings that allows to enable/disable
keepPushing layout
2022-03-09 17:00:06 -03:00
Anton Georgiev
506468e4b7
Merge pull request #14495 from gustavo-em/mobile_translations
feat: translations to mobile app
2022-03-09 13:48:39 -05:00
Anton Georgiev
e874d2ed9f
Update bigbluebutton-html5/public/locales/en.json 2022-03-09 13:48:22 -05:00
Anton Georgiev
1b949a7d5c
Update bigbluebutton-html5/public/locales/en.json 2022-03-09 13:48:12 -05:00
Daniel Petri Rocha
4995ad5d82 Shared notes: client-side UI, get PDF from bbb-pads 2022-03-08 01:25:44 +01:00
Ramón Souza
b734039965 change no presentation placeholder message 2022-03-07 18:34:07 +00:00
Pedro Beschorner Marin
6ff1d680d9 feat(video): add meeting camera cap control
Include `meetingCameraCap` API param on create and enforce both server and
client to control the number of simultaneous webcams a meeting can have.

Disabled by default.
2022-03-07 09:36:55 -03:00
Anton Georgiev
fe0db22d4d
Merge pull request #14491 from JoVictorNunes/issue-14384
feat(breakout): improve the front-end part for managing breakout duration
2022-03-04 10:15:32 -05:00
Joao Victor
77c6c93308 Remove locale strings 2022-03-04 11:04:09 -03:00
Joao Victor
a6f16083b5 Improve the front-end part for managing breakout duration
.
2022-03-04 09:16:43 -03:00
Anton Georgiev
5f884f6674 Merge remote-tracking branch 'bbb/v2.4.x-release' into merge-24-into-25 2022-03-03 18:35:05 +00:00
Anton Georgiev
d89470a96f
Merge pull request #14406 from JoVictorNunes/issue-14380
feat(presentation): new presentation menu and snapshot of the current presentation
2022-03-02 13:50:34 -05:00
gustavo-em
030f089499 translations to mobile app 2022-03-01 14:33:44 -03:00
Anton Georgiev
a75ab0c073
Merge pull request #14421 from gustavotrott/update-breakout-duration
feat: Update breakout duration
2022-02-24 15:18:54 -05:00
Ramón Souza
35d99af297 add tooltip to raise hand notification 2022-02-24 17:00:27 +00:00
Paulo Lanzarin
79d5c835c0
Merge pull request #14433 from pedrobmarin/f-v-auccc
feat(video): add user camera cap control
2022-02-24 13:15:22 -03:00
Anton Georgiev
8e0fc7ddc0
Merge pull request #14451 from ramonlsouza/24-25-feb24
chore: Merge 2.4 into 2.5
2022-02-24 10:46:14 -05:00
Ramón Souza
138f4d64e4 Merge remote-tracking branch 'upstream/v2.4.x-release' into v2.5.x-release 2022-02-24 14:49:56 +00:00
Anton Georgiev
ae840d00eb
Merge pull request #14365 from JoVictorNunes/dashboard-user-details
feat(Dashboard): a new modal for displaying user details
2022-02-24 08:13:25 -05:00
Joao Victor
fd77591db3 A lot of UI-related fixes 2022-02-23 14:38:29 -03:00
João Victor Nunes
4635f14bac
Change message text
Co-authored-by: Anton Georgiev <antobinary@users.noreply.github.com>
2022-02-23 08:16:21 -03:00
Lucas Zawacki
65c376531e feature(layout): Use layout push as a boolean option 2022-02-22 18:25:08 -03:00
Arthurk12
6904b3e024 feat(layout): locales 2022-02-22 18:17:46 -03:00
Pedro Beschorner Marin
e8ff5ebdc8 feat(video): add user camera cap control
Include `userCameraCap` API param on create and enforce both server and
client to control the number of simultaneous webcams an user can share.

Default set to 3.
2022-02-22 13:13:48 -03:00
Joao Victor
f13103ea7b New message for presentation item status 2022-02-21 15:01:55 -03:00
Gustavo Trott
fb263babe6 Implements update breakout duration, and removes extend 2022-02-21 08:14:34 -03:00
Joao Victor
6d8b9ad8b5 New presentation menu and snapshot of the current presentation 2022-02-18 17:45:16 -03:00
Pedro Beschorner Marin
ed0efc0d6b feat(playback): add shortcuts locale
Playback has a list of shortcuts displayed at it's about modal. Add
missing locales for proper translation.

Follows https://github.com/bigbluebutton/bbb-playback/pull/168
2022-02-17 20:01:17 -03:00
Anton Georgiev
34f8ff142f
Update bigbluebutton-html5/public/locales/en.json 2022-02-17 16:26:11 -05:00
Tainan Felipe
81ca7253af Fix missing locale 2022-02-17 19:58:13 +00:00
Anton Georgiev
4ba0078340
Merge pull request #14281 from gustavo-em/version_in_client
feat: (Optional) Showing BBB version in About modal
2022-02-17 08:47:14 -05:00
Anton Georgiev
070eafe880
Merge pull request #14334 from Tainan404/fix-left-guest-user
Add a message for when the guest isn't valid
2022-02-16 14:55:00 -05:00
Joao Victor
d568856806 New user details modal 2022-02-14 12:30:01 -03:00
Tainan Felipe
b730ef7aa2 Add a message for when the guest isn't valid 2022-02-10 16:31:35 -03:00
Ramón Souza
dba04834c7 Merge remote-tracking branch 'upstream/v2.4.x-release' into 2524-feb08 2022-02-09 15:52:42 +00:00
Joao Victor
b43075f815 Changes toast notification for when screenshare has stopped due to data saving 2022-02-07 14:27:14 -03:00
Joao Victor
3e515b96e9 Implements some updates on Learning Dashboard 2022-02-07 10:46:47 -03:00
gustavo-em
fe6428d665 add settings.yml and rule in component to show version 2022-02-04 16:41:46 -03:00
Anton Georgiev
68f9c36d8e
Merge pull request #14228 from gustavotrott/breakouts-message-to-all
feat: Send a chat message to all breakouts simultaneously
2022-02-03 10:25:20 -05:00
Pedro Beschorner Marin
77a0f636f6 refactor(locale): adjust playback ids
Since the last playback refactor those ids have been changed.

Propagating these changes over here will make it easier for bbb-playback to
fetch them.
2022-02-02 09:34:24 -03:00
Gustavo Trott
eb567eb106 Handle message to all breakouts sent 2022-01-28 14:41:10 -03:00
Gustavo Trott
759535eb62 Implements message to all breakout rooms 2022-01-26 17:02:38 -03:00
Ramón Souza
16cd3c4ebb Merge remote-tracking branch 'upstream/v2.4.x-release' into dev-24-0125 2022-01-25 16:56:52 +00:00
Anton Georgiev
5f4c5cdedb
Merge branch 'develop' into r-r-e-acea 2022-01-24 16:05:57 -05:00
Pedro Beschorner Marin
c9043655f1
Merge branch 'develop' into position-in-waiting-queue 2022-01-24 14:31:03 -03:00
KDSBrowne
b5f973ee6b add polite SR message for presentation slide change 2022-01-23 17:00:05 +00:00
Pedro Beschorner Marin
810deb907b refactor(etherpad): access control et al.
Move all Etherpad's access control from Meteor to a separated [Node application](https://github.com/bigbluebutton/bbb-pads).
This new app uses [Etherpad's API](https://etherpad.org/doc/v1.8.4/#index_overview)
to create groups and manage session tokens for users to access them. Each group
represents one distinct pad at the html5 client.

- Removed locked users' access to pads: replaced readOnly pad's access with a new pad's content sharing routine
- Pad's access is now controlled by [Etherpad's API](https://etherpad.org/doc/v1.8.4/#index_overview)
- Closed captions edited content now reflects at it's live feedback
- Improved closed caption's dictation mode live feedback
- Moved all Etherpad's API control from Meteor to a separated [app](https://github.com/bigbluebutton/bbb-pads)
- Included access control both in akka-apps and bbb-pads
2022-01-21 16:56:01 -03:00
Arthurk12
b29f014e1e refactor(presentation): add locales 2022-01-20 17:51:09 +00:00
Aleksandar Vasilev
6935b8293c
Merge branch 'bigbluebutton:develop' into position-in-waiting-queue 2022-01-16 02:59:40 +01:00
Aleksandar Vasilev
6103ae960d
Merge branch 'bigbluebutton:develop' into develop-private-guest-lobby-messages 2022-01-16 02:58:43 +01:00
Ramón Souza
f6e65f58c5 merge 2.4 into develop and resolve conflicts - partial 2022-01-12 16:40:45 +00:00
SashoVihVas
1862f60e05 Add private guest lobby messages 2022-01-12 14:10:30 +00:00
SashoVihVas
2d7c82e73d Add position in waiting queue for guest users 2022-01-12 03:08:43 +00:00
KDSBrowne
77bf16c726 update lower hand string 2022-01-11 12:58:04 +00:00
KDSBrowne
4ec19006db add promoted / demoted notification 2022-01-11 05:02:24 +00:00
Anton Georgiev
e916d24574
Merge pull request #13986 from KDSBrowne/bbb-new-msg-aria
Update SR New Message Notification
2022-01-10 12:47:15 -05:00
Anton Georgiev
14d3922846 refactor: Rename L Dashboard to L Analytics Dashboard 2022-01-07 19:22:05 +00:00
KDSBrowne
a7f69f13c7 add SR alert for new messages when userlist is closed 2021-12-28 05:40:51 +00:00
Max Franke
7e2a3c3bca feat(webcams): client side implementation of webcam pin 2021-12-21 16:58:39 -03:00
Anton Georgiev
3ca8f2cc22
Merge pull request #13797 from JoVictorNunes/issue-13214
fix: camera background localization
2021-12-15 13:42:21 -05:00
prlanzarin
ee845a159e feat(webcams): add UI to allow moderators to close other user`s webcams 2021-12-15 13:11:56 +00:00
Joao Victor
2c1706d186 fixes conflicts 2021-12-13 16:57:18 -03:00
Joao Victor
3754c075ae fixes RTL mode 2021-12-13 16:38:10 -03:00
Anton Georgiev
797fc49633 TEMP 2021-12-09 20:37:05 +00:00
Anton Georgiev
def60fbcbc
Merge pull request #13818 from prlanzarin/u24-lift-wsb
feat(webcam): add a way to re-open video preview without multiple cameras
2021-12-02 17:26:23 -05:00
Anton Georgiev
94f85ad68a
Merge pull request #13678 from gustavotrott/breakouts-n-groups-assignments-2.5
feat: Auto assign Breakouts (names and users) using previous rooms info or groups info
2021-12-01 15:01:23 -05:00
Joao Victor
2b554ad47f fix: camera background localization 2021-12-01 08:20:04 -03:00
KDSBrowne
e86740becc update guest lobby title string 2021-11-29 14:48:51 +00:00
Gustavo Trott
fed7b366bf Remove button to Share Dashboard link 2021-11-26 15:50:33 -03:00
Max Franke
310add10ed feat(webcam): add a little button to webcam button
Add the <ButtonEmoji/> to the webcam button. Now it
is possible to change the webcam settings and change
your settings without having to turn off sharing.
Modifies the <ButtonEmoji/> component so that it can
receive an onClick per props.
It is possible to disable this feat in the settings.yml
2021-11-26 12:53:11 +00:00
Anton Georgiev
0ecd55185a
Merge pull request #13626 from JoVictorNunes/issue-13507
refactors Learning Dashboard and add new functionalities
2021-11-25 10:03:29 -05:00
Gustavo Trott
0b6ab8ccc7
Merge branch 'develop' into breakouts-n-groups-assignments-2.5 2021-11-25 11:16:34 -03:00
João Victor
37aef70962 improves connection status tab in mobile devices 2021-11-23 09:05:02 -03:00
Joao Victor
e84cfab5fa refactor: connection status modal UX 2021-11-22 08:25:07 -03:00
João Victor
602ed33b05 moves download data factoring code to services folder and adds location to the table header 2021-11-18 10:03:22 -03:00
Joao Victor
af94ed6ba9 refactors Learning Dashboard and adds new functionalities 2021-11-18 08:23:36 -03:00
Gustavo Trott
8555187df3 Resolve conflicts with Develop branch 2021-11-11 14:02:03 -03:00
Gustavo Trott
e919e24b38 Auto assign breakout names and users using lastBreakout or groups 2021-11-11 10:10:31 -03:00
Anton Georgiev
5bc33dce2e
Merge pull request #13647 from JoVictorNunes/pub-error-poll
fix: publication for user response polls
2021-11-08 13:43:50 -05:00
Joao Victor
5e82448be3 fixes the publication for user response polls 2021-11-05 11:11:55 -03:00
Max Franke
b507eeb80f feat(external-videos): rewrite fullscreen button
Following BBB v2.4 new layout manager fullscreen changes
2021-10-29 10:55:34 -03:00
Anton Georgiev
022f125e15 Merge branch 'v2.4.x-release' of github.com:bigbluebutton/bigbluebutton into merge-24-dev 2021-10-29 13:24:51 +00:00
Anton Georgiev
c60ef3c179
Merge pull request #13253 from ramonlsouza/PR-11359
feat: multiple choice poll
2021-10-26 14:42:29 -04:00
Anton Georgiev
0a44cf0ebb
Merge branch 'v2.4.x-release' into discart-poll-button 2021-10-26 12:35:30 -04:00
Max Franke
1e3c5d1b65 feat(poll): add cancel poll button
Add a new button that adds the option to cancel the polling and its results.
Avoiding the user from having to close the poll, and open another in the
actions bar.
2021-10-26 10:45:52 -03:00
Philipp Memmel
50648b1886 allow to push custom and smart layout to participants 2021-10-24 15:23:34 +00:00
Anton Georgiev
1622425cbc Merge branch 'develop' of github.com:bigbluebutton/bigbluebutton into 2.4-into-develop 2021-10-22 19:12:58 +00:00
Gustavo Trott
64be1d1494 Put exclamation point in localized string instead of html 2021-10-20 10:58:27 -03:00
Ramón Souza
1cc066366f Merge remote-tracking branch 'upstream/develop' into PR-11359 2021-10-19 16:41:36 +00:00
Anton Georgiev
a1e3bbebd3
Merge pull request #13488 from gustavotrott/learning-dashboard-individual-token
refactor: Makes LearningDashboard data be provided by bbb-web (avoid demoted user to receive updates)
2021-10-18 13:37:03 -04:00
Gustavo Trott
0102104fbe Makes bbb-web provide LearningDashboard data while meeting is alive 2021-10-14 14:00:25 -03:00
Anton Georgiev
719afa6cd2 Merge branch 'v2.4.x-release' of github.com:bigbluebutton/bigbluebutton into merge-24-dev 2021-10-14 15:14:22 +00:00
Anton Georgiev
24d672a832 Merge branch 'v2.4.x-release' of github.com:bigbluebutton/bigbluebutton into merge-24-dev 2021-10-14 15:13:17 +00:00
Joao Victor
156f2efdc6 limit the who-is-talking indicators to 8 2021-10-08 11:13:37 -03:00
Joao Victor
f34a160138 limit the number of how is talking indicators to 16 2021-10-07 16:00:39 -03:00
Gustavo Trott
e51cb3d723 Set label to generate BreakoutRoom url more friendly 2021-10-07 10:01:11 -03:00
Anton Georgiev
e13b501b88
Merge pull request #13372 from ramonlsouza/issue-13336
Polling UI Enhancements
2021-10-04 15:57:34 -04:00
Anton Georgiev
5202cd47ca
Merge pull request #13306 from lfzawacki/develop-minimize-all
feature: Allow external video and screenshare to be minimized just like the presentation area
2021-10-04 11:45:51 -04:00
Philipp Memmel
0ba855f91e revert #13341 2021-10-02 08:08:26 +00:00
Lucas Fialho Zawacki
5e7e52b455 fix(presentation-toolbar): Fixed translations and added aria labels 2021-10-01 21:13:06 +00:00
Ramón Souza
d18834c894 remove secondary text of not anonymous poll 2021-10-01 17:50:48 +00:00
Ramón Souza
4ec738eb0a text area validation changes 2021-10-01 12:43:28 +00:00
Ramón Souza
a8ac17253c polling question changes 2021-09-30 18:55:46 +00:00
Anton Georgiev
8ce267fd10
Merge pull request #13346 from ramonlsouza/issue-13333
Tweaks to UI for push layout
2021-09-30 13:50:48 -04:00
Ramón Souza
74bf1a558f push layout UI tweaks 2021-09-30 17:21:03 +00:00
Philipp Memmel
7118c01d24 fix missing message in waiting room when meeting was ended 2021-09-30 14:49:39 +00:00
KDSBrowne
575ae5b12a update message string 2021-09-29 02:20:02 +00:00
KDSBrowne
9cf0dde128 add approved redirect message in guest wait page 2021-09-29 02:13:31 +00:00
Philipp Memmel
18c0dda578 fix missing message in waiting room when meeting was ended 2021-09-28 13:29:52 +00:00
Lucas Zawacki
c4f4641516 Make buttton work even with no presentation and add translations 2021-09-27 21:03:05 +00:00
Philipp Memmel
43df180175 change message when hand has been lowered 2021-09-27 12:13:06 +00:00
Anton Georgiev
ab845b3078 Merge branch 'v2.4.x-release' of github.com:bigbluebutton/bigbluebutton into merge-24-rc-1-into-dev 2021-09-22 15:28:13 +00:00
Anton Georgiev
835f1a8dc9
Merge pull request #13156 from PhMemmel/waiting-room-without-users
feat: Activate waiting room permanently
2021-09-21 09:16:02 -04:00
Ramon Souza
0ca1b7896e Merge remote-tracking branch 'upstream/develop' into PR-11359 2021-09-17 09:12:43 -03:00
Anton Georgiev
81a879df0b
Merge pull request #13207 from KDSBrowne/BBB-wcag-06
WCAG2.1 - Moderator > Whiteboard Toolbar
2021-09-14 10:18:28 -04:00
Philipp Memmel
96fe9836c6 add language key for Activity Score table column heading 2021-09-13 22:20:03 +00:00
Anton Georgiev
e9bab358ec
Merge pull request #13142 from gustavotrott/learning-dashboard-handle-errors
refactor: Learning Dashboard: Handle token errors and show err messages
2021-09-13 17:33:48 -04:00
Anton Georgiev
4c4fcdfdf0
Merge pull request #13210 from ramonlsouza/localize-camera-dropzone
localize camera dropzone label
2021-09-13 15:46:21 -04:00
Anton Georgiev
ee5ce6b1b0
Merge pull request #13196 from KDSBrowne/BBB-wcag-03
WCAG2.1 - Breakout Room Management
2021-09-13 15:46:06 -04:00
Ramon Souza
997f0e8ad5 localize camera dropzone label 2021-09-13 16:41:58 -03:00
Anton Georgiev
86cd0b3ff2
Merge pull request #13205 from KDSBrowne/BBB-wcag-05
WCAG2.1 - Moderator > Start a poll
2021-09-13 12:32:28 -04:00
KDSBrowne
aa3601f5fa add aria region & label to whiteboard toolbar 2021-09-13 14:03:40 +00:00
KDSBrowne
8c4954cb5f update poll opt delete btn | add removed poll opt alert SR 2021-09-13 00:11:45 +00:00
KDSBrowne
dc3c145b29 add SR alert for removed poll option 2021-09-13 00:03:03 +00:00
KDSBrowne
c00e785e80 add error message to input description for SR 2021-09-11 16:02:35 +00:00
Gustavo Trott
9b990b758a
Merge branch 'v2.4.x-release' into learning-dashboard-handle-errors 2021-09-09 16:47:54 -03:00
KDSBrowne
5d981c10fe update string context 2021-09-08 11:27:47 +00:00
KDSBrowne
9664ac235d Merge branch 'v2.4.x-release' of https://github.com/bigbluebutton/bigbluebutton into bbb-wcag-01 2021-09-08 11:26:08 +00:00
KDSBrowne
a9cc277ceb provide screen reader alert for copied chat transcript 2021-09-05 19:22:06 +00:00
KDSBrowne
30735c64a6 update page title with current view 2021-09-04 22:36:48 +00:00
KDSBrowne
5a957440d6 Merge branch 'develop' of https://github.com/bigbluebutton/bigbluebutton into bbb-wcag-01 2021-09-04 17:46:21 +00:00
Philipp Memmel
6ab064fa2e activate waiting room permanently 2021-09-04 11:45:52 +00:00
KDSBrowne
05290b6e22 make guest policy btns announce which is pressed 2021-09-03 12:44:38 +00:00
Ramon Souza
829d62ddbb add different labels for when the user does not have breakout url 2021-09-03 08:52:42 -03:00
Gustavo Trott
72c00f6f21 Uses term User instead of Participant 2021-09-02 17:04:48 -03:00
Gustavo Trott
1adbf116c0 Show errors messages when token is invalid 2021-09-02 16:44:34 -03:00
Anton Georgiev
c140fca2d9
Merge pull request #13093 from PhMemmel/remove_echo_test_connection_message
Change "Connecting" message in audio modal
2021-08-31 15:23:31 -04:00
Anton Georgiev
978d42044b
Merge pull request #13107 from KDSBrowne/bbb-cam-bg-acc
Update Accessibility For Virtual Background Buttons
2021-08-31 09:45:33 -04:00
Gustavo Trott
6970a0ab30
Merge branch 'develop' into learning-dashboard-improvements2 2021-08-30 15:23:04 -03:00
Anton Georgiev
4ecb24b4fa Merge branch 'v2.3.x-release' of github.com:bigbluebutton/bigbluebutton into merge-aug30 2021-08-30 18:11:16 +00:00
Gustavo Trott
ddb383cf05 Sends dashboard token through Cookie instead of URL param 2021-08-30 14:20:39 -03:00
KDSBrowne
c3ef38d73c update virtual background image tooltip text 2021-08-30 00:45:31 +00:00
Anton Georgiev
46af0a8ee0
Merge pull request #13059 from jfsiebel/allow-to-remove-all-presentations
Allow presenter to remove all presentations
2021-08-27 14:06:37 -04:00
Philipp Memmel
05cdba2233 remove specific echo test connecting message 2021-08-27 16:32:19 +00:00
Anton Georgiev
ae65269c67
Merge pull request #13085 from mariogasparoni/feat-copy-data-to-clipboard
feat: allow users to see network stats and copy network data to clipboard
2021-08-27 10:30:23 -04:00
Gustavo Trott
935d11b2eb Merge with develop 2021-08-26 15:08:45 -03:00
Gustavo Trott
2ca508134e Renames EmojisTable to StatusTimeline 2021-08-25 12:19:13 -03:00
Gustavo Trott
cd15f17394 Refactor all references for activity-report renaming to learning-dashboard 2021-08-25 11:38:35 -03:00
Mario Jr
a2eae56839 Show more network info in connection status modal
We now show jitter, lost packets and turn server informations
2021-08-24 16:35:41 -03:00
Joao Siebel
dafd025f67 Add missing error code 408 message.close #12832 2021-08-24 10:29:26 -03:00
Joao Siebel
f3f9ec19eb Allow presenter to remove all presentations 2021-08-23 18:04:16 -03:00
Gustavo Trott
241ab5f233 Adds Emojis timeline view to Dashboard 2021-08-23 11:14:35 -03:00
Gustavo Trott
af61cc74ee Implements Activity Score to Learning Dashboard 2021-08-20 15:26:55 -03:00
Ramon Souza
e59c5f0699 add user leave settings 2021-08-20 14:15:29 -03:00
Ramon Souza
b048e77f10 user leave alerts feature 2021-08-20 13:14:12 -03:00
Ramon Souza
b8e80644cf add focus and tooltips to virtual backgrounds 2021-08-18 14:24:19 -03:00
KDSBrowne
f59c20d350 add aria description tag to randomly assign button 2021-08-17 03:07:20 +00:00
Anton Georgiev
38b54af0bd Merge branch 'v2.3.x-release' of github.com:bigbluebutton/bigbluebutton into aug12-merge 2021-08-12 19:29:33 +00:00
Anton Georgiev
25b7b71243
Merge pull request #12968 from KDSBrowne/_bbb_aria-desc_01
Add Aria Descriptions To Audio Modal & Poll Panel
2021-08-12 14:37:55 -04:00
Anton Georgiev
f51506f76d
Rename ActivityReport to LearningDashboard in menu 2021-08-11 19:09:48 -04:00
KDSBrowne
0ad6cbb2d0 add aria-descriptions to poll panel 2021-08-11 12:16:58 +00:00
KDSBrowne
17aca1dc81 add aria descriptions to audio modal buttons 2021-08-11 12:16:48 +00:00
Mario Jr
60368e0932 feat: allow user to copy html5-client data
Adds a label in connection status modal,
where users will be able to copy information to
clipboard.
2021-08-10 20:45:59 -03:00
Joao Siebel
13913a6111 Remove LEGACY option for valid layouts. close #12858 2021-08-10 09:50:13 -03:00
Anton Georgiev
e7ea9a86f8
fix typo 2021-08-09 15:22:10 -04:00
Anton Georgiev
f036bbb94f fix: Added a label to describe why breakout join takes long time 2021-08-09 19:10:14 +00:00
Gustavo Trott
0b3e25685c Include Dashboard words to locales json of bbb-html5 2021-08-06 19:54:22 -03:00
Max Franke
21ff6c545a style(virtual-backgrounds): disabled when env. is not supported
Disabled virtual backgrounds for not supported
devices, changing the label text.
2021-08-06 13:14:04 +00:00
Tainan Felipe
efc2f7e6e5 Tweak viewer controls for external video component 2021-08-05 17:19:27 -03:00
Anton Georgiev
ee06ec64af
Merge pull request #12854 from PhMemmel/fix_private_chat_aria_alert
fix: Announce new private chat messages in screenreader
2021-07-30 17:05:57 -04:00
prlanzarin
b190f74009 refactor(virtual-backgrounds): remove camera effect toggle (video-list) 2021-07-28 13:37:40 +00:00
Philipp Memmel
c73de0beab fix read new messages in screenreader 2021-07-27 20:56:47 +00:00
Anton Georgiev
1a46c1b2c0
Merge pull request #12495 from schiesslm/virtual_background
Virtual background
2021-07-23 12:56:18 -04:00
prlanzarin
9071ba8bc4 refactor(virtual-backgrounds): re-organize virtual background code
Changes (maybe not a complete list):
  - Disable virtualbgs by default
  - Move the virtualbg selector in video-preview to the side below the
profile selection
  - Restore old video-preview sizes
  - Add a wrapper class for MediaStreams (BBBVideoStream)
  - Centralize virtualbg services and business logic code into BBBVideoStream
  - Refactor and centralize virtualbg constant fetching
  - Refactor and centralize virtualbg config fetching
  - Organize virtualbg type definitions
  - Remove added states in video-provider to prevent further bloat
  - Remove added states in video-preview to prevent further bloat
  - Lock virtual bg switching while video-preview itself is locked
  - Add proper virtualbg error surfacing via toasts
  - Refactor iOS availability detection to use centralized UA checker
  - Avoid calling gUM when toggling virtualbgs on/off
  - Make virtualbg video-list-item action a toggle instead of a
state-aware action
  - Make virtualbg switching work in video-preview for cameras that are
already shared. Especially useful when there are multiple source
cameras, and will be important in the near future
  - Add Derivative Work notices in files that are partially copied from
jitsi-meet
  - Simplify track replacing in video-provider
  - Split video-preview UI code for virtualbgs into a separate functional component
2021-07-22 18:53:42 +00:00
Bartu Bazna
9f791a8892 Squashed virtual background commits 2021-07-21 20:00:19 +00:00
Gustavo Trott
b0f9835ffd Merge branch 'develop' into activity-report 2021-07-21 14:20:27 -03:00
Anton Georgiev
472c9a6107 Merge branch 'v2.3.x-release' of github.com:bigbluebutton/bigbluebutton into 237-into-develop 2021-07-20 15:21:21 +00:00
hiroshisuga
4ec9b019f9
Initialize the start/stop dictation button when speech recognition stops after some silence (#12783)
* Update component.jsx
* Update en.json

the speech recognition can stop due to the incompatibility of browser as well.
2021-07-19 16:28:13 -04:00
Gustavo Trott
c70967e7f1 Adds UI buttons to moderators open Activity Report 2021-07-15 21:23:16 -03:00
Gustavo Trott
5c602fd2b0
Merge branch 'develop' into breakoutrooms-set-name 2021-07-12 16:31:38 -03:00
Anton Georgiev
073708d472
Merge pull request #12746 from pedrobmarin/f-apl
feat: add playback locale
2021-07-12 12:15:24 -04:00
Max Franke
5d0ae8ff04 feat(screenshare): change loading icon
Change the previous loading spinner to the new loading dots, ensuring
a bit more UI consistency.
Add the "unhealthy stream" filter to make the dots a little more visible and
remove the loading spinner.
2021-07-09 14:51:38 -03:00
Pedro Beschorner Marin
454173fc6c
Merge pull request #12736 from prlanzarin/u24-gum-store-pricetags
refactor(locales): improve some of video-preview error messages
2021-07-08 14:49:41 -03:00
prlanzarin
15bd0b6087 fix(webcams): add error feedback when media is ejected by the server
Closes #12732
2021-07-08 15:10:22 +00:00
Ramon Souza
8fe8a0ac6b display endWhenNoModerator message 2021-07-08 11:51:00 -03:00
Pedro Beschorner Marin
0b1e7b0fd7 feat: add playback locale
The bbb-playback app (https://github.com/bigbluebutton/bbb-playback)
has received extra updates on it's localization since we started including
polls and external video events as chat messages. To avoid creating a
new Transifex project we voted to append it's tags at the client's
project.
2021-07-08 10:55:28 -03:00
prlanzarin
d851a79f16 refactor(locales): improve some of video-preview error messages
Fix #286
2021-07-07 03:30:10 +00:00
Anton Georgiev
29cd607ecd
Merge pull request #12694 from mariogasparoni/feat-add-device-button-selector
feat(audio): add a new button for selecting audio device
2021-07-06 12:04:18 -04:00
prlanzarin
0453e9e842 fix(webcams): reduce number of gUM calls
Shave off the number of calls in video-preview and video-provider by
using a stream storage

We don´t call an upfront gUM in video-preview anymore to lift the
fingerprinting barrier on device labels and IDs. Flow has been reversed:
upfront enumerate, load first preview, then check if previous
enumeration was obfuscated.

Add a stream storage in video-preview`s service to avoid re-fetching
them in video-providerj

Remove some unneeded video-preview container props

Improve some of video-preview`s error locales
2021-07-02 16:13:31 +00:00
Mario Jr
f379d35158 Merge branch 'develop' into feat-add-device-button-selector 2021-06-25 18:47:41 -03:00
Mario Jr
ce076ffaad feat(audio): add a new button for selecting audio device
This commit adds a new small button over the "Phone/audio" button. Currently
this button pops up the device audio selector, which contains the "Leave audio"
option. This commit brings back the "Leave audio" behavior to the phone
button, using a new smaller button to switch between audio devices.

This issue address the problem reported by #12320 and complements the work done
for #9723.

Some technical details:
Added a new component : ButtonEmoji. This allow us to add an emoji inside
another button.
Modified dropdown trigger a bit: if the trigger contains a ButtonEmoji,
then we will use the emoji to trigger the dropdown (instead of the button
itself). This commit doens't change the default behavior of dropdown (when
the trigger doesn't have a ButtonEmoji component), to avoid regressions with
current dropdowns; this will only change it's behavior when used with
the new ButtonEmoji component.
2021-06-22 08:58:52 -03:00
Ramon Souza
bbb98a6863 add layout change messages 2021-06-21 15:16:57 -03:00
germanocaumo
1fb9870cf7
Apply suggestions from code review
Code style fixes and remove translations other than en to avoid conflicts with transifex.

Co-authored-by: Pedro Beschorner Marin <pedrobmarin@gmail.com>
2021-06-17 10:25:03 -03:00
germanocaumo
349af23f0a Merge branch 'develop' of https://github.com/bigbluebutton/bigbluebutton into anonymous-polls 2021-06-16 21:54:28 +00:00
Anton Georgiev
5ee5ed1970 Merge branch 'v2.3.x-release' of github.com:bigbluebutton/bigbluebutton into merge-june16 2021-06-16 19:54:28 +00:00
Anton Georgiev
078c2da44f
Merge pull request #12560 from ramonlsouza/issue-12557
fix: add minimum duration for breakout room
2021-06-14 17:34:50 -04:00
hiroshisuga
48c938efd5
fix: Translation for chat logger level in debug window (#12577)
* chatlogger
* chatlogger tranalation
2021-06-14 17:08:39 -04:00
Pedro Beschorner Marin
f6fae58ef1
Merge pull request #12522 from pedrobmarin/f-s-rme
feat(screenshare): reduce mirror effect
2021-06-14 14:38:46 -03:00
Pedro Beschorner Marin
068b82b1fa refactor(connection status): remove legacy monitor
Remove parts of a previous connection monitor.

To add some context (as far as my memory goes) to the multiple connection
monitor features the product has, `stats` (currently named `connection status`)
was introduced at the Flash client back in ~2016. @fcecagno and I did it
as a BigBlueButton's Summit activity. Our work was squashed into a single
commit in 92554f8b3e :).

I'm not sure about the whole story behind `network information` (the late
connection monitor added to the HTML5 client) but I assume it should work
as a collector for a bunch of different connectivity monitors. I remember
when it was introduced but I don't know why it wasn't adopted. My best guess
would be because of some performance issues the `user list` had back then.

To follow on why `connection status` replaced `network information` at the
HTML5 client, when I did the `multiple webcams` feature I had to refactor
a big chunk of the `video provider` (#8374). Something that wasn't really
helping there was the adaptation of `stats` that was made to show local
feedback for each webcam connection. Although this feature wasn't being
used anymore, `network information` did rely on that to build up data. With
this monitor gone I assumed it was my responsibility to provide an alternative
so I promoted Mconf's port of the Flash `stats` monitor to BigBlueButton's
HTML5 client (#8579).

Well, that's my perspective on how things went for those features. If
anyone would like to correct me on something or add something else on
that history I would appreciate to know.
2021-06-13 14:02:46 -03:00
Anton Georgiev
78385ab3ea
Merge pull request #12569 from pedrobmarin/f-v-ds
feat(video): data savings
2021-06-12 16:59:38 -04:00
Arthur
78047eb68e feat(video): data savings
Enable video sharing when data savings is activated.
2021-06-12 14:16:32 -03:00
Max Franke
8b274476b1 feat(video): indicate who is sharing webcam
Add the `camera` icon in the user list for whoever is sharing,
in order to improve the understanding of who is sharing the webcam.
It is possible to enable/disable this indication in the settings.yml
2021-06-12 13:40:47 -03:00
Anton Georgiev
169670a36d
Merge branch 'develop' into breakoutrooms-set-name 2021-06-11 16:39:53 -04:00
Gustavo Trott
61b99b7f7b Adds possibility to give to breakout rooms a name 2021-06-11 16:06:56 -03:00
Ramon Souza
385bdf1568 add minimum duration for breakout room 2021-06-11 13:24:36 -03:00
Gustavo Trott
5b579d3a16 Avoid extend breakout rooms time exceed parent meeting remaining time 2021-06-07 14:19:20 -03:00
Max Franke
f2c95c61e3 feat(screenshare): reduce mirror effect
Add the shrink/expand button in the screenshare layout to reduce the mirror/tunnel
effect, when the presenter is sharing the same screen as the application is.
2021-06-07 09:11:32 -03:00
tibroc
306beff1d1 add better user explanations and remaining differences to #12435
PR #12435 was slightly different than #12430 but especially had better explanations for users.
This commit incorporates the remaining ideas from that PR.
2021-06-07 11:01:34 +02:00
tibroc
828cf60cb2 Add option to hide individual answers in polls
This patch adds a new option to hide the individual answers to the presenter
when starting a poll. This includes hiding the answers for the presenter and
informing the other users that the current poll is anonymous.

See #9524
2021-06-07 10:56:14 +02:00
Ramon Souza
4b964f897f improve 'meeting ended by user' message 2021-06-04 13:37:07 -03:00
Gustavo Trott
a312557461 Adds extend breakout room time functionality 2021-06-02 15:29:40 -03:00
Ramon Souza
74143b7782 localize guest wait page 2021-05-21 08:21:37 -03:00
Joao Siebel
70e72cca25 Add warning on meeting end modal about content in meeting. close #10721 2021-05-11 14:34:18 -03:00
Michael Zinsmeister
5ca831ff86 Merged upstream develop branch 2021-05-01 16:59:20 +02:00
Anton Georgiev
0338d7364e
Merge pull request #12204 from ramonlsouza/issue-12024
feat: Add button to close mute alert
2021-04-29 14:08:45 -04:00
Anton Georgiev
60778bf171
Merge pull request #12100 from jfsiebel/better-upload-feedback
Improve feedback to user after a failed file upload
2021-04-29 13:21:37 -04:00
Ramon Souza
ffbbae1ed4 close mute alert 2021-04-29 11:06:27 -03:00
prlanzarin
4ca2145e4d refactor: remove unused Chrome extension locales 2021-04-28 12:39:27 +00:00
Joao Siebel
2f89598d2d Merge remote-tracking branch 'upstream/develop' into better-upload-feedback 2021-04-27 17:46:22 -03:00
Joao Siebel
18385c1de1 Add feedback for some upload status 2021-04-27 16:45:14 -03:00
Anton Georgiev
3455b20501
Rephrased label for chat messages loading 2021-04-23 14:51:24 -04:00
Philipp Memmel
0c4eef0c5a shorten raised hand label 2021-04-22 16:56:41 +02:00
Philipp Memmel
3a56d93436 pluralize label for multiple users 2021-04-22 15:20:06 +02:00
Philipp Memmel
e7da98283f hand raised message differentiates between one and multiple users 2021-04-22 12:08:25 +02:00
Joao Siebel
c5071093d9 Improve feedback to user after a failed file upload 2021-04-20 14:21:12 -03:00
Anton Georgiev
651d09cbd0
Merge pull request #11224 from sapsDev/palm-rejection-develop-v2.3
Fix unintetionally drawing while using an active pencil
2021-04-15 13:34:01 -04:00
hiroshisuga
4db28a2824
Fancy random viewer selection (#11297)
* Revert "Delete bbb-icons-ori.woff"

This reverts commit 84937a0d07.

* Revert "Add files via upload"

This reverts commit 391434445a.

* Revert "Delete bbb-icons.woff"

This reverts commit 7c245c666d.

* Revert "Add files via upload"

This reverts commit 6f8c764c4b.

* Revert "Delete tmp.woff"

This reverts commit 5141e65359.

* Revert "Add files via upload"

This reverts commit c8f7b17b04.

* Revert "Create tmp.woff"

This reverts commit 73c4506594.

* Revert "Delete bbb-icons.woff"

This reverts commit 9d01d58527.

* Revert "Revert "Delete bbb-icons.woff""

This reverts commit d221d290cd.

* Revert "Revert "Revert "Delete bbb-icons.woff"""

This reverts commit c415ff02d1.

* Revert "Revert "Delete bbb-icons.woff""

This reverts commit d221d290cd.

* Revert "Revert "Create tmp.woff""

This reverts commit 267dc412d5.

* Revert "Delete bbb-icons-ori.woff"

This reverts commit 84937a0d07.

* Revert "Delete bbb-icons.woff"

This reverts commit 7c245c666d.

* Revert "Add files via upload"

This reverts commit 6f8c764c4b.

* Revert "Add files via upload"

This reverts commit c8f7b17b04.

* Revert "Create tmp.woff"

This reverts commit 73c4506594.

* Revert "Delete bbb-icons.woff"

This reverts commit 9d01d58527.

* Revert "Revert "Delete bbb-icons.woff""

This reverts commit 64a48f2bd6.

* Revert "Revert "Revert "Delete bbb-icons.woff"""

This reverts commit 9d1b4a068a.

* Revert "Revert "Revert "Revert "Delete bbb-icons.woff""""

This reverts commit b60491d933.

* Revert "Revert "Revert "Revert "Revert "Delete bbb-icons.woff"""""

This reverts commit 16e357091d.

* Revert "Revert "Revert "Revert "Revert "Revert "Delete bbb-icons.woff""""""

This reverts commit e0b70f2055.

* Revert "Revert "Revert "Revert "Revert "Revert "Revert "Delete bbb-icons.woff"""""""

This reverts commit 7b1bde97ed.

* Update UsersMgs.scala

* Update selectRandomViewer.js

* Update clearRandomlySelectedUser.js

* Update addMeeting.js

* Update updateRandomViewer.js

* Update component.jsx

* Update container.jsx

* Update component.jsx

* Update container.jsx

* Update styles.scss

* Update en.json

* Update SelectRandomViewerReqMsgHdlr.scala

* code simplification

* in case only one person to be selected

* Update en.json

* Create en.json

* Update en.json

* Update component.jsx

* Update styles.scss

* Update en.json

* Update updateRandomViewer.js

Fix a typo

* Update component.jsx

When the presenter is moved to a viewer, in the modal of ex-presenter "somebody is selected" should be displayed. Before this modification, "somebody is the only viewer" was displayed.

* add a comment

explaining why a condition is needed.

* Update en.json

* Update en.json

* revert (due to the rename UserMgs -> UserMsgs)

* Update UsersMsgs.scala
2021-04-15 11:12:10 -04:00
Ramon Souza
64258f790d dedicated locales property for shared notes locked text 2021-04-15 11:21:15 -03:00
Anton Georgiev
65b7616da1
Correct upper to lower case for Select random user 2021-04-08 16:00:23 -04:00
Ramon Souza
9e35bb09be reinclude offline users do connection modal 2021-04-01 15:10:15 -03:00
Anton Georgiev
2dfb9d6fa7
Merge branch 'develop' into multiple-choice-poll 2021-04-01 12:38:44 -04:00
Anton Georgiev
6695f7a119
Merge pull request #11813 from mariogasparoni/merge-update-pr-10129
Update and some improvements on PR #10129 - dynamic change audio device
2021-03-30 13:50:30 -04:00
Anton Georgiev
cf6491adc8
Merge branch 'develop' into multiple-choice-poll 2021-03-30 12:49:35 -04:00
Anton Georgiev
87b770fee7
Merge pull request #11807 from jfsiebel/handle-reason-code
Rework banned users
2021-03-30 11:21:56 -04:00
Joao Siebel
c1503a2931 Remove banned users structure and handle reasonCode in validateAuthToken 2021-03-30 10:09:25 -03:00
Mario Jr
60378e8c63 Merge branch 'develop' into merge-update-pr-10129 2021-03-29 19:07:27 -03:00
Mario Jr
cddca95ad1 Fixes and improvements on pr #10129 - dynamic change audio device
Allow listenonly users to change output devices
Fixed dynamic audio device change for firefox
Fixed shortcuts for audio join/leave
Show (with a bold font) the current selected device
[performance] Prevent calling mediaDevices.enumerateDevices every time we render
the selector. This adds a delay (~200ms, on my chrome setup) to render this component
[performance] Do not call enumerateDevices to search for new devices, instead we listen on mediaDevices.deviceChange event
Small refactoring and fixed a few errors that were being throw in browser's console
Fixed device selection when this is done in audio-settings modal
Fallback to default device when current device is removed
Truncate device name length
Renamed "Input","Output" labels to "Microphone","Speakers", respectively
Update eslint rule for accessKey
2021-03-29 18:55:17 -03:00
Mario Jr
cec88c996d Merge remote-tracking branch 'tainan/issue-9723' into merge-update-pr-10129 2021-03-29 18:52:12 -03:00
Anton Georgiev
430c7fc2d7
Removed duplicate key:value pair for en.json 2021-03-29 12:33:01 -04:00
Anton Georgiev
aae72c0547
Merge branch 'develop' into multiple-choice-poll 2021-03-29 11:54:44 -04:00
Pedro Beschorner Marin
280b32d21d Move connection-status to nav-bar
- Removed the connection-status history from the user list's gear
icon and now is opened by the connection-status button. Moderators will
render the same modal as before and viewers will only have access to their
own data.

 - Added data-savings shortcut at the connection-status modal.

 - Added websocket round-trip time.
2021-03-26 10:12:09 -03:00
Simon Hirtreiter
07b8946b39 Merge commit develop into multiple-choice-poll 2021-03-23 09:38:45 +01:00
KDSBrowne
4473fa084b add lower hand label 2021-03-21 23:56:00 +00:00
KDSBrowne
132dfb02d9 add raise hand shortcut and help entry 2021-03-21 23:47:15 +00:00
KDSBrowne
676abd1f85 move raise hand functionality to actions bar 2021-03-21 17:06:16 +00:00
Jonathan Schilling
52637c59e0 Prepare whiteboard toolbar for palm rejection:
* add button to the toolbar to switch palm rejection mode
  * add a message for that new button to the locales/en
  * add boolean palmRejection to state of the toolbar
  * save that boolean also to the session storage, so it is ready to use it in the input handler
2021-03-19 12:35:28 +00:00
Anton Georgiev
b1bbc3fd52
Merge branch 'develop' into multiple-choice-poll 2021-03-17 16:11:49 -04:00
Pedro Beschorner Marin
d90ba5e286 Merge branch '2.3-per-user-wb' into develop 2021-03-16 20:28:39 -03:00
Michael Zinsmeister
b99bd3be0c Merged upstream develop branch 2021-03-14 22:17:19 +01:00
Pedro Beschorner Marin
af64232e45 Change guest policy 2021-03-12 09:19:22 -03:00
Anton Georgiev
9f841bd64b
Merge pull request #11622 from prlanzarin/u23-ilgiardino
[screenshare] Rewrite SFU/Kurento screensharing bridge (+reconnections|audio sharing|QoL, was #11025)
2021-03-12 05:13:11 -05:00
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
edb6ff9455 fix typo 2021-03-11 17:22:46 -03:00
prlanzarin
7eb91f9273 Merge branch 'u22-screenshare18102020' of https://github.com/prlanzarin/bigbluebutton-1 into u23-ilgiardino 2021-03-11 18:49:14 +00: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