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

951 Commits

Author SHA1 Message Date
Ramon Souza
92edd08448 fix start closed chat option 2021-07-20 10:19:48 -03:00
Ramon Souza
a7c545ff1f refactor reason -> ejectedReason 2021-07-08 13:09:25 -03:00
Ramon Souza
8fe8a0ac6b display endWhenNoModerator message 2021-07-08 11:51:00 -03:00
Anton Georgiev
6cf863ff3d
Merge pull request #12604 from KDSBrowne/bbb-api-unit-tests 
test: Add Unit Tests For Meteor Polls API
 2021-07-06 16:56:46 -04:00
Anton Georgiev
b9cc633286 Merge branch 'v2.3.x-release' of github.com:bigbluebutton/bigbluebutton into merge-2.3.5-into-develop 2021-07-06 19:36:19 +00:00
Anton Georgiev
b5851aa152 removeUser: handle connections in frontends, db changes in backend 2021-06-30 20:08:00 +00:00
Joao Siebel
f23cdf4dbf Restore mongo metrics feature 2021-06-28 12:00:09 -03:00
KDSBrowne
cf6672b1c9 Add unit tests for poll api modifiers | 2x handlers 2021-06-17 02:20:49 +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
4780da6a79 Set Divehi as RTL 2021-06-14 16:33:17 +00:00
Ramon Souza
3ba15a83dd different navbar height for large fonts 2021-06-04 10:44:50 -03:00
Anton Georgiev
fd9b68b526
Revert "fix: different navbar size for locales with large fonts" 2021-06-03 10:42:02 -04:00
Ramon Souza
f4f01818f8 add localeChanged event to resize presentation area 2021-06-02 09:41:15 -03:00
Ramon Souza
8d2474135a formatting 2021-06-01 14:46:29 -03:00
Ramon Souza
96edb582f7 different navbar height for large fonts 2021-06-01 14:45:16 -03:00
Anton Georgiev
4356ea9e3d
Merge pull request #12439 from ramonlsouza/issue-12376 
fix: replace power-queue dependency
 2021-05-25 10:07:08 -04:00
Anton Georgiev
2eb09a15db
Merge pull request #12394 from vitormateusalmeida/layoutManagerNew 
Add New Layout Manager
 2021-05-25 10:06:35 -04:00
Ramon Souza
57cdf3f6b7 replace power-queue with queue 2021-05-24 16:41:22 -03:00
Ramon Souza
34007f5bc5 lint 2021-05-20 15:14:19 -03:00
Ramon Souza
f3260ed8bf handle additional cases for locales 2021-05-20 14:01:58 -03:00
Vitor Mateus De Almeida
047b573d10 Fix auto resize when open/close panels 2021-05-19 19:29:03 -03:00
Vitor Mateus De Almeida
444b29a346 Merge remote-tracking branch 'upstream/develop' into layoutManagerNew 2021-05-19 11:54:22 -03:00
Vitor Mateus De Almeida
88a1edcc06 Fix userlist item button, Fix polling close button 2021-05-19 11:51:31 -03:00
Ramon Souza
165545ee77 remove useless conditional in base component 2021-05-19 08:57:32 -03:00
Vitor Mateus De Almeida
1326f3f791 Add New Layout Manager 2021-05-17 17:25:07 -03:00
Ramon Souza
02aea0a3de template syntax in string literal 2021-05-07 08:38:19 -03:00
Ramon Souza
3678348fdf remove unused code 2021-04-29 13:52:22 -03:00
Anton Georgiev
e00b7efb04
Merge pull request #12165 from vitormateusalmeida/issue-12050 
Fix layout broken after open+close shared notes
 2021-04-27 11:11:17 -04:00
Vitor Mateus De Almeida
340e0ba052 fix layout broken after opne close shared notes 2021-04-26 20:04:34 -03:00
Anton Georgiev
91b57f82f9 feat: allow to omit chat message from logging 2021-04-26 16:04:57 -04:00
Mario Jr
af6cea1734 fix: client may crash when loading develop version 
Removed the reference for invalidateCookie, since it doesn't exist anymore.
 2021-04-23 10:58:08 -03:00
