Commit Graph

320 Commits

Author SHA1 Message Date
Gustavo Trott
d018fd6490 Resolve conflicts 2023-08-16 16:24:34 -03:00
Ramón Souza
22605b3fbb grid mode pagination 2023-07-26 09:18:23 -03:00
Gustavo Trott
185e48d36c Merge remote-tracking branch 'upstream/v2.7.x-release' into develop 2023-07-21 17:17:52 -03:00
Scroody
86f4e372f8 Fix: Warnings when creating a new meeting 2023-07-19 13:22:50 -03:00
Gustavo Trott
21f1ed9f27 Merge 2.7 into Develop 2023-07-14 17:42:13 -03:00
Anton Georgiev
cd9f93be44 Merge remote-tracking branch 'bbb/v2.6.x-release' into merge-july12 2023-07-12 15:59:46 -04:00
Anton B
06478cda4a test: update layout tests 2023-07-10 16:28:00 -03:00
Ramón Souza
870d773fdf remove unused code 2023-07-07 13:22:34 -03:00
Ramón Souza
d50e0ee2cd mobile styles 2023-07-07 10:10:13 -03:00
Ramón Souza
804d7e859c change labels, update push layout experience 2023-07-07 09:53:58 -03:00
Ramón Souza
91c5094588 add checkmark to active layout 2023-07-06 17:31:26 -03:00
Ramón Souza
67d9cc423a move labels below the images 2023-07-06 11:00:44 -03:00
KDSBrowne
66c3e1b0a8 reset cam dock position on custom layout change 2023-06-27 15:47:59 +00:00
Gustavo Trott
5681e88c60 Merge 2.7 into Develop 2023-06-26 17:21:01 -03:00
Anton Georgiev
a962a44c74 Merge branch 'v2.6.x-release' of github.com:bigbluebutton/bigbluebutton into june14merge 2023-06-14 10:07:54 -04:00
Gustavo Trott
22a2c8ce7c Merge remote-tracking branch 'upstream/v2.7.x-release' into graphql-timer 2023-06-12 10:06:22 -03:00
Scroody
bd087969dc Fix: Whites squares 2023-06-08 14:54:41 -03:00
Scroody
09286137c2 Approach to solve issue changed. 2023-06-05 16:46:04 -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
Pedro Beschorner Marin
5463a4a423 Stopwatch handlers 2023-05-18 15:29:31 -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
Anton Georgiev
4e851a7571 Merge branch 'v2.6.x-release' of github.com:bigbluebutton/bigbluebutton into merge-267-27 2023-05-15 11:51:17 -04:00
Ramón Souza
ffe8754733 add grid layout 2023-05-11 17:20:26 -03:00
Ramón Souza
a97d0216eb fix pinned shared notes on join 2023-05-08 10:01:08 -03:00
Ramón Souza
65e16518dc
Merge pull request #17676 from Scroody/fix-draggable-cameras-no-presentation
Fix: Draggable cameras when presentation minimized.
2023-04-27 19:16:01 -03:00
GuiLeme
7492506224 [chat-list-migration] - started migration for chatList 2023-04-26 18:02:32 -03:00
Ramón Souza
af8556e026 Merge remote-tracking branch 'upstream/v2.6.x-release' into 26-27-apr24 2023-04-24 17:15:47 -03:00
Scroody
23bac8b628 Fix: Draggable cameras when presentation minimized 2023-04-19 14:04:28 -03:00
Ramón Souza
ce627f8bdb fix presentation minimized after screenshare 2023-04-19 09:41:30 -03:00
GuiLeme
d1025fcbe5 [issue-16954] - Changes in review and fix of minor bugs 2023-04-12 12:51:23 -03:00
GuiLeme
5eb29e0ab5 [issue-16954] - merge upstream/v2.7.x-release 2023-04-11 11:02:00 -03:00
Ramón Souza
17f428d0af
Merge pull request #17486 from danielpetri1/blank-space
fix(bbb-html5): Maximize webcams when removing all presentations
2023-04-06 13:17:52 -03:00
Anton Georgiev
72c575b911 Merge branch 'v2.6.x-release' of github.com:bigbluebutton/bigbluebutton into merge-apr-6 2023-04-06 11:50:26 -04:00
danielpetri1
eb9b12a581 No blank space in sidebar 2023-04-06 14:37:34 +00:00
Anton Georgiev
cc820ad02d
Merge pull request #17370 from Scroody/I-17330
Fixed: Error when trying to apply custom styles via URL.
2023-04-05 15:15:57 -04:00
danielpetri1
b91e766184 Maximize webcams when all presentations removed 2023-04-05 15:37:56 +00:00
Ramón Souza
bcd504b749 Merge remote-tracking branch 'upstream/v2.7.x-release' into lodash-radash 2023-04-05 09:42:05 -03:00
Ramón Souza
caddf61259 fix camera position when notificationBar appears 2023-04-04 09:34:00 -03:00
imdt
7d117e3dd6 Fixed: Error when trying to apply custom styles via URL. 2023-03-30 17:00:41 -03:00
imdt
0b34b4e971 Fixed: Error message on layout change. 2023-03-29 15:38:55 -03:00
GuiLeme
4e17e80873 [issue-16954] - migrating dropdown menu from presenter 2023-03-21 14:55:43 -03:00
GuiLeme
e77af8874b [issue-16954] - patch for renaming 2023-03-20 10:13:35 -03:00
Anton Georgiev
2f3a8f03e9
Merge pull request #17083 from ramonlsouza/pr-16950
feat(layout): Recover (from 2.5) the ability of viewers to set their own layout
2023-03-17 12:50:26 -04:00
Ramón Souza
b3be1c3a74 fix sync layout only if custom 2023-03-17 09:37:45 -03:00
Lucas Fialho Zawacki
8f5460312a fix(layout): Propagate correct presenter layout when push is off and moderator sets it to true 2023-03-06 18:08:25 -03:00
Lucas Fialho Zawacki
e8a4b654cc feature(layout): Moderators can now setPushLayout 2023-03-03 18:59:47 -03:00
Ramón Souza
d181eba1c2 replace lodash.throttle with native function 2023-03-02 10:25:08 -03:00
Ramón Souza
41c187d93e Merge remote-tracking branch 'upstream/v2.6.x-release' into lodash-radash 2023-03-01 15:19:12 -03:00
Ramón Souza
0a622eff32 replace lodash throttle with standalone package 2023-03-01 15:13:29 -03:00