BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
39,107 Commits 13 Branches 260 Tags 1.1 GiB
db8452f3f1
Commit Graph

1176 Commits

Author SHA1 Message Date
germanocaumo
7bf8668f23 Merge branch 'v2.6.x-release' of https://github.com/bigbluebutton/bigbluebutton into tldraw-viewbox-sync 2022-08-18 18:41:27 +00:00
Ramón Souza
ff52b6ae28 fix presentation snapshot feature 2022-08-18 15:17:38 -03:00
Ramón Souza
30a17562c1
Merge pull request #15539 from JoVictorNunes/issue-15484 
style: presentation toolbar in RTL mode
 2022-08-17 13:53:13 -03:00
KDSBrowne
554c792345 restrict pan tool shortcut to presenter only 2022-08-17 15:36:56 +00:00
KDSBrowne
f1ba37fc2f handle active pan state via shortcut 2022-08-17 15:23:48 +00:00
Ramón Souza
54e2618011 adjust large file error on presentation 2022-08-17 10:17:26 -03:00
Ramón Souza
b90d4ce81e fix conversion state 2022-08-16 17:26:42 -03:00
germanocaumo
98d431ad92 fix(recording): correctly save tldraw pan/zoom events 2022-08-16 19:11:49 +00:00
Joao Victor
eb8838dfaa fix: show conversion process info in toast #15505 2022-08-16 12:04:02 -03:00
Ramón Souza
a895b087f9 display page exceeded error on presentation uploader 2022-08-16 11:41:11 -03:00
germanocaumo
d4b8bdce7e fix(tldraw): sync viewed area between presenter/viewers + 
- Return to the ResizeAndMoveSlide event to do pan&zoom, respecting the viewed width and height ratio
- Defaults zoom in toolbar to 100% like before to be more consistent
- Fit to width and Reset Zoom is back (fit tho width still has some sync problems)
- Fix to not change to first page when presenter reloads page
 2022-08-16 12:12:43 +00:00
Joao Victor
14d8200742 style: presentation toolbar 2022-08-15 14:56:10 -03:00
KDSBrowne
48157ae49b reset pan when not zoomed | presenter change 2022-08-15 13:17:36 +00:00
Ramón Souza
f851765ab3 fix presentation downloadable state 2022-08-15 09:50:07 -03:00
KDSBrowne
26f3e5dc3f add pan button to presentation toolbar 2022-08-14 22:49:39 +00:00
GuiLeme
491380096e [apply-toast-shared-notes] - changes in review and resolve merge conflict 2022-08-11 15:50:06 -03:00
Ramón Souza
c032009677 fix remove presentation bug 2022-08-11 14:27:29 -03:00
GuiLeme
c65def5a0f [apply-toast-shared-notes] - ajustments to maintain flow 2022-08-10 11:57:53 -03:00
GuiLeme
246153e62c [apply-toast-shared-notes] - Removed some of the comments and separated toast controller 2022-08-09 12:24:44 -03:00
GuiLeme
93b51ded53 [apply-toast-shared-notes] - Finished separation of the component 2022-08-08 17:42:06 -03:00
GuiLeme
147f339e55 [apply-toast-shared-notes] - change the tracker from the service, implemented the solution to shared notes. 2022-08-08 08:50:52 -03:00
Ramón Souza
a7495ad16b add presentation snapshot button data-test 2022-08-05 13:14:27 -03:00
Gustavo Trott
3e6d546062
Merge pull request #15367 from danielpetri1/pdf-disabledFeatures-tldraw 2022-08-04 21:51:57 -03:00
GuiLeme
1e0700b455 [apply-toast-shared-notes] - merge 26 and resolved conflicts 2022-08-03 11:12:55 -03:00
Ramón Souza
ded8493f05 Merge remote-tracking branch 'upstream/v2.5.x-release' into 2526-aug3 2022-08-03 09:53:41 -03:00
GuiLeme
74caa9cb5f [apply-toast-shared-notes] - Savepoint - Made some changes 2022-08-02 17:25:15 -03:00
Daniel Petri Rocha
3529fe9f28 Rename parameters; hide download button and label when disabled 2022-08-02 15:53:40 +02:00
Gabriel Porfirio
8198953f30 removing unused imports 2022-07-28 16:50:31 -03:00
Ramón Souza
ccce085aed Merge remote-tracking branch 'upstream/v2.6.x-release' into issue-15001 2022-07-27 09:49:19 -03:00
Gustavo Trott
acb0465266
Merge pull request #15412 from JoVictorNunes/export-presentation 2022-07-26 17:49:09 -03:00
Ramón Souza
b00d19b097
Merge pull request #15110 from ramonlsouza/fix-restore-on-update 
fix: autoSwapLayout/restoreOnUpdate new presentation fails to show (2.5)
 2022-07-26 16:38:33 -03:00
Joao Victor
26cd80506e fix: snapshot of current slide 2022-07-26 11:54:50 -03:00
GuiLeme
f0c95c4fe5 [apply-toast-shared-notes] Checkpoint - moving responsability of monitoring the upload to the service 2022-07-26 09:25:36 -03:00
Joao Victor
07434d238c refactor: toast notification rework 2022-07-25 18:56:26 -03:00
GuiLeme
82e0204cfa [apply-toast-shared-notes] - Savepoint refactor toast 2022-07-22 10:06:32 -03:00
Joao Victor
ce7f35b3db fix: checkbox and remove button alignment in RTL languages 2022-07-21 17:30:25 -03:00
Anton Georgiev
d7bdc324a0 chore: pull BBB 2.5.4+ into 2.6 2022-07-21 20:25:31 +00:00
Joao Victor
e59e3b68af fix: header alignment 2022-07-21 17:20:03 -03:00
GuiLeme
dbb2681b28 WIP - started refactoring service 2022-07-21 15:56:44 -03:00
Joao Victor
cff1c087a8 feat: front-end support for exporting presentations with annotations 2022-07-19 16:36:00 -03:00
Ramón Souza
f083bb9a20
Merge pull request #15273 from JoVictorNunes/issue-15272 
fix: apply presentation 'isCurrent' changes to local state
 2022-07-18 21:19:20 +01:00
Ramon Souza
db5ac1428a Merge tag 'v2.5.3' into merge25-26-jul14 2022-07-15 11:08:02 -03:00
gabriellpr
49f12c43af
Merge branch 'v2.6.x-release' into dark-light-buttons 2022-07-13 15:36:31 -03:00
Ramón Souza
04386dfcd5
Merge pull request #15212 from gabriellpr/styling-buttons 
style: Revised styles for our secondary buttons
 2022-07-13 15:22:49 +01:00
Anton Georgiev
1393e4a7de
Merge pull request #15352 from germanocaumo/tldraw-z-f 
fix(tldraw): initial/viewer zoom fixes + presToolbar height
 2022-07-13 09:42:36 -04:00