Ramon Souza
75b9261f6f remove unused imports/variables 2021-04-22 13:17:20 -03:00
Vitor Mateus De Almeida
3374e638bb fix layout doesn't update when screen is shared 2021-04-16 18:02:47 -03:00
Anton Georgiev
abd9539405
Update redis.js 2021-04-08 15:55:55 -04:00
Anton Georgiev
30229cebb6
Remove bbb-html5-backend log when meeting handled by other backend 2021-04-08 15:51:57 -04:00
Ramon Souza
9218262e0a all device info moved to helper 2021-03-31 14:13:36 -03:00
Pedro Beschorner Marin
0c4cf0135d Handle pad's events and Meteor's instances 
Since Meteor was split in multiple process and events started to be
filtered by instances, all Etherpad's Redis events were being discarded.

Etherpad has a Redis' publisher plugin that is unaware of BigBlueButton's
existence. All the communication between them is kept simple with minimal
of internal data exchange. The concept of distincts subscribers at Meteor's
side broke part of this simplicity and, now, Etherpad has to know which
instance must receive it's messages. To provide such information I decided
to include Meteor's instance as part of the pad's id. Should look like:

 - [instanceId]padId for the shared notes
 - [instanceId]padId_cc_(locale) for the closed captions

With those changes the pad id generation made at the recording scripts had to
be re-done because there is no instance id available. Pad id is now recorded at
akka-apps and queried while archiving the shared notes.
 2021-03-23 18:03:50 -03:00
Ramon Souza
c4fc7bcd92 locales fetch rework 2021-03-23 10:09:28 -03:00
Ramon Souza
5f2138ddea check if user settings are loaded 2021-03-17 15:01:08 -03:00
Ramon Souza
9ed8af666e fix chat panel appearing after webcam share/unshare 2021-03-17 13:20:59 -03:00
Ramon Souza
ca345de246 add check after extractCredentials is used 2021-03-16 13:15:41 -03:00
Anton Georgiev
a41fa87bdd
Re-enable redis.js log for meetings handled by other processes 
I was shown a case just now where `CreateNewPresentationPodEvtMsg` can happen prior to the full add of a meeting. This log line becomes relevant once again
 2021-03-15 12:55:51 -04:00
Anton Georgiev
8568bb03b9
Disable redis.js log for meetings handled by other processes 
Disabled `'Backend meeting queue had not been initialized'` which was added to pinpoint an issue with handling of meeting create events, but the issue seems to be unrelated (and has not been hit after resolving a memory leak)
 2021-03-15 12:30:02 -04: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
Ramon Souza
fb22eca58d fix legacy client with customHeartbeat:false 2021-03-10 15:14:25 -03:00
Mario Jr
c7df108f5a Improve the way we observe changes on Users's collection 
It is safer to look at subscriptions's state to users instead of depending
on the initial state of the collection at mounting time. Although
i couldn't force any race conditions on this, there's a chance it could
happen. The fix avoid this problem.
This complements #11533
 2021-03-08 18:08:56 -03:00
Mario Jr
9b1630186c Move some validations to the User's collection query 
Also removed unnecessary fields
 2021-03-05 15:56:42 -03:00
Mario Junior
d4620b024d
Update bigbluebutton-html5/imports/startup/client/base.jsx 
Co-authored-by: Anton Georgiev <antobinary@users.noreply.github.com>
 2021-03-05 15:14:19 -03:00
Mario Jr
837b1cfb52 Improve performance when doing user join notifications 
Complements #11533
 2021-03-05 15:10:31 -03:00
Anton Georgiev
088c3cde44
Merge pull request #11533 from mariogasparoni/fix-11399 
Fix audio and push alerts for user join
 2021-03-04 15:47:17 -05:00
hiroshisuga
b228d4cbb8
Probably a bug in usersVideo 2021-03-02 23:56:10 +09:00
Mario Jr
8036ce71b1 Fix audio and push alerts for user join 
When validating tokens, the dummyUser created at the beginning is set
with validated=true. This means there won't be the state change that used
to occur from validated:false to validated:true (which detects the moment
joined the meeting) , therefore the alert code that expects for this change
won't run.
To fix this for audio alerts, we now detect when user join by observing
additions in Users's collection. This is actually good because we start
observing this only once (in componentDidMount), differently we used to do,
by calling this every time the tracker was activated.

