Commit Graph

35955 Commits

Author SHA1 Message Date
Daniel Petri Rocha
acd315435a Sanitize id for use in poll filename 2022-12-17 20:35:24 +01:00
Daniel Petri Rocha
27e8423e91 Add lodash to package-lock 2022-12-17 20:34:35 +01:00
Daniel Petri Rocha
752ada2a6b Refactor: don't hardcode JobTypes 2022-12-17 16:32:49 +01:00
Anton Georgiev
2c132f80c1
Merge pull request #16154 from gustavotrott/fix-breakout-dont-rembember-users
fix: Breakout rooms don't save room assigning
2022-12-16 16:19:25 -05:00
Joao Victor
2291477f3d feat(whiteboard): reset zoom when switching presentation 2022-12-16 16:00:02 -03:00
Anton Georgiev
7f1b229f58
Merge pull request #16062 from antonbsa/v2.6-tests-fixes
test: fix v2.6 CI tests
2022-12-16 13:20:01 -05:00
Ramón Souza
c142d0eb9f
Merge pull request #16124 from ramonlsouza/issue-16059
Disable paste file in whiteboard
2022-12-16 13:12:28 -03:00
Ramón Souza
7b5a02e91d
Merge pull request #16163 from ramonlsouza/26beta3-dev
chore: Merge BBB 2.6.0-beta.3 into develop
2022-12-16 10:34:48 -03:00
Ramón Souza
8d8d095049 Merge tag 'v2.6.0-beta.3' into 26beta3-dev 2022-12-16 10:28:53 -03:00
Ramón Souza
5d418e1030
Merge pull request #15885 from schrd/annotation-export-cluster
fix(export-presentation): Fix slides export for cluster setup
2022-12-16 08:02:40 -03:00
Gustavo Trott
97dcee009f makes populateWithLastBreakouts get users from props instead of state 2022-12-15 17:28:44 -03:00
Bohdan Zhemelinskyi
5a59554a05 Merge branch 'v2.6.x-release' of https://github.com/bigbluebutton/bigbluebutton into reFixLockSettings 2022-12-15 20:10:12 +00:00
Bohdan Zhemelinskyi
fc5a1adaa5 re-apply lock settings fix 2022-12-15 20:08:49 +00:00
Anton Georgiev
36463f96fa
Merge pull request #15910 from JoVictorNunes/dashboard-inc-credentials
refactor(Dashboard): include cross-origin credentials
2022-12-15 13:23:48 -05:00
Anton Georgiev
25061e0670
Merge pull request #16148 from ramonlsouza/early-return-video-item
fix: do not render video list item if user data is unavailable
2022-12-15 12:53:50 -05:00
Ramón Souza
0cf1d09978 add early return to video list item if user data is unavailable 2022-12-15 14:49:47 -03:00
Anton B
22a5fb4878 Revert "test: update whiteboard screenshots (visual regression)"
This reverts commit 8691c47902.
2022-12-15 14:49:12 -03:00
Bohdan Zhemelinskyi
7b9fd22715 add trim to name param 2022-12-15 15:28:23 +00:00
Anton Georgiev
50badbf4c5
Merge pull request #15666 from bigbluebutton/snyk-upgrade-d53de8f977519420478785124448437c
[Snyk] Upgrade dotenv from 16.0.0 to 16.0.1
2022-12-15 10:06:22 -05:00
Ramón Souza
ccaeee8769
Merge pull request #16143 from antobinary/port-15552
chore(recording): update recording gems -- port of #15552 to BBB 2.6
2022-12-15 10:58:56 -03:00
Anton Georgiev
2841a78848 Merge branch 'v2.5.x-release' of github.com:bigbluebutton/bigbluebutton into port-15552 2022-12-15 13:55:24 +00:00
Anton Georgiev
7e710c8fd3
Merge pull request #15552 from GuiLeme/update-gem-tzinfo
chore (recording): Update tzinfo gem
2022-12-15 08:51:51 -05:00
GuiLeme
af49e25c21 Merge remote-tracking branch 'upstream/v2.5.x-release' into update-gem-tzinfo 2022-12-15 09:42:18 -03:00
GuiLeme
1ba26ea3c3 [update-gem-tzinfo] - update of dependencies - nokogiri, loofah, tzinfo, rack 2022-12-15 09:07:16 -03:00
Anton B
282a81b0e9 Merge remote-tracking branch 'upstream/v2.6.x-release' into v2.6-tests-fixes 2022-12-14 15:51:26 -03:00
Anton B
decba75d53 test: decrease workers number to 1 when running on the CI 2022-12-14 15:30:19 -03:00
Ramón Souza
84e6ba2d40
Merge pull request #16136 from ramonlsouza/merge-2526-dec14
chore: Merge v2.5.x-release into v2.6
2022-12-14 13:38:59 -03:00
Ramón Souza
064b554dfd Merge remote-tracking branch 'upstream/v2.5.x-release' into merge-2526-dec14 2022-12-14 13:23:11 -03:00
Ramón Souza
cb4652b1f7
Merge pull request #16132 from ramonlsouza/locales-dec14
chore: Pulled the latest 2.6 HTML5 locales from Transifex
2022-12-14 09:45:21 -03:00
Localization Server
8ad319fb60 chore: Pulled the latest 2.6 HTML5 locales from Transifex 2022-12-14 09:44:06 -03:00
Ramón Souza
1053a690b9
Merge pull request #16131 from ramonlsouza/audit-dec14
chore: upgrade probe-image-size
2022-12-14 09:31:03 -03:00
Ramón Souza
93cffede4d update probe-image-size 2022-12-14 09:15:20 -03:00
Gabriel Porfirio
83563c4f82 mute all users 2022-12-13 15:42:11 -03:00
Ramón Souza
ff97d2204e
Merge pull request #16099 from antobinary/meteor-bump
chore: Meteor 2.9.0, nodejs for bbb-html5 14.21.1
2022-12-13 15:29:07 -03:00
Anton Georgiev
194da3dbad
Merge pull request #16117 from bigbluebutton/antobinary-patch-1
chore: rephrase keep pushing layout
2022-12-13 13:25:41 -05:00
Ramón Souza
1f2562e95c sort users by sortName 2022-12-13 15:00:13 -03:00
Ramón Souza
0babed1a8d
chore: Set bigbluebutton release to 2.6.0-beta.3 2022-12-13 13:17:59 -03:00
Ramón Souza
1fda877450
Merge pull request #15929 from prlanzarin/u25/fix/cam-reconn-issues
fix: guarantee cleanup of stale data on re-subscriptions
2022-12-13 13:12:41 -03:00
Ramón Souza
692ee112cc disable paste file in whiteboard 2022-12-13 13:11:56 -03:00
Anton B
1bf77d77a0 Merge remote-tracking branch 'upstream/v2.6.x-release' into v2.6-tests-fixes 2022-12-13 10:30:28 -03:00
Anton Georgiev
6a90c798d8
chore: rephrase keep pushing layout 2022-12-12 14:13:02 -05:00
Anton Georgiev
de2712b170
Merge pull request #16108 from zhem0004/tomcatTo9.0.70ON2.5
chore: upgrade tomcat to 9.0.70 on branch 2.5
2022-12-12 13:41:53 -05:00
Ramón Souza
f9c0959e59
Merge pull request #16109 from ramonlsouza/issue-15944
style: increase breakout room box size
2022-12-12 13:01:10 -03:00
Anton Georgiev
141eb51408 Merge branch 'v2.6.x-release' of github.com:bigbluebutton/bigbluebutton into meteor-bump 2022-12-09 19:13:52 +00:00
Ramón Souza
caf3b42547
Merge pull request #16112 from ramonlsouza/fix-tab-check
fix: string in selectedTab comparison - connection status modal
2022-12-09 15:45:59 -03:00
Ramón Souza
03e6835565 fix string in selectedTab comparison 2022-12-09 15:36:44 -03:00
Ramón Souza
6b6f3f4775
Merge pull request #16111 from JoVictorNunes/dashboard-accessibility-updates
Dashboard A11y Updates
2022-12-09 15:14:59 -03:00
Ramón Souza
d6220e277f
Merge pull request #16098 from ramonlsouza/issue-16080
style: increase video modal max-height
2022-12-09 14:39:39 -03:00
Joao Victor
339c6fa33e Fix regression 2022-12-09 13:22:23 -03:00
Anton Georgiev
ed6748d61d
Merge pull request #16104 from zhem0004/tomcatTo9.0.70
chore: upgrade tomcat to 9.0.70
2022-12-09 10:34:02 -05:00