germanocaumo
0c75b3ce02 fix(tldraw): correctly get toolbar height 
This solves the problem where the toolbar is not counted in the slide area space, so the presentation would stay behind the toolbar when zoomed out
 2022-07-08 15:45:55 +00:00
germanocaumo
217fd6c06e fix(tldraw): wrong initial/viewer zoom 
Fixes a case when the presentation is just uploaded and a wrong initial zoom was set.
Also fix viewer zoom not correclty adjusting to the area size when zoomed out.
 2022-07-08 15:06:00 +00:00
gabriellpr
f848d31014 modifying specific buttons 
removing border and implementing box-shadow

adding transparent border

passing styles to common buttons

adding secundary color to component

updating color components
 2022-07-07 10:45:54 -03:00
Anton Georgiev
eca4ebe56f
Merge pull request #15221 from MaximKhlobystov/25-test-update 
test: New 2.5 tests + links from test specs to 2.5 test plan
 2022-07-06 09:39:49 -04:00
gabriellpr
8d75eddd88 WIP: styling light and dark buttons 2022-07-05 09:05:46 -03:00
Anton B
c71e5c9f74 test: fix all 2.6 tests and temporarily skip inconsistent ones 2022-07-01 17:55:32 -03:00
Ramon Souza
67abbe9489 only remove annotations/cursors when multiUser is disabled 2022-07-01 14:38:12 -03:00
Ramon Souza
f74beed916 fix(whiteboard): don't hide presenter's cursor 2022-07-01 14:37:23 -03:00
Ramon Souza
b5cf43b04e fix: cursor displaying for another users 2022-07-01 14:35:16 -03:00
Ramon Souza
4acbce94cd fix: clear cursors data on multi-user whiteboard off 2022-07-01 14:32:34 -03:00
Joao Victor
66d3d2c13b fix: clear fake annotations on multi-user whiteboard off 2022-07-01 14:31:14 -03:00
Joao Victor
3ea33ce3ac fix: apply presentation 'isCurrent' changes to local state 2022-06-28 13:33:54 -03:00
Ramon Souza
45dae6953d external upload area in presentation upload modal 2022-06-24 13:47:17 -03:00
Ramón Souza
88697650a2
Merge pull request #15232 from antobinary/merge-252 
chore: Merge BBB 2.5.2 into 2.6.x
 2022-06-22 19:05:27 +01:00
Anton Georgiev
4402f20c34 chore: Merged BBB 2.5.2 into v2.6.x-release 2022-06-22 16:11:48 +00:00
Anton Georgiev
10b0d47257
Merge pull request #15178 from gabriellpr/presentation-menu 
refactor: Adding bbbmenu component to presentation menu
 2022-06-22 11:42:53 -04:00
KDSBrowne
a899bbeb79
Merge branch 'v2.6.x-release' into 2.6-wb-options-dropdown 2022-06-21 23:16:31 -04:00
KDSBrowne
dd37a2479f fix menu position in rtl and iPhone 2022-06-22 03:11:25 +00:00
gabriellpr
0e831c86cc adding tooltip-container 2022-06-21 08:53:06 -03:00
Maxim Khlobystov
93a94ca88f Fit to width and multi-presentation upload 2022-06-20 19:02:10 -04:00
Ramón Souza
d3fc924f10
Merge pull request #15137 from KDSBrowne/2.6-toolbar-zoom-val 
Display Correct Zoom Value on Presentation Restore
 2022-06-20 13:11:25 +01:00
KDSBrowne
3b44d17417 restore WB snapshot image download 2022-06-17 19:10:23 +00:00
KDSBrowne
4f9f9c11d3 fix viewer zoom reset when presenter remounts presentation 2022-06-17 00:35:27 +00:00
Ramon Souza
edeb70de0d Merge tag 'v2.5.1' into merge25-26-jun16 2022-06-16 13:58:54 -03:00
gabriellpr
449d6ca463 fix fullscreen not working normally 2022-06-16 13:32:27 -03:00
KDSBrowne
8df5e3de02 recover presentation option menu | position inside tldraw menu 2022-06-15 22:10:42 +00:00
KDSBrowne
8dac344f43 replace zoom minBound with zoomed state 2022-06-15 19:46:06 +00:00
Ramón Souza
933d9b438b
Merge pull request #15148 from ramonlsouza/rename-snapshot-feature 
Rename snapshot button label
 2022-06-14 15:21:15 +01:00
gabriellpr
7adbce8e32 WIP:adding bbbmenu component to presentation menu 2022-06-14 10:18:40 -03:00
KDSBrowne
53f4224fd1 Merge branch '2.6-toolbar-zoom-val' of https://github.com/KDSBrowne/bigbluebutton into 2.6-toolbar-zoom-val 2022-06-13 15:40:42 +00:00
KDSBrowne
15e58c0f69 stop zoom out at min % 2022-06-13 15:39:34 +00:00
Ramon Souza
4f3600e683 rename snapshot button label 2022-06-08 15:24:46 -03:00
Anton B
de1c7043a9 test: fix/update tests on v2.5 2022-06-08 09:29:21 -03:00
KDSBrowne
668be68b8e fix zoom value reset on unmount / mount 2022-06-06 20:30:34 +00:00
KDSBrowne
6d4d11a34d fix cursors lock for viewers 2022-06-02 15:00:28 +00:00
germanocaumo
07a3a915c0 feat(whiteboard): poll result, zoom fit slide + 
- Poll result as text shape in the lower right-hand
- Include all tldraw shape bounds as size in akka (to help Daniel rendering in pdf export)
- Default/initital zoom will be centered in the slide and maximize the size according to the presentation area
- Also limited the max zoom out to be the one that fits the slide, to be similar as we had before
 2022-05-31 19:40:31 +00:00
Ramon Souza
b9a98e3fb9 undo double quotes replace 2022-05-31 13:52:37 -03:00
Ramon Souza
e43c83b7ba fix restoreOnUpdate 2022-05-30 17:37:40 -03:00
KDSBrowne
f58882ffcc stop rendering curors when they leave the WB area 2022-05-29 16:24:44 +00:00
KDSBrowne
626259bf33 move multi user WB button to presentation toolbar (100% width) | reduce zoom increment 2022-05-25 23:25:53 +00:00
Tainan Felipe
155b90d658 Refactor aria alert and remove inner-htmls from the client 2022-05-25 09:35:24 -03:00
KDSBrowne
73c58a6750 show undo | redo UI + preserve zoom state on reload 2022-05-19 02:32:32 +00:00
germanocaumo
386eb595ee redo working locally 2022-05-19 00:52:45 +00:00
germanocaumo
19d4caec99 refactor tldraw doc state to not crash on fast updates + 
change slide going  and controlled by akka messages
undo is working locally
 2022-05-18 19:35:42 +00:00
