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

38400 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Gustavo Trott
a79a8fa35d
Merge pull request #18017 from gustavotrott/merge-27-into-develop 
Merge 27 into develop
 2023-05-29 10:59:27 -03:00
Anton Georgiev
20d124722a
Merge pull request #17962 from ramonlsouza/change-self-cam-label 
refactor: Change enable/disable self cam label based on state
 2023-05-29 09:49:52 -04:00
Anton Georgiev
6552a80236
Merge pull request #18025 from KDSBrowne/bbb-17985 
fix: Flickering Dock Position During Slide Changes
 2023-05-29 09:48:57 -04:00
transifex-integration[bot]
905312e184
Translations for bigbluebutton-html5/public/locales/en.json in fa_IR (#18027) 
* 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-29 09:48:40 -04:00
Ramón Souza
d3eff236e1
Merge pull request #18020 from Scroody/I-17893 
Fix: Empty 'E' on polls answer options
 2023-05-29 10:34:22 -03:00
André Castro
3852520d0b
Update component.jsx 2023-05-29 10:21:17 -03:00
Anton Georgiev
aebb8d7c9f
Merge pull request #18022 from bigbluebutton/antobinary-patch-2 
chore: Enable by default Camera as content
 2023-05-26 15:35:26 -04:00
transifex-integration[bot]
4241dc9447
Translate en.json in ru (#18023) 
100% translated source file: 'en.json'
on the 'ru' language.

Co-authored-by: transifex-integration[bot] <43880903+transifex-integration[bot]@users.noreply.github.com>
 2023-05-26 15:15:17 -04:00
KDSBrowne
07c7e2c66e fix setting tldraw dock position 2023-05-26 18:39:09 +00:00
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
Paulo Lanzarin
5447666c15
Merge branch 'v2.7.x-release' into port-timer 2023-05-26 10:33:38 -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