To distinguish between the user addition that initially populates user's
collection from those that happens after user join (which are the ones we
want), we store the initial state (at componentDidMount) and compare it
with new additions. If the user added is present at the initial state,
then it is an addition to populates the collection, otherwise this is a real
user addition (happened after user joined the meeting)

Partially fixes #11399
 2021-03-02 08:43:56 -03:00
Ramon Souza
ba6e6c8238 remove unnecessary dependency 2021-03-01 09:07:06 -03:00
Joao Siebel
31d49536e8 Add extra logs when handling messages on redis 2021-02-24 17:56:14 -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
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
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
Aaditya Prakash
c3a7fde807 Implemented merge option for default and local settings. 2021-02-19 14:44:23 +01:00
Ramon Souza
3778ccb397 fix layout params not affecting the meeting 2021-02-18 13:11:02 -03:00
Anton Georgiev
683847304d on frontend attempt to handle events without matching queue 2021-02-17 20:51:36 +00: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
1cedc56504 process only some of CreateMeeting logic in frontends to avoid meeting duplication 2021-02-16 15:12:25 +00:00
Anton Georgiev
f43560d535 Support for backend vs frontend nodejs instances bbb-html5 2021-02-16 03:19:31 +00:00
Ramon Souza
1083fe810a no unmount on change locale 2021-02-12 13:55:39 -03:00
Ramon Souza
46af7880d6 Merge remote-tracking branch 'upstream/develop' into PR-8696 2021-02-11 09:12:13 -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
Anton Georgiev
363c801338
Merge pull request #11215 from pedrobmarin/guest-draft 
Disable authenticated guests
 2021-02-05 16:13:46 -05:00
Anton Georgiev
8c0f0fdd52 Split Meteor roles backend-frontend revisit 2021-02-05 17:47:46 +00:00
Ramon Souza
55651506a4 improve language selector filter, closes #10706 2021-02-02 15:44:58 -03:00
Joao Siebel
68b2752e0d Add flag to enable sync 2021-01-29 14:27:13 -03:00
Joao Siebel
8c7c21f936 Sync users in collection with server active connections 2021-01-26 16:22:32 -03:00
Pedro Beschorner Marin
85ee3b283f Identify mobile users at user list 2021-01-23 21:57:55 -03:00
KDSBrowne
206cae3707 fix locale fetch loop with xx_XX fallback/override 2021-01-19 16:02:20 +00:00
Anton Georgiev
fc93b5a91c correctly add chat message without flattening 2020-12-17 22:02:38 +00:00
Anton Georgiev
c1ffced27d Merge branch 'v2.2.x-release' of github.com:bigbluebutton/bigbluebutton into develop 2020-12-17 21:14:29 +00:00
Joao Siebel
c5b8f30f5d Add option to generate heapdump file and improve metrics 2020-12-15 13:10:39 -03:00
Anton Georgiev
8b65f9e15b Set bbb-html5 loadbalancing to be round robin 2020-12-15 01:55:57 +00:00
Anton Georgiev
9239d515a5 dispatch whiteboard events to html5 redis channel only 2020-12-12 01:45:38 +00:00
Anton Georgiev
0be8773e4c Loadbalance bbb-html5 in bbb-web based on CPU 2020-12-11 21:36:06 +00:00
Joao Siebel
5b0d6c59e6 Code clean up 2020-12-10 14:05:22 -03:00
Joao Siebel
e9d05454ea Remvoe console 2020-12-10 13:52:25 -03:00
Joao Siebel
bf5a45d303 Create Metrics class 2020-12-10 12:07:06 -03:00
Joao Siebel
d6a1f1a454 Change processing start time 2020-12-09 15:06:25 -03:00
Joao Siebel
029c42c1e5 Add processing time metrics 2020-12-09 14:24:41 -03:00
Anton Georgiev
3930e164e6
Merge branch 'develop' into debug-window 2020-12-08 16:16:24 -05:00
Joao Siebel
0020d2b079 Add try/catch in custom send function 2020-12-08 19:53:33 +00:00
Joao Siebel
6e529e5292 Add try/catch to heartbeat function 2020-12-08 19:53:33 +00:00
Joao Siebel
240b75ea65 cherry-pick PR #10953 2020-12-08 19:50:18 +00:00
Joao Siebel
b532673691 Move metric function 2020-12-08 10:49:07 -03:00
Joao Siebel
0ec8576209 Fix multiple write listeners 2020-12-08 09:37:59 -03:00
Joao Siebel
829591ffc7 Implement redis metrics object 2020-12-07 17:57:33 -03:00
Joao Siebel
fc1b06c3e7 Add try/catch in custom send function 2020-12-03 15:07:24 -03:00
Joao Siebel
5d95e5ca1d Add try/catch to heartbeat function 2020-12-02 16:43:34 -03:00
Joao Siebel
d9a046fba9 Log uncaught errors in node 2020-12-02 16:06:42 -03:00
Anton Georgiev
244a239810 Merge branch 'v2.2.x-release' of github.com:bigbluebutton/bigbluebutton into 2020-12-01-merge 2020-12-01 20:02:50 +00:00
Anton Georgiev
ff6963e835
Merge pull request #10921 from BrentBaccala/dont-reset-panel-defaults 
Only set panel settings to login defaults on login, not everytime the…
 2020-11-30 14:47:43 -05:00