KDSBrowne
920d1def89 restore presentation toolbar 2022-05-16 02:35:17 +00:00
KDSBrowne
10adb3e097 remove merge comment 2022-05-13 12:14:01 +00:00
germanocaumo
45febec644 panAndZoom through akka + some cleanup 2022-05-13 02:47:41 +00:00
KDSBrowne
9961cef474 reposition tldraw toolbar 2022-05-13 02:47:40 +00:00
germanocaumo
cee766d1b6 cursor updates through akka 2022-05-13 02:47:40 +00:00
KDSBrowne
10c8d3759d hack adding pres slide images and page switching 2022-05-13 02:43:40 +00:00
KDSBrowne
5cb29535f7 embed Tldraw into BBB client 2022-05-13 02:21:35 +00:00
Lucas Zawacki
378d0f18a0 Merge branch 'develop' of https://github.com/bigbluebutton/bigbluebutton into develop-bbb 2022-04-14 18:48:02 +00:00
Lucas Zawacki
83847a21aa Merge branch 'v2.5.x-release-Layouts' of github.com:lfzawacki/bigbluebutton into develop-bbb 2022-04-13 21:08:32 +00:00
Anton Georgiev
aaef76cd2e Merge branch 'v2.5.x-release' of github.com:bigbluebutton/bigbluebutton into merge-25-dev 2022-04-13 20:58:02 +00:00
Ramon Souza
7a57344177 Merge remote-tracking branch 'upstream/v2.4.x-release' into 24-25-merge-apr12 2022-04-12 14:46:13 -03:00
Guilherme Leme
4627e39435 [issue-14749] - fix downloadable persistence. 2022-04-11 10:26:15 -03:00
Anton Georgiev
1500fb6a29 Merge branch 'v2.5.x-release' of github.com:bigbluebutton/bigbluebutton into merge-25-dev 2022-04-09 00:55:25 +00:00
Anton Georgiev
33575e60e6 Merge branch 'develop' of github.com:bigbluebutton/bigbluebutton into v2.5.x-release 2022-04-09 00:48:14 +00:00
Ramon Souza
1c873bd8d6 Merge remote-tracking branch 'upstream/v2.4.x-release' into merge-2425-apr08 2022-04-08 17:30:21 -03:00
Guilherme Leme
3a93898af0 [issue-14749] - Refactored temporaryPresId format to not rely on UTF-8 encoding when sending the multipart/form-data content-type in futch method. 2022-04-08 11:28:47 -03:00
Joao Victor
9b6c43fa2b Use forEach instead of map 2022-04-07 14:06:51 -03:00
Joao Victor
a89c8eb0d0 Pass function to get svg ref instead of the ref itself 2022-04-06 16:37:11 -03:00
Ramon Souza
fcaf26d1e6 fix no presentation bug 2022-04-06 10:44:09 -03:00
Ramon Souza
a1a8d68b4d fix presentation size 0 bug 2022-04-05 14:37:52 -03:00
Anton Georgiev
23ee038387
Merge pull request #14585 from danielpetri1/pads-shared-notes-upload 
feat: Automatic upload of the shared notes as presentation
 2022-04-05 08:06:24 -04:00
Anton Georgiev
2a131086a7 Merge branch 'v2.5.x-release' of github.com:bigbluebutton/bigbluebutton into merge-25 2022-03-31 15:32:14 +00:00
Anton Georgiev
c89f952868
Merge pull request #14578 from JoVictorNunes/issue-14443 
fix: toast notification style
 2022-03-31 10:46:59 -04:00
Anton Georgiev
478605b6b0 Merge branch 'v2.5.x-release' of github.com:bigbluebutton/bigbluebutton into merge-25-develop 2022-03-30 18:19:28 +00:00
Daniel Petri Rocha
b29175a6c5
Merge branch 'develop' into pads-shared-notes-upload 2022-03-27 23:21:32 +02:00
Guilherme Leme
c6653cd4b2 [Issue-14321]- Changes in Review 2022-03-25 14:12:10 -03:00
Ramon Souza
6199bcbd4f fix fullscreen presentation button label 2022-03-25 13:38:57 -03:00
Ramon Souza
998821db4a remove unused code 2022-03-25 10:11:53 -03:00
KDSBrowne
e25df307c1 use users context 2022-03-23 14:54:13 +00:00
KDSBrowne
229aa39384 use lock context 2022-03-23 13:52:15 +00:00
KDSBrowne
9a765b9c7e add moderator constant | rename variables 2022-03-22 18:11:08 +00:00
KDSBrowne
3bb184f3a4 add lock viewers cursor setting UI 2022-03-22 03:14:40 +00:00
Anton Georgiev
843ad94304
Merge pull request #14548 from antonbsa/fix-selectors-2.5 
test: Fixes and updates in automated tests to v2.5
 2022-03-17 09:45:22 -04:00
Guilherme Leme
b765312a2e [issue-14321] - refactored name of variable presId to tmpPresId in order to make more sense in the context of presentation-token-upload and presentation collections. 2022-03-14 14:46:51 -03:00
Guilherme Leme
9104a0308e [issue-14321] - Changes to make it possible to send 2 presentations with the same name 2022-03-14 12:10:27 -03:00
Guilherme Leme
082a98d279 Merge remote-tracking branch 'upstream/v2.4.x-release' into issue-14321 2022-03-14 08:14:34 -03:00
Guilherme Leme
6a515694d5 Merge branch 'v2.4.x-release' into issue-14321 2022-03-11 17:42:38 -03:00
Joao Victor
41237ae0a0 Fix notification not displaying 2022-03-11 11:57:43 -03:00
Lucas Zawacki
559b6f59c2 fix(layout): Remove unused options 2022-03-09 18:04:21 -03:00
Gustavo Trott
3013c2792b Implements disabledFeatures/polls 2022-03-08 15:05:24 -03:00
Daniel Petri Rocha
e4b62a2efb File upload with Axios 2022-03-08 16:29:11 +01:00
Daniel Petri Rocha
fea6a60ad7 Upload via client 2022-03-08 15:33:30 +01:00
Daniel Petri Rocha
4995ad5d82 Shared notes: client-side UI, get PDF from bbb-pads 2022-03-08 01:25:44 +01:00
Ramón Souza
9ec9bfc790 do not display presentation placeholder in smart layout 2022-03-07 20:21:58 +00:00
Anton B
8f497b4249 Merge remote-tracking branch 'upstream/v2.5.x-release' into fix-selectors-2.5 2022-03-07 15:59:06 -03:00
Guilherme Leme
e798d31df2 [issue-14321] - Fixed the sudden change of presentations when clicking on the confirm button. 2022-03-04 16:40:59 -03:00
Anton Georgiev
d89470a96f
Merge pull request #14406 from JoVictorNunes/issue-14380 
feat(presentation): new presentation menu and snapshot of the current presentation
 2022-03-02 13:50:34 -05:00
