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

38207 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Anton Georgiev
4948731fe7
Merge pull request #17764 from lfzawacki/reactions-port 
feat: Port Mconf Reactions into BBB 2.7
 2023-05-26 08:05:02 -04:00
Anton Georgiev
1a1f442d5a
Merge pull request #17746 from Carloshsc/port-present-webcam-27 
feat(camera as content): present webcam
 2023-05-26 08:01:40 -04:00
Anton Georgiev
eae28eb702
Merge pull request #18009 from paultrudel/upgrade-grails-26 
fix(sec): Upgrade grails-core
 2023-05-25 19:52:35 -04:00
Anton Georgiev
3826018735
Merge pull request #18010 from paultrudel/upgrade-spring-webmvc-26 
fix(sec): Upgrade spring-webmvc
 2023-05-25 19:51:35 -04:00
Anton Georgiev
57245c7094
Merge pull request #18008 from paultrudel/upgrade-tomcat-26 
fix(sec): Upgrade tomcat
 2023-05-25 19:51:08 -04:00
Anton Georgiev
f0cb2e4bb8
Merge branch 'v2.6.x-release' into upgrade-tomcat-26 2023-05-25 19:50:57 -04:00
Anton Georgiev
ac365d9ad9
Merge pull request #18007 from paultrudel/upgrade-spring-26 
fix(sec): Upgrade Spring
 2023-05-25 19:49:49 -04:00
Anton Georgiev
61cfcd0cf8
Merge pull request #18006 from paultrudel/upgrade-json-26 
fix(sec): Upgrade org.json
 2023-05-25 19:48:58 -04:00
prlanzarin
7c77fc7433 Merge remote-tracking branch 'origin/v2.7.x-release' into reactions-port 2023-05-25 19:54:01 -03:00
Arthurk12
240134838d fix(reactions): code removed by mistake 2023-05-25 19:18:38 -03:00
Arthurk12
83f96b42c1 fix(reactions): remove commented code 2023-05-25 18:16:51 -03:00
Arthurk12
701206ee80 feat(reactions): add to disabledFeatures 2023-05-25 18:05:50 -03:00
Arthurk12
461be7a7fc fix(reactions): method call 
Update method call to the unified one(setUserReaction) and include the userID
parameter, so it can be used by mods to clear others status as well.
 2023-05-25 17:42:02 -03:00
Arthurk12
196d2c1e0a feat(reactions): sync expiration with akka 
Currently, the reactions are cleared on mongo based on the expire time.
So to sync its state with akka, an observer is atattched to the user
reactions collection and whenever a reaction is removed because of the
expiration time, akka is notified with message 'UserReactionTimeExpiredCmdMsg'.
 2023-05-25 17:32:27 -03:00
Paul Trudel
81164c4e1c Upgraded spring-webmvc to 5.3.27 2023-05-25 20:22:07 +00:00
Paul Trudel
6833a126f0 Upgraded grails-core to 5.3.2 2023-05-25 20:20:49 +00:00
Paul Trudel
b2b952326a Upgraded tomcat to 9.0.74 2023-05-25 20:19:30 +00:00
Paul Trudel
e7bc91d389 Upgrade spring validation library to 2.7.12 2023-05-25 20:16:28 +00:00
Paul Trudel
b2f2ec7379 Upgrades spring to 2.7.12 2023-05-25 20:16:14 +00:00
Anton Georgiev
b305992051
Merge pull request #18005 from antobinary/disabledFeaturesExclude 
feat(bbb-web): Disabled features exclude
 2023-05-25 16:15:30 -04:00
Paul Trudel
9cc1a43816 Upgraded org.json 2023-05-25 20:14:25 +00:00
Ramón Souza
690472d36c
Merge pull request #17984 from Scroody/I-17906 
Fix: Cameras behind drop areas and presentation when dragging
 2023-05-25 16:58:07 -03:00
André Castro
d90e7a2304
Update component.jsx 2023-05-25 16:57:22 -03:00
Anton Georgiev
2713bdc1b1 docs: refer to disableFeatures list instead of listing again 2023-05-25 15:47:54 -04:00
Anton Georgiev
7585f99352 feat: introduce disableFeaturesExclude CREATE API param 2023-05-25 15:43:30 -04:00
André Castro
c4e62d3315
Update 
Adding suggestion

Co-authored-by: Ramón Souza <contato@ramonsouza.com>
 2023-05-25 16:42:46 -03:00
Ramón Souza
1540a9a7ec
Merge branch 'v2.7.x-release' into I-16114 2023-05-25 16:38:15 -03:00
Anton Georgiev
9e25e4070d
Merge pull request #18004 from bigbluebutton/antobinary-patch-1 
fix: Update links in bbb-conf to the new docs structure
 2023-05-25 15:00:36 -04:00