Anton Georgiev
f34826718d include instanceId in resources url 2020-11-30 16:09:35 +00:00
Brent Baccala
8845998bbd Only set panel settings to login defaults on login, not everytime the base component renders 2020-11-27 16:51:45 -05:00
Joao Siebel
c34d5381fe Add flag to enable/disable custom heartbeat functions 2020-11-26 11:19:59 -03:00
Anton Georgiev
0c7ae7537b
Only display Redis: MeetingMessageQueue if size > 100 2020-11-25 10:32:45 -05:00
Anton Georgiev
3faabd1821 Merge 2.2.29 and 2.2.30 into 2.3.x 2020-11-24 15:13:09 +00:00
Tainan Felipe
8650e0500b Port socket sockejs timeout to 2.3 2020-11-20 14:31:24 -03:00
Anton Georgiev
39257aa2d8 parse instanceId as int; develop on port 4000 2020-11-19 15:31:24 +00:00
Anton Georgiev
23f2df11d5 code changes to allow for meetings' redis events to be processed on different html5 nodejs pids 2020-11-18 20:34:02 +00:00
Joao Siebel
b6b211f4fb Tweak heartbeat 2020-11-16 18:37:25 -03:00
Joao Siebel
1c47023e8a Add original function link for reference 2020-11-16 10:46:18 -03:00
Joao Siebel
3a2d06fd88 Tweak sockjs timeout value 2020-11-13 18:41:56 -03:00
Anton Georgiev
a8dc7a0bff Simplified redis debug and placed behind check 2020-11-12 21:03:57 -05:00
Anton Georgiev
5ba12846d5
Update index.js 2020-10-28 15:17:17 -04:00
Joao Siebel
e50c348874 WIP improve log 2020-10-21 14:27:40 -03:00
Joao Siebel
be8421db3c Merge remote-tracking branch 'upstream/develop' into connection-manager 2020-10-21 13:57:17 -03:00
Anton Georgiev
0c7ead1916 Merge branch 'v2.2.x-release' of github.com:bigbluebutton/bigbluebutton into oct16-merge 2020-10-21 14:48:02 +00:00
Joao Siebel
dadca62741 Merge remote-tracking branch 'upstream/develop' into connection-manager 2020-10-13 10:49:12 -03:00
Anton Georgiev
adcb05b1ec
Merge pull request #10612 from jfsiebel/improve-logs 
Improve  log in/authentication logs
 2020-10-09 13:43:09 -04:00