Joao Victor
cd434c48b0 Remove old minimize button / Add check for empty options 2022-03-02 14:40:23 -03:00
Joao Victor
205c96d74a Disable in Safari 2022-03-02 14:09:56 -03:00
Lucas Zawacki
140e08a730 Adapt code for merge 2022-03-02 11:24:54 -03:00
Anton B
e988734bf4 fix and updates all automated tests to v2.5 2022-02-28 16:46:13 -03:00
Ramón Souza
fee6077d29 fix presentation downloadable change 2022-02-24 19:33:44 +00:00
Lucas Zawacki
43afef9bad feature(layout): Remove 'swap layout' concept 2022-02-24 16:05:18 -03:00
Lucas Zawacki
830c44702f feature(layout): Only use one place to store presentationIsOpen 2022-02-24 15:30:53 -03:00
Ramón Souza
138f4d64e4 Merge remote-tracking branch 'upstream/v2.4.x-release' into v2.5.x-release 2022-02-24 14:49:56 +00:00
Joao Victor
f13103ea7b New message for presentation item status 2022-02-21 15:01:55 -03:00
Joao Victor
6d8b9ad8b5 New presentation menu and snapshot of the current presentation 2022-02-18 17:45:16 -03:00
Anton Georgiev
2d3c12def3
Merge pull request #14264 from GuiLeme/issue-14014 
Created endpoint to insert file into presentation.
 2022-02-16 15:10:12 -05:00
Ramón Souza
5a4dea6d41 move tooltip component to common folder 2022-02-15 18:07:09 +00:00
Ramón Souza
7145d37066 move toast component to common folder 2022-02-15 17:57:50 +00:00
Ramón Souza
96900ee6a3 move icon component to common folder 2022-02-15 14:51:51 +00:00
Ramón Souza
0377854b98 move fullscreen-button component to common folder 2022-02-15 14:42:02 +00:00
Ramón Souza
64a080e894 move fallback-errors components to common folder 2022-02-15 14:29:38 +00:00
Ramón Souza
9848a2d605 move error-boundary component to common folder 2022-02-15 14:11:03 +00:00
Ramón Souza
246e3b3e8f move button component to common folder 2022-02-14 20:20:50 +00:00
Ramón Souza
b29ee8786e move checkbox component to common folder 2022-02-14 19:26:19 +00:00
Joao Victor
6a6489b97e Fix undesirable scroll 2022-02-11 17:21:46 -03:00
Guilherme Leme
0055e08373 [issue-14014] - Resolved merging conflicts. 2022-02-10 15:41:16 -03:00
Guilherme Leme
f9d97ca562 [issue-14014] / [issue-14313] / [issue-14312] - Fixed and refactored back-end to fit the logic of passing parameters, not only by document with url, but by base64 encoded document too. And refactored front-end. 2022-02-10 15:27:44 -03:00
Ramón Souza
dba04834c7 Merge remote-tracking branch 'upstream/v2.4.x-release' into 2524-feb08 2022-02-09 15:52:42 +00:00
Guilherme Leme
006340489d [issue-14014] - Reverted debug changes in front-end and implemented the new front-end logic to fit the insert api end-point. 2022-02-09 10:37:40 -03:00
Anton Georgiev
b2da811986
Merge pull request #14279 from ramonlsouza/fix-fullscreen-presenter 
fix: fullscreen presentation shortcut in presenter toolbar
 2022-02-07 14:56:49 -05:00
gustavo-em
5f547b31f0 setting session variable to valitate if component will be unmount and dont change state 2022-02-04 18:07:57 -03:00
Ramón Souza
821929a1d7 makes restoreOnUpdate work for moderators 2022-02-04 19:01:53 +00:00
Ramón Souza
d40c055c75 fix fullscreen presentation in presenter toolbar 2022-02-04 13:57:54 +00:00
Guilherme Leme
7650967b2f Resolved merging conflicts. 2022-02-04 08:48:58 -03:00
Guilherme Leme
75f3eab3f8 Resolve merging conflicts 2022-02-03 12:03:26 -03:00
Guilherme Leme
715888584b Front-end changes to fit the removable and downloadable properties. 2022-02-03 11:37:14 -03:00
Ramón Souza
c7fce6518e fix restoreOnUpdate presentation display 2022-02-02 16:01:57 +00:00
Anton Georgiev
5aa4700ff7
Merge pull request #14238 from frankemax/fix-css-focus-button-cropped 
fix(button): add button margin
 2022-01-31 10:03:28 -05:00
Max Franke
ac3ab187d2 fix(button): add button margin 
Add a margin on buttons that are "in focus" to avoid being cut off by other
components
 2022-01-31 11:58:49 -03:00
Ramón Souza
16cd3c4ebb Merge remote-tracking branch 'upstream/v2.4.x-release' into dev-24-0125 2022-01-25 16:56:52 +00:00
Anton Georgiev
116b99e469
Merge pull request #14159 from antonbsa/tests-reorganization-and-fix-selectors 
test: Improves organization, fixes selectors and adds/improves tests
 2022-01-25 08:54:32 -05:00
Joao Victor
6b90f571e7 Add check to avoid undefined value 2022-01-24 14:52:24 -03:00
KDSBrowne
b5f973ee6b add polite SR message for presentation slide change 2022-01-23 17:00:05 +00:00
Ramón Souza
bc9957c13d add background to cameras/presentation when positioned in sidebar-content 2022-01-21 13:24:03 +00:00
Arthurk12
45fcd54ab9 refactor(presentation): upload extra hint 
Adds text hint about the accepted presentation file size limit.
 2022-01-20 17:50:50 +00:00
Anton
7f075be033 fix all test selectors 2022-01-20 10:03:18 -03:00
Ramón Souza
d547ff09f5 remove hardcoded background value 2022-01-17 13:51:14 +00:00
Ramón Souza
f6e65f58c5 merge 2.4 into develop and resolve conflicts - partial 2022-01-12 16:40:45 +00:00
Anton Georgiev
d3fe713101
Merge pull request #13854 from hiroshisuga/patch-51 
Fix (whiteboard): cursor has to travel the last mile
 2021-12-14 10:25:46 -05:00
Anton Georgiev
f06f4def4e
Merge pull request #13906 from KDSBrowne/bbb2.4-13807 
fix(accesibility): Add Region Roles for Screen Reader Navigation
 2021-12-13 09:19:29 -05:00
KDSBrowne
46852d9ae6 Add region roles for screen reader navigation 2021-12-13 03:49:49 +00:00
Anton Georgiev
797fc49633 TEMP 2021-12-09 20:37:05 +00:00
Daniel Schreiber
e052b1f773 fix presentation download 
this fixes the presentation download. This slipped through in commit
c46556e1f6

