Commit Graph

970 Commits

Author SHA1 Message Date
Daniel Schreiber
67a491f07c Fix: use connection id to determine if a user is ejected or not
It used to be a boolean value which was durable if the server is
configured to use localStorage for bbb client settings. This would lead
to permanently blocking a user for all future BBB sessions.

To prevent that we use the connectionID to determine if a user is
blocked or not. If a user rejoins (in the same or a different meeting),
the connectionID is different, so the user can join again.
2023-07-11 15:00:24 +02:00
Anton Georgiev
ec2ad5ed45 chore: upgrade NodeJS to 18 2023-06-13 12:08:58 -04:00
Anton Georgiev
72c575b911 Merge branch 'v2.6.x-release' of github.com:bigbluebutton/bigbluebutton into merge-apr-6 2023-04-06 11:50:26 -04:00
Ramón Souza
bcd504b749 Merge remote-tracking branch 'upstream/v2.7.x-release' into lodash-radash 2023-04-05 09:42:05 -03:00
Carlos
39b308b91f fix(reconnect) waiting for approval
Removed code that enter the old status "waiting for approval".
2023-04-04 10:47:32 -03:00
Ramón Souza
014dfa2670 adjust defaultsDeep merge 2023-03-01 16:48:08 -03:00
Ramón Souza
aa47aaa22a replace lodash merge and mergeWith 2023-03-01 11:52:39 -03:00
imdt
4abc29f9c5 Fixed: Notification for ejected users now delivered. 2023-02-27 11:51:08 -03:00
Ramón Souza
ba9c414989 replace lodash isEqual and isEmpty 2023-02-23 10:27:16 -03:00
Ramón Souza
8315abc2c0 replace lodash find and isArray 2023-02-21 10:14:56 -03:00
André Castro
826fad1f84
Update bigbluebutton-html5/imports/startup/client/base.jsx
Co-authored-by: Anton Georgiev <antobinary@users.noreply.github.com>
2023-02-17 15:31:19 -03:00
imdt
ac8c33c3b0 Notification of: You have been removed from the conference. fixed. 2023-02-17 15:15:39 -03:00
GuiLeme
8af6c547f2 [issue-16284] - Changes in review 2023-01-20 08:44:21 -03:00
GuiLeme
6f5053d492 [issue-16284] - Changes in review 2023-01-19 11:32:00 -03:00
GuiLeme
7bb03551b1 [issue-16284] - changed behavior of not showing anything when user is moved out a breakout 2023-01-19 09:21:28 -03:00
GuiLeme
2e0a85f268 [issue-16284] - tweaked minor problems and fixed blue screen when changing breakout rooms 2023-01-17 11:30:25 -03:00
Ramón Souza
d20079e7b9 fix closed chat on join 2022-11-30 15:32:47 -03:00
Tainan Felipe
b06da1017a Fix client reconnection after meeting end 2022-11-17 15:59:13 -03:00
Ramón Souza
8d0316ed31
Merge pull request #15747 from JoVictorNunes/issue-15713
improvement: add internationalization singleton
2022-10-28 13:24:03 -03:00
Ramón Souza
8ed142a522 Merge remote-tracking branch 'upstream/v2.5.x-release' into merge-258-26 2022-10-21 14:43:23 -03:00
Ramón Souza
8968f1c91a
Merge pull request #15845 from JoVictorNunes/improved-error-screen-messages-backport
[2.5] improvement: error screen messages and logs
2022-10-17 14:24:56 -03:00
Joao Victor
d628131e64 improvement: error screen messages and logs 2022-10-14 14:47:27 -03:00
Ramón Souza
5b274add16
Merge pull request #15777 from germanocaumo/dup-ann-ws-fix-25
chore(whiteboard): backport of annotations dupplication fix
2022-10-14 13:54:45 -03:00
Ramón Souza
38a4c3eae7 remove empty object in logs 2022-10-14 10:36:24 -03:00
Joao Victor
4391d762e8 add missing condition 2022-10-07 16:43:34 -03:00
Joao Victor
ec837a1744 remove console.log 2022-10-07 16:22:35 -03:00
Joao Victor
e4f5317009 fix: unauthenticated user handling and manual disconnection 2022-10-07 16:21:43 -03:00
Joao Victor
010f1c2964 tweak userLeaving and Base 2022-10-07 10:38:50 -03:00
Joao Victor
45199cb6eb fix: stringify all codeError's 2022-10-07 09:18:07 -03:00
Joao Victor
912b7cf70c improvement: add setExitReason method 2022-10-07 09:15:00 -03:00
Joao Victor
7e8cee7340 improvement: error screen messages 2022-10-05 11:30:12 -03:00
germanocaumo
3ecf79cc4f fix(whiteboard): only call annotation upsert in one frontend instance
We were calling upsert in the Annotations collection for the same annotation in all frontend instances, this could lead to the same annotation being inserted
multiple times with different ids due to concurrency.