Anton Georgiev
fb5534ff2a
fix: docs links in bbb-conf 2023-05-25 14:58:06 -04:00
Anton Georgiev
dc2309bd9b
fix: bbb-conf link to setting up firewall 2023-05-25 14:53:43 -04:00
Anton Georgiev
c7be96ce40
docs: Update configure-firewall.md 2023-05-25 14:51:34 -04:00
Scroody
5693ead6fa Fix: Poll creation allows for 5 choices, but the resulting poll will only have 4 choices 2023-05-25 15:35:35 -03:00
Anton Georgiev
c9ca78c8df
Merge pull request #18002 from germanocaumo/fix-recording-cursor 
fix(recording): missing cursor
 2023-05-25 12:18:08 -04:00
Anton Georgiev
672add0655
Merge pull request #17948 from antonbsa/inc-ci-test 
test: Increase tests running on CI
 2023-05-25 12:17:54 -04:00
Gabriel Porfirio
999bf44a11 adding data-test to yes/no option 2023-05-25 12:59:23 -03:00
Gabriel Porfirio
5cf186f28b improving smart slides test 2023-05-25 12:58:44 -03:00
germanocaumo
e4c430b01a fix(recording): missing cursor 
Missing parentheses in logical expression
 2023-05-25 15:31:45 +00:00
Anton Georgiev
11991ce1e8
Merge pull request #18001 from bigbluebutton/snyk-fix-cdf4f5aeda812b1a51ba83ca749e5cc0 
[Snyk] Security upgrade resque from 2.5.0 to 2.5.0
 2023-05-25 11:11:55 -04:00
snyk-bot
a6fa4b785f
fix: record-and-playback/core/Gemfile & record-and-playback/core/Gemfile.lock to reduce vulnerabilities 
The following vulnerabilities are fixed with an upgrade:
- https://snyk.io/vuln/SNYK-RUBY-RACK-1061917
 2023-05-25 15:01:58 +00:00
Anton Georgiev
f7cb896272
Merge pull request #18000 from bigbluebutton/snyk-fix-67a6a15e55cbe59e209163508b709afe 
[Snyk] Security upgrade resque from 2.4.0 to 2.4.0
 2023-05-25 11:01:37 -04:00
snyk-bot
e828923ca9
fix: record-and-playback/core/Gemfile & record-and-playback/core/Gemfile.lock to reduce vulnerabilities 
The following vulnerabilities are fixed with an upgrade:
- https://snyk.io/vuln/SNYK-RUBY-RACK-3237233
- https://snyk.io/vuln/SNYK-RUBY-RACK-3237237
- https://snyk.io/vuln/SNYK-RUBY-RACK-3237240
- https://snyk.io/vuln/SNYK-RUBY-RACK-3356639
- https://snyk.io/vuln/SNYK-RUBY-RACK-3360233
 2023-05-25 14:21:38 +00:00
Anton Georgiev
4014c1205c
Merge pull request #17952 from gabriellpr/audio-serial-mode 
test: Audio serial mode
 2023-05-25 10:14:57 -04:00
Anton Georgiev
c4eecf39fe
chore: Bump BBB version to 2.6.9 2023-05-25 09:55:26 -04:00
Paulo Lanzarin
fda294b2fd
Merge pull request #17996 from bigbluebutton/sfu2912 
build(bbb-webrtc-sfu): v2.9.12
 2023-05-25 09:54:17 -03:00
Paulo Lanzarin
87bda01d5e
build(bbb-webrtc-sfu): v2.9.12 
- https://github.com/bigbluebutton/bbb-webrtc-sfu/releases/tag/v2.9.12
  * fix(core): memory leak due to unreferenced listeners (mcs-core)
 2023-05-25 09:51:45 -03:00
Anton Georgiev
c47f269273
Merge pull request #17988 from antobinary/merge-may-24 
chore: Merge BBB 2.6.8 into BBB 2.7
 2023-05-24 19:20:38 -04:00
Anton Georgiev
25af259d2d Merge branch 'v2.6.x-release' of github.com:bigbluebutton/bigbluebutton into merge-may-24 2023-05-24 17:23:00 -04:00
Anton Georgiev
aeda929b9b
docs: Added link to 2.6.8 2023-05-24 17:07:53 -04:00
transifex-integration[bot]
60ea38bfed
Translations for bigbluebutton-html5/public/locales/en.json in fa_IR (#17940) 
* Translate en.json in fa_IR
100% translated source file: 'en.json'
on the 'fa_IR' language.

---------

Co-authored-by: transifex-integration[bot] <43880903+transifex-integration[bot]@users.noreply.github.com>
 2023-05-24 16:12:52 -04:00
Paul Trudel
b641c6313a Only include online users in attendee list 2023-05-24 19:58:16 +00:00