Sorry for that.
 2021-12-08 22:32:22 +01:00
hiroshisuga
251142b100
Cursor position better updated 2021-12-08 13:54:51 +09:00
Ramón Souza
d11c6b69f8 use prefixed fullscreen event for safari 2021-12-06 12:18:23 +00:00
Anton Georgiev
578332a094
Merge pull request #13731 from schrd/cluster_proxy 
Allow BBB to run behind a proxy the avoid gUM permission queries per node
 2021-12-03 11:32:07 -05:00
Ramón Souza
4798820ff7 remove focus on slideChange events 2021-12-01 12:56:55 +00:00
Ramón Souza
77e645ae22 catch uploader filename error to prevent client crash 2021-11-30 12:18:44 +00:00
Ramón Souza
a077ae0dae prevent undefined length error 2021-11-30 11:45:57 +00:00
Ramón Souza
51b5cc4f3a remove isPresenter methods from services 2021-11-23 16:40:14 +00:00
Ramón Souza
19e2891023 actions bar isPresenter rework 2021-11-23 16:04:45 +00:00
Ramón Souza
cb04e0b74c whiteboard toolbar component isPresenter rework 2021-11-23 14:51:41 +00:00
Ramón Souza
e99920304b presentation uploader isPresenter rework 2021-11-23 14:12:00 +00:00
Ramón Souza
69f7168186 presentation toolbar isPresenter rework 2021-11-23 13:40:23 +00:00
Ramón Souza
df3375016b remove unused function from presentation container 2021-11-23 13:31:01 +00:00
Daniel Schreiber
c46556e1f6 Allow BBB to run behind a proxy the avoid gUM permission queries per node 
The idea is to run a loadbalancer node which maps each BBB node to a
path. That way each user gets only one gUM permission query for a
cluster. The loadbalancer node only serves the html5 client, each BBB
node will serve its own API and handle the websockets for freeswitch and
bbb-webrtc-sfu.

Configuring a cluster setup
===========================

* let bbb-lb.example.com be the loadbalancer node
* let bbb-01.eaxmple.com be a BBB node

Loadbalancer
------------

On the loadbalancer node add an nginx configuration similar to this one
for each BBB node:

```
location /bbb-01/html5client/ {
  proxy_pass https://bbb-01.example.com/bbb-01/html5client/;
  proxy_http_version 1.1;
  proxy_set_header Upgrade $http_upgrade;
  proxy_set_header Connection "Upgrade";
}

```

BBB Node
--------

On the BBB node add the following options to
`/etc/bigbluebutton/bbb-web.properties`:

```
defaultHTML5ClientUrl=https://bbb-lb.example.com/bbb-01/html5client/join
presentationBaseURL=https://bbb-01.example.com/bigbluebutton/presentation
accessControlAllowOrigin=https://bbb-lb.example.com
```

Add the following options to `/etc/bigbluebutton/bbb-html5.yml`:

```
public:
  app:
    basename: '/bbb-01/html5client'
    bbbWebBase: 'https://bbb-01.eaxmple.com/bigbluebutton'
    learningDashboardBase: 'https://bbb-01.eaxmple.com/learning-dashboard'
  media:
    stunTurnServersFetchAddress: 'https://bbb-01.eaxmple.com/bigbluebutton/api/stuns'
    sip_ws_host: 'bbb-01.eaxmple.com'
  presentation:
    uploadEndpoint: 'https://bbb-01.eaxmple.com/bigbluebutton/presentation/upload'
```

Create the following unit file overrides:

* `/etc/systemd/system/bbb-html5-frontend@.service.d/cluster.conf`
* `/etc/systemd/system/bbb-html5-backend@.service.d/cluster.conf`

with the following content:

```
[Service]
Environment=ROOT_URL=https://127.0.0.1/bbb-01/html5client
```

Change the nginx `$bbb_loadbalancer_node` variable to the name of the
load balancer node in `/etc/bigbluebutton/nginx/loadbalancer.nginx` to
allow CORS requests:

```
set $bbb_loadbalancer_node https://bbb-lb.example.com
```

Prepend the mount point of bbb-html5 in all location sections except
from the `location @html5client` section in
`/etc/bigbluebutton/nginx/bbb-html5.nginx`

```
location @html5client {
    ...
}
location /bbb-01/html5client/locales {
    ...
}
```
 2021-11-20 22:13:47 +01:00
Anton Georgiev
542db847ff
Merge pull request #13574 from Tainan404/smooth-reconnection-25 
Improve data structure to not break on reconnections
 2021-11-17 15:55:21 -05:00
Ramón Souza
e5293d9109 only use colorBackground in backgrounds 2021-11-16 17:15:02 +00:00
Ramón Souza
ba004994e7 remove remaining styles 2021-11-11 11:47:39 +00:00
Ramón Souza
b71f312fee Merge remote-tracking branch 'upstream/develop' into styled-components-10 2021-11-08 18:37:34 +00:00
Ramón Souza
1240c5dd2f convert presentation component 2021-11-08 17:28:22 +00:00
Ramón Souza
a445cdafa4 convert presentation uploader component 2021-11-08 17:07:52 +00:00
Ramón Souza
6343c25973 convert presentation toolbar component 2021-11-08 13:09:56 +00:00
Ramón Souza
58d86b60e2 convert presentation placeholder component 2021-11-08 12:35:19 +00:00
Ramón Souza
9fc90683c2 convert presentation close-button component 2021-11-08 12:13:56 +00:00
Ramón Souza
9999639f3f convert presentation download-button component 2021-11-08 12:07:11 +00:00
Ramón Souza
59057744ec convert presentation default-content component 2021-11-08 11:39:17 +00:00
Ramón Souza
96997bcfb4 convert checkbox component 2021-11-05 17:21:35 +00:00
Tainan Felipe
f5eef03f3f Improve data structure to not break on reconnections 2021-11-03 14:37:54 -03:00
Anton Georgiev
c60ef3c179
Merge pull request #13253 from ramonlsouza/PR-11359 
feat: multiple choice poll
 2021-10-26 14:42:29 -04:00
Ramón Souza
f452a5f164 fix start quick poll 2021-10-26 16:38:52 +00:00
Anton Georgiev
1622425cbc Merge branch 'develop' of github.com:bigbluebutton/bigbluebutton into 2.4-into-develop 2021-10-22 19:12:58 +00:00
Ramón Souza
9e71583ec7 restore old minimize presentation button and add a flag to switch 2021-10-14 19:31:47 +00:00
Anton Georgiev
24d672a832 Merge branch 'v2.4.x-release' of github.com:bigbluebutton/bigbluebutton into merge-24-dev 2021-10-14 15:13:17 +00:00
Tainan Felipe
1de8e0779d Add server side reactivity to publications 2021-10-13 15:00:52 -03:00
Ramón Souza
3c0a0135c1 restore presentation fullscreen shortcut 2021-10-07 14:09:05 +00:00
Ramón Souza
e49bcac254 fix presentation toolbar unmount with small window height 2021-10-06 13:20:30 +00:00
Anton Georgiev
5202cd47ca
Merge pull request #13306 from lfzawacki/develop-minimize-all 
feature: Allow external video and screenshare to be minimized just like the presentation area
 2021-10-04 11:45:51 -04:00
