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

28678 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
prlanzarin
7eb91f9273 Merge branch 'u22-screenshare18102020' of https://github.com/prlanzarin/bigbluebutton-1 into u23-ilgiardino 2021-03-11 18:49:14 +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
Anton Georgiev
a630099cc6
Merge pull request #11595 from ramonlsouza/presentation-container-fix 
Fixes presentation invisible box appearing if presentation is hidden
 2021-03-10 16:37:53 -05:00
Anton Georgiev
435ecd7450
Merge pull request #11605 from ramonlsouza/fix-legacy-client 
Fix legacy client with customHeartbeat:false
 2021-03-10 13:35:18 -05:00
Maxim Khlobystov
619c5ed176 Make the poll drag and drop feature optional 2021-03-10 18:23:25 +00:00
Ramon Souza
fb22eca58d fix legacy client with customHeartbeat:false 2021-03-10 15:14:25 -03: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
86aeec4df0
Merge pull request #11598 from BrentBaccala/update-fsesl-password 
Update fsesl password on package installation
 2021-03-10 10:15:20 -05:00
Anton Georgiev
6582b204e4
Merge pull request #11600 from ramonlsouza/pr-11529-fix 
Fixes incomplete session data error caused by PR #11529
 2021-03-10 07:41:31 -05:00
Ramon Souza
45421b1276 fix an error that might happen if PR 11529 is applied to an ongoing meeting 2021-03-10 09:16:31 -03:00
Pedro Beschorner Marin
17f47fa4ea
Removed callback from setGuestLobbyMessage 2021-03-10 09:09:15 -03: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
Brent Baccala
60734e0f65 on installation of akka-bbb-fsesl, update ESL password in /etc/bigbluebutton, where we're starting to 
put the configuration stuff, instead of /usr/share/bbb-fsesl-akka/conf/application.conf
 2021-03-10 01:13:31 -05:00
Brent Baccala
7b16f03135 packaging from akka-bbb-fsesl: copy FreeSWITCH password from 
FreeSWITCH configuration file (event_socket.conf.xml) and add
FreeSWITCH as a package dependency to make sure that it gets
configured first
 2021-03-10 01:13:11 -05:00
Ramon Souza
4445d4e309 fix invisible box appearing if presentation is hidden 2021-03-09 16:43:51 -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
Anton Georgiev
4ba2082fb6
Merge pull request #11591 from mariogasparoni/11533-related 
Improve the way we observe changes on Users's collection
 2021-03-08 16:30:39 -05: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
Anton Georgiev
dc1e78e808
Merge pull request #11588 from ramonlsouza/issue-11585 
Changes on end meeting message
 2021-03-08 15:34:46 -05:00
Ramon Souza
826c420788 update meetingEndedBy with information coming from bbb core 2021-03-08 16:45:09 -03:00
Ramon Souza
0a09112f80 split end meeting message in two parts 2021-03-08 16:14:09 -03:00
Ramon Souza
78095f830d 'active users' message change on ending meeting 2021-03-08 15:11:31 -03:00
Ramon Souza
c9ac737207 display name of the user who ended the meeting 2021-03-08 13:05:33 -03:00
Anton Georgiev
cc22f8c042
Merge pull request #11581 from ramonlsouza/issue-11145 
Fixes incorrectly displaying of 'restore presentation' button when presentation is disabled
 2021-03-08 09:37:29 -05:00
Ramon Souza
2923ea1641 fix 'restore presentation' button when presentation is disabled 2021-03-08 09:33:25 -03:00
Fred Dixon
f67691f65f
Merge pull request #11579 from ffdixon/bbb-conf-override 
Added text for override of bbb-web.properties
 2021-03-07 21:50:28 -04:00
Fred Dixon
af23e30f37 Added text for override of bbb-web.properties 2021-03-07 19:48:08 -06:00
Anton Georgiev
f814d5f8cd
Merge pull request #11470 from schrd/grails-config 
add overlay config for bbb-web
 2021-03-05 16:53:57 -05:00
Daniel Schreiber
44b1b9052c fix grep if configfile does not exist 
there was a call of grep which failed when the config file does not
exist yet. check existance of file first.
 2021-03-05 21:56:50 +01:00
Anton Georgiev
bca8b7baac
Merge pull request #11569 from mariogasparoni/develop 
Move some validations to the User's collection query
 2021-03-05 14:30:55 -05:00
Richard Alam
28245a1b58
Merge pull request #11557 from aron-2809/bbb-core-http-endpoint-wip 
Bbb core http endpoint wip
 2021-03-05 14:27:48 -05: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
Anton Georgiev
13493b4a4d
Merge pull request #11568 from mariogasparoni/develop 
Improve performance when doing user join notifications
 2021-03-05 13:55:08 -05:00
Aron Engineer
2c8220a897 fix: HealthActor messages optimized for the timestamp value update 2021-03-05 18:31:31 +00: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
Aron Engineer
284ba1af97 fix: Timeout exception response modified with typesafety. 2021-03-05 17:23:51 +00:00
hiroshisuga
190bde3320
Fix slide size problem at fullscreen <-> window-mode transition #2 (#11540) 
Replaces the PR #10604, which has been temporarily fixed a problem in 2.3a2, that is, the slide size gets crazy when turning on and off fullscreen mode. Since #10604 was just a workaround, I tried to fix it in a way making more sense.

### Closes Issue(s)

closes #10459 (already closed by #10604) and #10589

### Motivation

#10604 is fixing the problem by calling "slide change" event, although the slide has not been changed actually. I tried to fix the same problem by adding a "full screen change" event listener in the layout manager, which I think is more elegant.
 2021-03-05 11:01:47 -05:00
Anton Georgiev
e50e5ee59d
Merge pull request #11566 from mariogasparoni/merge-22 
Merge 2.2 into develop
 2021-03-05 10:35:40 -05:00
Mario Jr
9bc656d173 Merge remote-tracking branch 'origin/v2.2.x-release' into develop 2021-03-05 12:26:53 -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
01ca99208f
Merge pull request #11529 from ramonlsouza/issue-11071 
Fix openPanel errors related to polling and shared notes
 2021-03-05 09:01:45 -05:00
Ramon Souza
4d59f9d23e fix new found errors 2021-03-05 10:49:28 -03:00
Anton Georgiev
859520fe2c
Merge pull request #11560 from mariogasparoni/backport-audio-improvements-from-2.3 
Backport audio improvements from 2.3
 2021-03-05 08:39:23 -05:00
Anton Georgiev
dc5357253e
Merge pull request #11563 from bigbluebutton/revert-11531-issue-11438 
Revert "Add reconnection and sync handler"
 2021-03-05 03:55:36 -05:00
Anton Georgiev
c9bbcebe59
Revert "Add reconnection and sync handler" 2021-03-05 03:53:36 -05:00
Anton Georgiev
26124deb49
Merge pull request #11562 from bigbluebutton/revert-11553-issue-11530 
Revert "Fix clear chat for single message"
 2021-03-05 03:53:15 -05:00
Anton Georgiev
e89faec1cd
Revert "Fix clear chat for single message" 2021-03-05 03:51:07 -05:00