Commit Graph

11727 Commits

Author SHA1 Message Date
Gustavo Trott
51bdcededc Merge 2.7 into develop 2023-05-26 10:50:39 -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
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
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
Ramón Souza
219b1d1a72
add inline comment 2023-05-24 15:45:08 -03:00
Anton Georgiev
cb68297273
Merge pull request #17963 from ramonlsouza/fix-self-checked-value
fix: webcam self view toggle label
2023-05-24 14:40:15 -04:00
Ramón Souza
60713e6f54 fix slide render issue in firefox 2023-05-24 14:36:58 -03:00
Gustavo Trott
d1a60157e5 Insert Poll result as Chat msg in graphql 2023-05-24 10:56:22 -03:00
Arthurk12
3efdbd9012 feat(reactions): add akka messages to clear all emojis status
Adds two new messages which clear the users emoji statuses. This messages
enables this task to be done in a single call, instead of triggering one
method call for each user.
'ClearAllUsersEmojiCmdMsg' is sent from meteor to akka and updates all the
emoji states in the users model.
'ClearedAllUsersEmojiEvtMsg' is sent from akka to meteor. This triggers the
 mongo collection update.
2023-05-24 10:49:42 -03:00
Gustavo Trott
ed2c94eaea Add externalVideo and screenshare to Graphql 2023-05-23 09:09:38 -03:00
Arthurk12
8541a5aae1 fix(reactions): prop name 2023-05-22 12:07:08 -03:00
Ramón Souza
7312021d9b fix self view label value 2023-05-22 10:19:49 -03:00
Gustavo Trott
62e2051a9f
Merge pull request #17954 from gustavotrott/graphql-welcomeMsg
refactor (graphql-server): Include welcomeMsg and set permissions
2023-05-19 15:36:22 -03:00
Gustavo Trott
0fa28dd5d1 Include welcomeMsg to graphql and set permissions 2023-05-19 15:28:20 -03:00
Scroody
08a0226b59 Fix: Send to chat presentation not having unread notification 2023-05-19 10:54:29 -03:00
Ramón Souza
0040ee7028 do not display self view disabled message if camera is not being shared 2023-05-19 09:44:08 -03:00
Anton Georgiev
6e9eb023c5
Merge pull request #17883 from ramonlsouza/issue-13844
feat: Add "Grid View" layout
2023-05-18 15:43:02 -04:00
Anton Georgiev
1d3bdb5802
Merge pull request #17648 from GuiLeme/issue-17531
feat: Restore old downloading of original presentation
2023-05-18 15:40:01 -04:00
Gustavo Trott
e86d84fef0
Merge pull request #17876 from Tainan404/new-chat-implementation
Refactor: Chat using graphql and pagination
2023-05-18 15:09:50 -03:00
Ramón Souza
e0cea4834b
Merge pull request #17907 from KDSBrowne/bbb-17466
fix: Localize Regular Expressions for Quick Poll Options
2023-05-18 09:06:19 -03:00
Ramón Souza
18720e1536 Merge remote-tracking branch 'upstream/v2.7.x-release' into issue-13844 2023-05-17 15:44:39 -03:00
Tainan Felipe
67e0ba4275 Put message sent time to left side 2023-05-17 14:53:27 -03:00
Ramón Souza
c64cf5ccbd
Merge pull request #17935 from Scroody/I-16114
feat: Disable self-view of webcam
2023-05-17 14:49:40 -03:00
Tainan Felipe
59069f7156 Fix offline status and set boundary to chat pages 2023-05-17 14:00:02 -03:00
Scroody
0fa1b9b3eb More requested changes made 2023-05-17 13:54:54 -03:00
Tainan Felipe
410b22e9d7 Fix offline aligment 2023-05-17 11:53:06 -03:00
Tainan Felipe
e6d62e3d69 Fix: css issues 2023-05-17 11:51:19 -03:00
Scroody
4a6d1258ae Requested changes made and fix of deactivating mutiple cams 2023-05-17 11:30:06 -03:00
Tainan Felipe
268ea12da1 Fix: unecessary messages fetch and add support to private messages 2023-05-17 10:17:17 -03:00
Scroody
99885c20ed Final Adjust 2023-05-16 15:43:06 -03:00
GuiLeme
1b26302745 [issue-17531] - merge upstream/v2.7.x-release 2023-05-16 15:30:15 -03:00
Scroody
8272b487f3 Testing 2023-05-16 14:39:56 -03:00
Anton Georgiev
510c94cfa7 Merge branch 'v2.6.x-release' of github.com:bigbluebutton/bigbluebutton into may16-merge 2023-05-16 13:35:47 -04:00
Tainan Felipe
20d1a6a3da improve code smell 2023-05-16 10:54:48 -03:00
Ramón Souza
40c826b127 preserve font settings on page change 2023-05-16 10:41:24 -03:00
Tainan Felipe
f5c43cf315 Fix: scroll jumping to bottom, message clipping and page changing 2023-05-16 10:26:52 -03:00
Ramón Souza
99832aa570
Merge pull request #17864 from hiroshisuga/dev2.6_fitToWidthStyle
style: Change style of fit-to-width button when it's on
2023-05-16 08:56:39 -03:00
Ramón Souza
341e2c9464
Merge pull request #17862 from hiroshisuga/patch-4
style: remove unnecessary fit-to-width style
2023-05-16 08:51:45 -03:00
Ramón Souza
af23ce542e
Merge pull request #17702 from Scroody/virtual-backgound-accepts-webp
feat (html5): Virtual backgrounds now accepts webp format
2023-05-15 17:06:41 -03:00
Ramón Souza
fecf42dada
Merge pull request #17905 from danielpetri1/export-toast-fix
fix(bbb-html5): Successful annotated export toast
2023-05-15 16:39:16 -03:00
danielpetri1
6435fbbf25 Linting changes 2023-05-15 18:56:01 +00:00
Paulo Lanzarin
2b374533ae
Merge pull request #17904 from prlanzarin/u26/fix/video-button-ios-uacheck
fix: remove legacy iOS UA checks that borked camera sharing in iPads
2023-05-15 15:16:56 -03:00
Ramón Souza
dcef3e3d7b
Merge pull request #17845 from ramonlsouza/issue-17839
fix: ignore restore on update for first load of initial presentation
2023-05-15 13:41:27 -03:00
KDSBrowne
b0ae991b1f format new line character in question string 2023-05-15 16:35:32 +00:00