Joao Siebel
14388ec922 Improve logs for a better debug/understanding of problems related to authentication and log in process 2020-10-07 16:50:17 -03:00
Mario Jr
e9e436378a Correctly set audio input/output devices 
When refusing ("thumbs down" button) echo test, user is able to select a different input device. This should work fine for chrome, firefox and safari (once user grants permission when asked by html5client).
For output devices, we depend on setSinkId function, which is enabled by default on current chrome release (2020) but not in Firefox (user needs to enable "setSinkId in about:config page). This implementation is listed as (?) in MDN.
In other words, output device selection should work out of the box for chrome, only.
When selecting an outputDevice, all alert sounds (hangup, screenshare , polling, etc) also goes to the same output device.
This solves #10592
 2020-10-06 20:37:55 -03:00
Vitor Mateus De Almeida
69eb26f281 Merge remote-tracking branch 'upstream/develop' into debug-window 2020-09-22 09:37:42 -03:00
Anton Georgiev
124b2d9b51
Merge branch 'develop' into move-guest-wait 2020-09-21 16:28:59 -04:00
Joao Siebel
b2adffa4c2 Merge remote-tracking branch 'upstream/develop' into connection-manager 2020-09-18 16:30:20 -03:00
Anton Georgiev
3b2446989e recalculate locales on new request if there was issue on start 2020-09-10 14:32:42 +00:00
Joao Siebel
ac0a014571 WIP onClose 2020-09-10 08:49:22 -03:00
Anton Georgiev
fd0e69c280 Added fallback support for Armenian, Georgian, Occitan 2020-09-10 03:21:41 +00:00
Anton Georgiev
707f80a785 Only calculate locales list once, on process start 2020-09-10 01:27:03 +00:00
Anton Georgiev
e3d1fa2c17 return all locales, not just an empty [] 2020-09-10 00:37:43 +00:00
Anton Georgiev
f1e92341a5 Merge branch 'issue-10291' of github.com:Tainan404/bigbluebutton into locales-total 2020-09-09 19:30:52 +00:00
Anton Georgiev
d8b185f2b3 Merge branch 'issue-9219' of github.com:Tainan404/bigbluebutton into locales-total 2020-09-09 19:29:18 +00:00
Joao Siebel
6e4e0a510a Merge branch 'remove-user-on-exit' into connection-manager 2020-09-08 16:36:01 -03:00
Tainan Felipe
8651a02676 Add override default locale to user settings 2020-09-08 15:54:08 -03:00
Vitor Mateus De Almeida
849bb9a469 Add debug window 2020-09-03 20:35:57 -03:00
Joao Siebel
2873eb2c1b Merge remote-tracking branch 'upstream/develop' into connection-manager 2020-09-01 09:08:33 -03:00
Joao Siebel
b8f42ac712 Create ClientConnections structure and auth-token-validation collection 2020-09-01 09:07:56 -03:00
Tainan Felipe
9230dfcc62 Fix wrong default setting 2020-08-25 09:29:23 -03:00
Tainan Felipe
4a81457b10 Fix comparison 2020-08-25 08:47:38 -03:00
Tainan Felipe
5956531941 Add init state for locale comparison 2020-08-25 08:36:06 -03:00
Anton Georgiev
b6d71fd66d
Merge branch 'develop' into issue-9219 2020-08-19 16:02:43 -04:00
Anton Georgiev
4fd2a815f4
Merge pull request #10220 from Tainan404/unsafe-intl-components 
Remove unsafe lifecycle from intl component
 2020-08-19 15:16:21 -04:00
Joao Siebel
f33bd10640 Remove user from collection when leaves 2020-08-19 13:22:43 -03:00
Tainan Felipe
47b2d6b945 fix language doesn't updating 2020-08-19 10:48:57 -03:00
Tainan Felipe
5bfeab289c Merge remote-tracking branch 'upstream/develop' into issue-9219 2020-08-19 10:41:03 -03:00
Tainan Felipe
dda7182757 Merge remote-tracking branch 'upstream/develop' into skip-audio-check 2020-08-19 10:24:17 -03:00
Tainan Felipe
c9d75a15f8
Update bigbluebutton-html5/imports/startup/server/index.js 
Co-authored-by: Anton Georgiev <antobinary@users.noreply.github.com>
 2020-08-12 17:15:16 -03:00
Anton Georgiev
5be5aed1d9 Merge branch 'v2.2.x-release' of github.com:bigbluebutton/bigbluebutton into merge-2020-08-12 2020-08-12 17:12:58 +00:00
Tainan Felipe
35cfd510c3 Remove unsafe lifecycle from intl component 2020-08-07 17:46:04 -03:00
Joao Siebel
32b25ce70e simplify code 2020-08-05 14:16:41 -03:00
Joao Siebel
6987ab988c Restore activity check modal. 
If activity check was enabled in server, the activity check modal wasn't showed
to users and after a given time the user was disconnect, also fix the meeting-end
and error-screen messages, informing the user the reason why he was kicked.
 2020-08-03 09:44:21 -03:00
Anton Georgiev
45c2368a3c Pulled HTML5 locales on July 29, 2020 2020-07-29 11:54:21 -04:00
Anton Georgiev
570f482d4c
Merge pull request #10144 from vitormateusalmeida/layout-manager-2 
Add Layout Context and Layout Manager
 2020-07-29 10:00:59 -04:00
Anton Georgiev
c6669d1d7a
Merge branch 'develop' into move-guest-wait 2020-07-28 13:50:04 -04:00
Tainan Felipe
e64c0e1c62
Merge branch 'develop' into issue-9219 2020-07-28 13:28:32 -03:00
Anton Georgiev
55d8d4b199
Merge pull request #9529 from Tainan404/issue-9128 
Rework locales list generation
 2020-07-28 11:10:38 -04:00
Vitor Mateus De Almeida
fa9e5ca819 Fix error when join a new meeting 2020-07-23 18:14:31 -03:00
Vitor Mateus De Almeida
ae29ba58c1 Fixes 2020-07-20 16:17:40 -03:00
Vitor Mateus
e2db60e662 WIP Resizable works fine 2020-07-20 16:11:09 -03:00
Vitor Mateus
297154f78a The presentation gets the size from the layout manager 2020-07-20 16:02:53 -03:00
Vitor Mateus
7f095c1cad Create layout context and add a layout manager 2020-07-20 15:48:54 -03:00
Anton Georgiev
21b6def708
Revert "Replace unsafe react lifecycle methods" 2020-07-15 15:52:34 -04:00
Anton Georgiev
7535e6fa59
Revert "Create layout context and add a layout manager" 2020-07-15 12:44:59 -04:00
Anton Georgiev
7d75843140
Fix a forgotten line left while resolving conflict 2020-07-14 11:19:11 -04:00
Anton Georgiev
b9b4490d8c
Merge branch 'develop' into layout 2020-07-14 10:32:24 -04:00
Anton Georgiev
e48306431a
Merge pull request #9498 from Tainan404/issue-8744 
Replace unsafe react lifecycle methods
 2020-07-14 10:30:37 -04:00
Anton Georgiev
c763041285 Adjust check for User.loggedOut to prevent errors 2020-07-10 13:45:37 -04:00
Anton Georgiev
9f5158a525 Merge branch 'custom-parameters-breakout-rooms' of github.com:jfsiebel/bigbluebutton into locales-2020-07-10 2020-07-10 11:21:53 -04:00
Vitor Mateus De Almeida
880963e0e7 Merge remote-tracking branch 'upstream/develop' into layout 2020-07-06 13:36:38 -03:00
Tainan Felipe
30528fb014 Remove comment 2020-07-02 17:45:06 -03:00
Tainan Felipe
1c8677d7d8 Move guest wait from bbb-client to bbb-html 2020-07-02 17:14:49 -03:00
Pedro Beschorner Marin
526f79e8f2 Merge remote-tracking branch 'bigbluebutton/v2.2.x-release' into bigbluebutton/develop 2020-06-30 18:15:18 -03:00
Anton Georgiev
0a399af81f add clientURL to logs from client 2020-06-30 15:18:01 -04:00
Joao Siebel
3e95ed0e4b Merge remote-tracking branch 'upstream/v2.2.x-release' into merge-2.2 2020-06-16 16:40:56 -03:00
Vitor Mateus De Almeida
3b3a6a32f5 Fixes 2020-06-09 00:09:46 -03:00
Joao Siebel
faa0b35032 Show correct screen when user leave meeting. close #9710 2020-06-02 16:47:26 -03:00
Joao Siebel
74c34d0c4a Use main room custom parameters in breakouts room. close #9612 2020-06-01 09:13:03 -03:00
Anton Georgiev
29afdafd3e
Merge pull request #9658 from konkret-devils/v2.2.x-release 
Add bbb_show_public_chat_on_login as a join (co-) parameter
 2020-05-29 12:42:59 -04:00
Anton Georgiev
1a7c07e380
Merge pull request #9113 from sualko/feat/html5/settings 
add env to specify settings location
 2020-05-28 16:21:25 -04:00
Anton Georgiev
1c6841dd1f
Merge pull request #9691 from jfsiebel/fix-breakout-room-logout 
Close tab when user logout from a breakout room
 2020-05-26 15:12:21 -04:00
Joao Siebel
1f8cae08d6 Close tab when user logout from a breakout room 2020-05-26 13:41:22 -03:00
Tainan Felipe
e1573bded9 Merge remote-tracking branch 'upstream/develop' into issue-8744 2020-05-26 11:44:20 -03:00
Tainan Felipe
5e5f4cc93b Move locales fallback to a json file 2020-05-26 11:15:17 -03:00
Martin Beckmann
c3f0447105 Integration of PR #9292 (by weeman1337) and PR #9658 (by mantridereso) 2020-05-26 15:07:37 +02:00
Tainan Felipe
aa668e3f91 Merge remote-tracking branch 'upstream/develop' into issue-9219 2020-05-25 17:05:58 -03:00
Tainan Felipe
db8e7fcd39 Update react-intl and add fallback to unsupported languages 2020-05-25 17:00:13 -03:00
Anton Georgiev
9f60e925b5 Merge branch 'v2.2.x-release' of github.com:bigbluebutton/bigbluebutton into merge-2.2-into-develop 2020-05-25 19:55:36 +00:00
Anton Georgiev
c9e996de21 Merge branch 'v2.2.x-release' of github.com:bigbluebutton/bigbluebutton into merge-2.2-into-develop 2020-05-25 17:32:24 +00:00
Anton Georgiev
4a38524778 Logging with JSON stringify was leading to crashes. Reverting, need to investigate further 2020-05-24 08:22:10 -04:00
Martin Beckmann
ea3926e8ef attempt to introduce an additional UserSettings parameter 'bbb_show_public_chat_on_login' as a co-parameter of 'bbb_show_participants_on_login' (the former intended to only have an effect if the latter is 'true') 2020-05-23 22:28:56 +02:00
Martin Beckmann
d6956a5516 test... 2020-05-23 21:43:26 +02:00
Martin Beckmann
f9c7c20d5a test... 2020-05-23 21:40:39 +02:00
Martin Beckmann
51d3b3a94d test... 2020-05-23 20:44:11 +02:00
Anton Georgiev
e7917994d5 add banUser field in EjectUserFromMeetingCmdMsgBody 2020-05-22 10:45:28 -04:00
Tainan Felipe
6a340e9401 Rework locales list generation 2020-05-13 14:05:59 -03:00
Joao Siebel
73d0de34dd Move Intl component outside of Base component 2020-05-12 10:31:00 -03:00
yogiks
360fce9781 Included Kannada 2020-05-11 15:40:00 -04:00
Tainan Felipe
851189f3c1 Merge remote-tracking branch 'upstream/develop' into issue-8744 2020-05-11 11:42:03 -03:00
Anton Georgiev
cc79c4b6ae merge 2.2.10 into 2.3 2020-05-05 19:52:44 +00:00
Anton Georgiev
63f7da5241 include Meteor connection ID in logs 2020-04-30 16:40:45 -04:00
Anton Georgiev
89fb118d00 Pulled HTML5 locales April 23, 2020; Added Norwegian 2020-04-23 10:17:43 -04:00
Vitor Mateus
00259ab371 WIP Resizable works fine 2020-04-23 11:07:44 -03:00
Anton Georgiev
b1cfef4c1b Pulled HTML5 locales April 17, 2020 2020-04-17 08:02:41 -04:00
sualko
6a5b9a98e2 add env to specify settings location 
this would allow package maintaner to move config to /etc

see #9085
 2020-04-16 17:06:52 +02:00
Tainan Felipe
425097d6ab Replace legacy react lifecycle in the intl file 2020-04-15 11:20:07 -03:00