Added the html5InstanceId of the original request to the redis message so we can use it to only call upsert in one instance.
2022-10-04 10:28:36 +00:00
Ramón Souza
077592df18
Merge pull request #15745 from germanocaumo/dup-ann-ws-fix
fix(whiteboard): annotations duplication in websocket/collection
2022-10-03 15:10:59 -03:00
Ramón Souza
4b4afb6916 remove empty object in logs 2022-10-03 13:48:00 -03:00
João Victor Nunes
19b28de056
Merge branch 'v2.6.x-release' into issue-15713 2022-09-29 10:49:17 -03:00
Ramón Souza
6963bc0db4 Merge remote-tracking branch 'upstream/v2.6.x-release' into add-locale-format 2022-09-28 14:32:01 -03:00
Joao Victor
f8279ab5b4 improvement: add internationalization singleton 2022-09-28 13:48:27 -03:00
germanocaumo
d770a7df8c fix(whiteboard): only call annotation upsert in one frontend instance
We were calling upsert in the Annotations collection for the same annotation in all frontend instances, this could lead to the same annotation being inserted
multiple times with different ids due to concurrency.

Added the html5InstanceId of the original request to the redis message so we can use it to only call upsert in one instance.
2022-09-28 12:03:59 +00:00
Ramón Souza
ab50d4d60e add settings 2022-09-16 13:01:07 -03:00
Ramón Souza
83c9e644b1 add settings 2022-09-16 11:56:56 -03:00
Ramón Souza
706014430c change server name format and add timestamp to logs 2022-09-16 11:09:21 -03:00
Ramón Souza
485103ff93 include server role and instance in logs 2022-09-16 11:09:12 -03:00
Ramón Souza
7bb26b64ff add server health log 2022-09-16 11:09:04 -03:00
Ramón Souza
774da00d16 change server name format and add timestamp to logs 2022-09-16 10:48:21 -03:00
Ramón Souza
facae4e2fb include server role and instance in logs 2022-09-15 16:57:20 -03:00
Ramón Souza
f6642bd2a8 add server health log 2022-09-15 16:56:00 -03:00
Ramón Souza
560d9370c6 adjust html/body lang on page load 2022-09-08 14:25:29 -03:00
Ramón Souza
c6c65c4aa0 add support to xx@xxxx localization files 2022-09-08 11:47:41 -03:00
Joao Victor
c7b4f8bc66 chore/fix: update react-intl to 6.1.0 and add config to disable fallback 2022-08-30 09:32:21 -03:00
Joao Victor
2dd5a73601 chore: update react-intl to 6.1.0 2022-08-29 17:25:43 -03:00
Ramon Souza
edeb70de0d Merge tag 'v2.5.1' into merge25-26-jun16 2022-06-16 13:58:54 -03:00
Ramon Souza
8986fe2853 prevent disconnect in same tab 2022-05-17 13:09:41 -03:00
Ramon Souza
5397498746 prevent user join from multiple tabs with same sessionToken 2022-05-13 16:18:51 -03:00
Ramon Souza
0d3a5326fc Merge remote-tracking branch 'upstream/v2.5.x-release' into 25260-may10 2022-05-10 10:53:00 -03:00
Ramon Souza
a604b05e43 remove unused import base component 2022-05-10 09:23:55 -03:00
Ramon Souza
07f9a192b9 Merge remote-tracking branch 'upstream/v2.4.x-release' into merge-2425-apr27 2022-04-27 15:32:20 -03:00
Lucas
2db9a1b343
Merge branch 'develop' into develop-bbb 2022-04-26 15:08:43 -03:00
Gustavo Trott
720a986d86 Remove html5client/useragent handler 2022-04-25 20:47:59 -03:00
Ramon Souza
18f42e538a remove unused imports/variable in base component 2022-04-18 10:09:55 -03:00
Lucas Zawacki
378d0f18a0 Merge branch 'develop' of https://github.com/bigbluebutton/bigbluebutton into develop-bbb 2022-04-14 18:48:02 +00:00
Lucas Zawacki
83847a21aa Merge branch 'v2.5.x-release-Layouts' of github.com:lfzawacki/bigbluebutton into develop-bbb 2022-04-13 21:08:32 +00:00
Gustavo Trott
b6a1ba9f93 Close breakout when user was removed 2022-04-13 17:53:10 -03:00
Gustavo Trott
77a8aba1f5 Merge remote-tracking branch 'upstream/develop' into breakout-updated 2022-04-12 09:54:25 -03:00
Gustavo Trott
102eee3ba5 Backend portion of breakout Manage Users 2022-04-12 09:50:19 -03:00
Anton Georgiev
1500fb6a29 Merge branch 'v2.5.x-release' of github.com:bigbluebutton/bigbluebutton into merge-25-dev 2022-04-09 00:55:25 +00:00
germanocaumo
cacba3c7e7 feat(html5): add meteor rtt as prometheus metric 2022-04-08 14:27:35 +00:00
germanocaumo
640fe57a26 fix(html5): rename stream-cursor prom metric
Removes meetintId info from the event name in prometheus metric to better concur with other events.
2022-04-08 14:22:29 +00:00
germanocaumo
a04fbc56e1 feat(html5): add error logs and redis prometheus metrics
New config: settings.private.prometheus.collectRedisMetrics disabled by default
2022-04-08 14:21:55 +00:00
Ramon Souza
a80fe263a3 move breakout room ended notification to akka 2022-04-07 09:39:32 -03:00
Joao Victor
e1453f672e Remove old UserJoinedMeeting and UserLeftMeeting notifications 2022-04-06 10:21:49 -03:00
Joao Victor
f3dc734c45 Remove old RecordingStarted and RecordingStopped notifications 2022-04-05 09:58:42 -03:00
Anton Georgiev
3d9c8d0e4c
Merge pull request #14706 from ramonlsouza/issue-14689-25
fix: setSwapLayout happens after other components change its value
2022-03-30 17:05:03 -04:00
Ramon Souza
eee4fde845 prevent setSwapLayout race condition 2022-03-30 15:43:00 -03:00
Ramon Souza
92688ca93a prevent setSwapLayout race condition 2022-03-30 15:31:19 -03:00
Paulo Lanzarin
1fc6584697
fix: remove spurious console.log in base.jsx 2022-03-29 17:52:29 -03:00
Gustavo Trott
057b7514b1 Implements disabledFeatures-chat 2022-03-09 11:19:25 -03:00
Ramón Souza
b55fb32f6e move loading-screen component to common folder 2022-02-15 14:55:08 +00: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
a0434ff1e0 Change message queue concurrency to 1 2022-02-01 14:20:08 -03:00
Joao Victor
fbb807208e Undo presentation queue implementation 2022-02-01 14:18:16 -03:00
Joao Victor
914739ffc2 Add chaining operator 2022-01-28 10:18:55 -03:00
Joao Victor
da13e0aa93 Add own message queue for presentations 2022-01-28 09:59:41 -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
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
Ramón Souza
5e9f30b2a2 append build string to locales requests 2022-01-13 13:14:24 +00:00
Anton Georgiev
797fc49633 TEMP 2021-12-09 20:37:05 +00:00
Ramón Souza
4b1f1594b1 replace arrays in configuration override 2021-11-24 17:09:06 +00:00
KDSBrowne
e184912311 prevent properties of undefined (reading 'toUpperCase') 2021-11-22 00:55:51 +00:00
Ramón Souza
4121f61a59 restore 2.3 fullscreen 2021-11-19 19:26:04 +00:00
Mario Jr
1ee9203fad fix: enable useLocationOrigin in dynamic-import
This makes meteor to work with a reverse proxy, without changing it's
settings
2021-11-09 12:10:25 -03:00
germanocaumo
3dd679761f Merge branch 'v2.4.x-release' of https://github.com/bigbluebutton/bigbluebutton into f-h-prom-agent 2021-11-05 19:38:40 +00:00
germanocaumo
6f1e1d4f4a refactor(prom-html5): serve endpoint via meteor instead of http server +
- separate backend/frontend metrics, only add metrics related to the role
- add role and instance labels
2021-11-05 16:31:23 +00:00
Tainan Felipe
f5eef03f3f Improve data structure to not break on reconnections 2021-11-03 14:37:54 -03: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
prlanzarin
b677f805c1 refactor(virtual-backgrounds): move WASM binaries to public, let nginx serve them 2021-10-14 03:50:39 +00:00
Tainan Felipe
1de8e0779d Add server side reactivity to publications 2021-10-13 15:00:52 -03:00
Paulo Lanzarin
ced2b27f84 refactor: remove unused gauge in bbb-html5 metrics 2021-10-06 19:03:36 +00:00
germanocaumo
8b2fd271de feat(html5-server): add number of meteor methods metric in prometheus 2021-10-06 19:02:36 +00:00
germanocaumo
e5b012d007 refactor(html5-prom): use ES6 imports/exports 2021-10-06 18:56:55 +00:00
germanocaumo
30db4a4122 refactor(html5-prometheus): remove MCS references and change default port 2021-10-06 18:56:32 +00:00