Ramon Souza
0e319ccbdd change presentation fullscreen/minimize buttons color 2021-09-29 16:23:58 -03:00
Lucas Fialho Zawacki
d7f3924350 Enable swap layout for screenshare and external video 2021-09-27 21:03:20 +00:00
Lucas Zawacki
0425d8753c Minimize button for presentation, external video and screenshare 2021-09-27 20:16:20 +00:00
Ramon Souza
485943d464 fix presentation toolbar size in focus on video layout 2021-09-27 09:21:21 -03:00
Anton Georgiev
ab845b3078 Merge branch 'v2.4.x-release' of github.com:bigbluebutton/bigbluebutton into merge-24-rc-1-into-dev 2021-09-22 15:28:13 +00:00
zhem0004
c572e69b24
fix: Reimplement presentation.allowDownloadable (#13237) 
* Reimplemented presentation.allowDownloadable

* Reimplemented presentation.allowDownloadable

Co-authored-by: Bohdan Zhemelinskyi <bohdan.Zhemelinskyi@blindsidenetworks.com>
 2021-09-17 16:55:31 -04:00
Anton Georgiev
d175fcf95d
Merge pull request #13082 from antonbsa/test-allow-presentation-download 
test: Presentation - adds test to allow and disallow presentation download and test to remove all presentations
 2021-09-14 09:18:09 -04:00
Ramon Souza
9300b9b382 Merge remote-tracking branch 'upstream/develop' into use-context-selector 2021-09-13 15:41:52 -03:00
Ramon Souza
098826c70a rename layout functions 2021-09-10 17:48:52 -03:00
Ramon Souza
981e707612 add selector to containers, remove old layoutContext + convert base component into function 2021-09-10 14:21:04 -03:00
Ramon Souza
1854911080 add use-context-selector to containers - partial 2021-09-09 17:49:15 -03:00
Anton Barboza
34369b8897 add remove all presentation test 2021-09-08 14:18:01 -03:00
Anton Barboza
c83ac33827 Merge remote-tracking branch 'upstream/v2.4.x-release' into test-allow-presentation-download 2021-09-08 10:31:18 -03:00
KDSBrowne
30735c64a6 update page title with current view 2021-09-04 22:36:48 +00:00
Ramon Souza
084d80f23e remove unused state properties 2021-09-01 08:48:46 -03:00
KDSBrowne
cf57bb5290 update value to key code constant 2021-08-30 00:53:06 +00:00
Anton Georgiev
fb6a1456d4
Merge pull request #13014 from KDSBrowne/bbb-upload-focus-trap 
Restrict Keyboard Access From Elements Behind Upload Modal
 2021-08-27 14:58:20 -04:00
Ramon Souza
e55529142f Merge remote-tracking branch 'upstream/develop' into issue-6803 2021-08-27 15:37:19 -03:00
Ramon Souza
429d1b3e9e fix button position in iPhone + RTL 2021-08-27 15:34:01 -03:00
Joao Siebel
c3751cfef3 Fix recording when there is no presentation 2021-08-26 17:13:05 -03:00
Anton
429329266e add data-test to presentation-download elements 2021-08-26 15:41:41 -03:00
Ramon Souza
1d89c893dc move presentation fullscreen button to top right 2021-08-25 17:31:52 -03:00
Joao Siebel
06b1838777 Merge remote-tracking branch 'upstream/develop' into allow-to-remove-all-presentations 2021-08-24 10:39:07 -03:00
Joao Siebel
f3f9ec19eb Allow presenter to remove all presentations 2021-08-23 18:04:16 -03:00
Ramon Souza
9d4e79f83e only change presentation isDownloadable after confirmation 2021-08-23 10:23:09 -03:00
KDSBrowne
6a65c56c20 restrict keyboard access to upload modal when open 2021-08-17 02:57:37 +00:00
Anton Georgiev
f909c317cd
Merge pull request #12972 from ramonlsouza/issue-12953 
fix: viewing shared screen in full screen mode will break the interface when screen share closes
 2021-08-12 14:16:13 -04:00
Ramon Souza
5c51b67d43 fix presentation position in focus on video layout 2021-08-12 11:08:43 -03:00
Ramon Souza
53d0b8b949 exit fullscreen when component is unmounted 2021-08-11 13:19:24 -03:00
Ramon Souza
c00ac3f18a Merge remote-tracking branch 'upstream/develop' into issue-12880 2021-08-05 13:24:37 -03:00
Vitor Mateus De Almeida
1b18977eac rename all NewLayout.. to Layout.. 2021-08-05 08:03:24 -03:00
Vitor Mateus De Almeida
09082734c9 remove old media, webcam draggable and panel components 2021-08-05 04:26:03 -03:00
Vitor Mateus De Almeida
abf089ae73 remove layout manager legacy 2021-08-05 01:22:07 -03:00
Ramon Souza
523897c2d3 limit camera size based on toolbar size 2021-08-04 11:38:20 -03:00
Ramon Souza
c6f6f02f40 fix presentation toolbar position in small window - partial 2021-08-04 08:42:38 -03:00
Ramon Souza
07a2db6265 Merge remote-tracking branch 'upstream/develop' into rtl-new-layouts 2021-07-27 16:25:15 -03:00
Ramon Souza
d3ed4d6ea6 rtl smart layout 2021-07-26 17:45:03 -03:00
Ramon Souza
ebe65ecef0 set slide size when changing presentation - new lm 2021-07-23 15:33:32 -03:00
Ramon Souza
c689c9ad04 do not display hide presentation button in presentation focus layout 2021-07-16 16:54:23 -03:00
Ramon Souza
43eda61beb set presentation isOpen on toggleSwapLayout 2021-07-16 15:48:48 -03:00
Vitor Mateus De Almeida
f0145e001e Add resizable and draggable in cameras dock 
Remove settings and change resizable context data

Add resizable draggable drop areas in cameras dock
 2021-07-13 04:25:03 -03:00
Ramon Souza
8bf637129b fullscreen camera 2021-07-06 11:05:15 -03:00
Ramon Souza
408b596ed0 remove fullscreen from presentation (context) and add generic fullscreen information 2021-07-05 13:52:25 -03:00
Vitor Mateus De Almeida
3599577463 Fix camera calcs 
Fix camera calcs 2
 2021-06-25 17:57:19 -03:00
Anton Georgiev
0e9f0b04c8
Merge pull request #12667 from ramonlsouza/fullscreen-presentation-new-lm 
feat: fullscreen presentation in new Layout Manager
 2021-06-25 07:59:58 -04:00
Ramon Souza
a466cd11de no hide presentation button in fullscreen mode 2021-06-25 08:25:16 -03:00
Ramon Souza
b7bf014e76 format code 2021-06-24 16:50:46 -03:00
Ramon Souza
fbfe371b40 fix presentation size when user is presenter 2021-06-24 16:46:26 -03:00
Ramon Souza
c0e02d7bfa presentation fullscreen in new layout manager 2021-06-24 15:42:45 -03:00
germanocaumo
2c262483d2 fix(poll): Respect maxCustom property in quick-polls 
More than 5 answers are now of Custom type poll and answers passed directly.
Increase A-I slide options detection
 2021-06-18 14:02:09 +00:00
germanocaumo
349af23f0a Merge branch 'develop' of https://github.com/bigbluebutton/bigbluebutton into anonymous-polls 2021-06-16 21:54:28 +00:00
Anton Georgiev
5ee5ed1970 Merge branch 'v2.3.x-release' of github.com:bigbluebutton/bigbluebutton into merge-june16 2021-06-16 19:54:28 +00:00
Anton Georgiev
6b2e070786
Merge pull request #12565 from ramonlsouza/fix-presentation-upload 
fix: check for presenter status at presentation upload modal
 2021-06-14 17:01:29 -04:00
Anton Georgiev
32eb3b9818
Merge pull request #12585 from vitormateusalmeida/layoutManagerNew 
Add container for presentation
 2021-06-14 16:09:34 -04:00
Arthur B. Grossi
1213f047d4 style(layout): download presentation button 
Add fullscreen presentation button style to download presentation
button
 2021-06-14 14:59:34 -03:00
Vitor Mateus De Almeida
192fbf986b Add condition to size of presentation component 2021-06-14 14:47:12 -03:00
Ramon Souza
8da630da03 fix presentation service isPresenter 2021-06-14 09:56:17 -03:00
Ramon Souza
4ca3d17393 check for presenter status at presentation upload modal 2021-06-11 16:33:15 -03:00
germanocaumo
7bedcb08e5 fix(poll): don't translate user/presenter typed answers 
When the answer is not default (Custom or UserResponse), don't translate the answers.
 2021-06-11 16:55:53 +00:00
Vitor Mateus De Almeida
ba400b2ebd Merge remote-tracking branch 'upstream/develop' into layoutManagerNew 2021-06-09 11:03:34 -03:00
Vitor Mateus De Almeida
f6fc8225f6 Add container for presentation 2021-06-09 10:49:59 -03:00
Anton Georgiev
e01bdf69c5 Merge branch 'v2.3.x-release' of github.com:bigbluebutton/bigbluebutton into june2-merge-into-develop 2021-06-02 18:45:31 +00:00
germanocaumo
c213b88451 refactor(poll): improve poll types code 
this also fixes certain poll type detection for other languages than english,
so that the correct poll type is sent in the events (they were being detected as custom)
 2021-05-26 17:52:55 +00:00
Vitor Mateus De Almeida
42efa722e6 Add presentation update when change layout typeNLM 2021-05-24 15:35:37 -03:00
Vitor Mateus De Almeida
04715230dc Add webcam container and presentation container 2021-05-24 14:05:39 -03:00
Vitor Mateus De Almeida
1326f3f791 Add New Layout Manager 2021-05-17 17:25:07 -03:00
Ramon Souza
0844f54716 fix presentation uploader error 2021-05-12 15:43:45 -03:00
Anton Georgiev
08474877b7
Merge pull request #12319 from Tainan404/issue-12267 
Fix Presentation uploader missing items
 2021-05-10 13:48:38 -04:00
Tainan Felipe
2efd949b16
Update bigbluebutton-html5/imports/ui/components/presentation/presentation-uploader/component.jsx 
Co-authored-by: Anton Georgiev <antobinary@users.noreply.github.com>
 2021-05-07 11:09:30 -03:00
Tainan Felipe
5e249ff47f Add comment 2021-05-07 11:06:03 -03:00
Anton Georgiev
25c323bfc6
Merge pull request #12317 from jfsiebel/prevent-toast-conversion-text-error-overflow 
Fit conversion error message in toast notification
 2021-05-07 10:00:15 -04:00
Tainan Felipe
2e168b8252 Fix Presentation being not shown 2021-05-07 10:52:12 -03:00
Joao Siebel
aaa3a14b30 Remove scroll on toast notification when a conversion error happens. close #12293 2021-05-07 10:12:46 -03:00
Ramon Souza
93d41f3f91 remove unused variables 2021-05-07 08:54:01 -03:00
Joao Siebel
2f89598d2d Merge remote-tracking branch 'upstream/develop' into better-upload-feedback 2021-04-27 17:46:22 -03:00
Joao Siebel
18385c1de1 Add feedback for some upload status 2021-04-27 16:45:14 -03:00
Anton Georgiev
33ad2f1a58
Merge pull request #12086 from ramonlsouza/issue-12042 
Reduce component re-render on containers that use usersContext
 2021-04-22 14:40:50 -04:00
Ramon Souza
75b9261f6f remove unused imports/variables 2021-04-22 13:17:20 -03:00
Ramon Souza
509d9c0936 Merge remote-tracking branch 'upstream/develop' into issue-12042 2021-04-22 08:45:06 -03:00
MrKeksi
9d10478320 increase download button size 
increase download button size
fixes #7684
 2021-04-21 19:36:40 +02:00
Joao Siebel
c5071093d9 Improve feedback to user after a failed file upload 2021-04-20 14:21:12 -03:00
Ramon Souza
d5d1c86c70 remove unused imports 2021-04-20 09:12:22 -03:00
Ramon Souza
40c9d87f63 reduce component re-render on containers that use usersContext 2021-04-19 14:57:55 -03:00
Ramon Souza
56c33ed36d add meetingId to userscontext 2021-04-15 09:12:21 -03:00
Anton Georgiev
3f8d619ef1
Merge pull request #11927 from PhMemmel/order-presentations-alphabetically 
Update order of presentation lists
 2021-04-09 08:48:13 -04:00
Anton Georgiev
5189abb225
Merge pull request #11911 from Tainan404/issue-11795 
Fix client crashing because users object is missing
 2021-04-08 12:30:01 -04:00
Philipp Memmel
c20b8164ef update order of presentation lists 2021-04-07 17:11:17 +02:00
hiroshisuga
ab66434bb0
panelChanged event 2021-04-07 23:44:37 +09:00
Tainan Felipe
e4563defde Fix client crashing because users object is missing 2021-04-06 16:58:11 -03:00
Ramon Souza
3d6314012f localized quick poll answers 2021-04-05 14:50:50 -03:00
hiroshisuga
c6cca4fe15
minimum width of button 2021-04-03 01:14:26 +09:00
hiroshisuga
9a6d76e6e3
no width for confirm button 2021-04-02 11:06:16 +09:00
Anton Georgiev
8adbbe8288
Merge pull request #11841 from ramonlsouza/device-detect 
Change browser detection library to bowser
 2021-04-01 09:52:16 -04:00
Philipp Memmel
48571734c8 fix localization of heading in presentation manager 2021-04-01 11:18:32 +02:00
Ramon Souza
9218262e0a all device info moved to helper 2021-03-31 14:13:36 -03:00
Anton Georgiev
85a84f7cbf
Revert "Change browser detection library from browser-detect to bowser" 2021-03-30 13:16:10 -04:00
Ramon Souza
3fa193005b change browser detection lib to bowser 2021-03-30 09:53:47 -03:00
KDSBrowne
ff7dc18669 remove invalid aria values and roles without proper children 2021-03-29 02:12:58 +00:00
Pedro Beschorner Marin
d90ba5e286 Merge branch '2.3-per-user-wb' into develop 2021-03-16 20:28:39 -03:00
Pedro Beschorner Marin
381c5cb15c Isolated whiteboard access 
Modified the previous implementation of the whiteboard individual access to remove
multiple Collections dependency on this feature. Multi-user whiteboard is now an
array instead of a boolean value and most of the access control can be synchronized
and handled by akka-apps.
 2021-03-16 19:55:25 -03:00
hiroshisuga
190bde3320
Fix slide size problem at fullscreen <-> window-mode transition #2 (#11540) 
Replaces the PR #10604, which has been temporarily fixed a problem in 2.3a2, that is, the slide size gets crazy when turning on and off fullscreen mode. Since #10604 was just a workaround, I tried to fix it in a way making more sense.

### Closes Issue(s)

closes #10459 (already closed by #10604) and #10589

### Motivation

#10604 is fixing the problem by calling "slide change" event, although the slide has not been changed actually. I tried to fix the same problem by adding a "full screen change" event listener in the layout manager, which I think is more elegant.
 2021-03-05 11:01:47 -05:00
Anton Georgiev
7b58f0b269
Merge pull request #11556 from ramonlsouza/quick-poll-fix 
Quick poll improvements
 2021-03-04 15:01:10 -05:00
Ramon Souza
ce5f0c04f3 changes to match issue #8197 tests 2021-03-04 15:00:21 -03:00
Ramon Souza
47a21dfd98 quick poll fix 2021-03-04 13:34:23 -03:00
Ramon Souza
0a1516c36e fix svg width error 2021-03-03 15:59:34 -03:00
Mohamed Amine Ben Salah
2c9d8e4380 updates and adds specifications for polling 2021-03-01 18:47:08 -03:00
KDSBrowne
babaf1b578 Merge branch 'develop' of https://github.com/bigbluebutton/bigbluebutton into 2.3-per-user-wb 2021-02-21 00:04:36 +00:00
Anton Georgiev
e966d6c7b6
Merge pull request #11366 from MaximKhlobystov/updating-poll-ui 
Updated poll UI: question field and typed responses
 2021-02-18 10:32:33 -05:00
Ramon Souza
c88e4e3133 show uploaded slides from other users 2021-02-15 15:23:02 -03:00
Anton Georgiev
39759c7a16
Merge pull request #11298 from ramonlsouza/issue-11270 
Set safe default values for slide position (WIP)
 2021-02-11 12:34:23 -05:00
Maxim Khlobystov
ff4260dc98 Merge branch 'develop' of https://github.com/bigbluebutton/bigbluebutton into updating-poll-ui 2021-02-08 21:41:43 +00:00
Ramon Souza
463694aff9 moved fullscreen pollingContainer to PresentationArea + fix duplicated component in fullscreen 2021-02-08 08:50:47 -03:00
Ramon Souza
06bd75dd9e make sure slidePosition is only used if it exists 2021-02-03 16:38:09 -03:00
Ramon Souza
49ee9821f8 possible fix for #11270 2021-02-03 13:49:14 -03:00
Anton Georgiev
09e6ba8dfd Merge branch 'v2.2.x-release' of github.com:bigbluebutton/bigbluebutton into merge-Jan30 2021-01-29 20:58:05 +00:00
werk21
80af96ff76 9101: Survey: New profile yes/no/abstention 2021-01-24 02:22:40 +01:00
Fred Dixon
27cb9e8a39
Merge pull request #11078 from hiroshisuga/patch-11 
Remove mountModal requirement in presentation uploader
 2021-01-15 22:53:53 -04:00
Fred Dixon
9e7bd44c9b
Merge pull request #10604 from hiroshisuga/patch-8 
Fix slide size problem at fullscreen <-> window-mode transition
 2020-12-30 08:08:38 -04:00
hiroshisuga
4e4d3beb10
Update component.jsx 2020-12-27 10:36:01 +09:00
Anton Georgiev
3930e164e6
Merge branch 'develop' into debug-window 2020-12-08 16:16:24 -05:00
Anton Georgiev
f34826718d include instanceId in resources url 2020-11-30 16:09:35 +00:00
Anton Georgiev
3faabd1821 Merge 2.2.29 and 2.2.30 into 2.3.x 2020-11-24 15:13:09 +00:00
Fred Dixon
97da7d6023
Merge pull request #10704 from KDSBrowne/2.2-upload-modal-error-bound 
Add error boundary to presentation upload modal
 2020-11-06 16:40:50 -05:00
KDSBrowne
76dc9034ee Merge branch 'develop' of https://github.com/bigbluebutton/bigbluebutton into 2.3-per-user-wb 2020-11-02 16:36:59 +00:00
KDSBrowne
7c690ab22c fix presentation downloadable tooltip msg 2020-10-30 13:00:07 +00:00
KDSBrowne
e116396481 add error boundry to presentation upload modal 2020-10-22 13:00:09 +00:00
KDSBrowne
73f890c9d8 Merge branch 'develop' of https://github.com/bigbluebutton/bigbluebutton into 2.3-updated-polling 2020-10-21 16:05:03 +00:00
Joao Siebel
dadca62741 Merge remote-tracking branch 'upstream/develop' into connection-manager 2020-10-13 10:49:12 -03:00
hiroshisuga
28c9ca6484
Update component.jsx 2020-10-07 17:21:18 +09:00
hiroshisuga
e5f6fe77b1
Update component.jsx 2020-10-05 11:26:24 +09:00
KDSBrowne
45c1f7a331 fix starting poll via quick poll btn 2020-10-03 12:42:34 +00:00