Commit Graph

38295 Commits

Author SHA1 Message Date
Ramón Souza
31add17d9c fix adjust settings button 2023-05-26 15:29:29 -03:00
KDSBrowne
3eb0b31e19 Merge branch 'v2.7.x-release' of https://github.com/bigbluebutton/bigbluebutton into v2.7.x-release 2023-05-26 16:37:03 +00:00
Ramón Souza
6ef4b408f6 self cam -> self-view 2023-05-26 13:21:56 -03:00
Tainan Felipe
222c61b99f Add break word 2023-05-26 12:29:13 -03:00
Anton Georgiev
80a46d5ab3
chore: Enable by default Camera as content 2023-05-26 11:28:40 -04:00
Tainan Felipe
479debafdf Refactor: Change component from popup to callout 2023-05-26 12:25:17 -03:00
Scroody
5dcd018500 Removed empty E 2023-05-26 11:04:35 -03:00
Gustavo Trott
51bdcededc Merge 2.7 into develop 2023-05-26 10:50:39 -03:00
André Castro
51b0549e59
Update component.jsx 2023-05-26 10:19:29 -03:00
Ramón Souza
06c0fab6ce Merge remote-tracking branch 'upstream/v2.7.x-release' into issue-17894 2023-05-26 10:13:43 -03:00
Gustavo Trott
8948905c1c
Merge pull request #18012 from gustavotrott/graphql-send-pres-to-chat
refactor (graphql-server): Send presentation to chat in graphql
2023-05-26 09:39:46 -03:00
Gustavo Trott
624137f19b Send presentation to chat in graphql 2023-05-26 09:38:11 -03:00
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
Gustavo Trott
89c8e7f990
Merge pull request #17992 from gustavotrott/graphql-client-hook-improvements
refactor (graphql-middleware): Support enable json-patch per subscription
2023-05-25 21:07:28 -03: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
Gustavo Trott
f7663bc62d Fix to handle concurrency and throw error on invalid gql format 2023-05-25 17:08:04 -03: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