Commit Graph

986 Commits

Author SHA1 Message Date
Ramón Souza
4344dbbbd5 remove unused fields in whiteboard queries 2023-10-10 09:14:19 -03:00
Ramón Souza
b298aecca9 add new columns to query 2023-10-03 09:08:12 -03:00
Ramón Souza
7b0657e195 add new presentation fields, poll info and multi user info 2023-10-02 16:16:46 -03:00
Ramón Souza
10087cac3c fix warnings 2023-09-27 23:26:30 -03:00
Ramón Souza
a2744f0bcc use stream for new shapes 2023-09-27 23:15:33 -03:00
Ramón Souza
5da60f6063 get cursor data from graphql 2023-09-27 19:17:04 -03:00
Ramón Souza
56a94bdae4 get annotation data from graphql 2023-09-27 17:42:47 -03:00
Gustavo Trott
071eee5c77
Update bigbluebutton-html5/imports/ui/components/whiteboard/component.jsx
Co-authored-by: Anton Georgiev <antobinary@users.noreply.github.com>
2023-09-11 14:49:14 -03:00
Gustavo Trott
9da3543bc3 Resolve conflicts 2023-09-11 11:25:56 -03:00
Ramón Souza
809ba9d51c
fix: restore broken files (#18723)
* restore package lock

* fix whiteboard service error

* fix userlist

* fix whiteboard

* fix chat list item state

* restore user-list participants list item

* Add merge-branches step

* Add merge-branches step to code-validation

* fix message list

---------

Co-authored-by: Tiago Jacobs <tiago.jacobs@gmail.com>
2023-09-07 14:58:06 -03:00
Anton Georgiev
7b271c97a1 chore: Merge 2.6.14 into v2.7.x-release 2023-09-06 14:33:15 -04:00
André Castro
81311db9a3
Fix: User list, Participants, Pist item, User actions, Skeleton, User title, Option drop down, Use shortcuts. (#18676)
* Fix: Ts fixes in user list participants, list item and user actions

* Aditonal fixes
2023-09-06 11:24:09 -03:00
Anton Georgiev
bf18937efa
Merge pull request #18653 from KDSBrowne/bbb-18645
fix: Mouse Wheel Zoom Disrupting Slide Position
2023-08-29 14:46:08 -04:00
KDSBrowne
87a2f698a7 handle zoom percent value being lost on minimize + restore 2023-08-29 14:29:11 +00:00
KDSBrowne
4e8965b218 improve tldraw style menu a11y 2023-08-27 20:06:26 +00:00
KDSBrowne
a381391968 update toolbar zoom value on slide change 2023-08-27 19:19:04 +00:00
KDSBrowne
7cb9764267 fix wheel zoom breaking slide position 2023-08-27 18:45:37 +00:00
Anton Georgiev
1186db7712 Merge remote-tracking branch 'bbb/v2.6.x-release' into aug22merge 2023-08-24 15:05:20 -04:00
KDSBrowne
c321eca70f fix presentation jerks while panning 2023-08-20 02:33:40 +00:00
KDSBrowne
901d9ac5ac add whiteboard options menu dropdown to autohide elements 2023-08-16 14:36:59 +00:00
KDSBrowne
822aabe6d1 fix: Move Presentation Option Dropdown To The Left Side (#18538)
* prevent duplication of presentation menu dropdown when visible

* move presentation options dropdown to the left (out of tldraw UI)

* adjust style menu UI in RTL
2023-08-11 17:13:33 -03:00
KDSBrowne
af16df385c
fix: Move Presentation Option Dropdown To The Left Side (#18538)
* prevent duplication of presentation menu dropdown when visible

* move presentation options dropdown to the left (out of tldraw UI)

* adjust style menu UI in RTL
2023-08-11 17:10:16 -03:00
Ramón Souza
866c40f84f Merge remote-tracking branch 'upstream/v2.6.x-release' into 2627-aug10 2023-08-10 11:49:01 -03:00
KDSBrowne
ea9c687b07 prevent zooming out at 100% 2023-08-08 17:32:07 +00:00
KDSBrowne
dca7fe1997 fix slide positon when zooming out after pan (presenter) 2023-08-03 20:30:23 +00:00
Ramón Souza
c15d1a352a undo auto lint 2023-08-01 11:08:27 -03:00
Ramón Souza
6b34cd38c1 replace double quotes 2023-08-01 11:01:27 -03:00
KDSBrowne
70a8267284 inject presentation options btn into tldraw toolbar | lint issues 2023-08-01 02:45:13 +00:00
Anton Georgiev
6b76d9aa66 Merge remote-tracking branch 'bbb/v2.6.x-release' into merge-july-21 2023-07-21 16:24:45 -04:00
KDSBrowne
937d18b192 improve style menu color contrast in dark mode 2023-07-15 15:40:27 +00:00
Anton Georgiev
042bacc7c1 Merge remote-tracking branch 'bbb/v2.7.x-release' into merge-july12 2023-07-12 18:53:12 -04:00
Anton Georgiev
cd9f93be44 Merge remote-tracking branch 'bbb/v2.6.x-release' into merge-july12 2023-07-12 15:59:46 -04:00
KDSBrowne
e97427a9aa add resize event when whiteboard mounts 2023-07-11 16:17:03 +00:00
Gabriel Porfirio
b71a6f3f66 small changes 2023-07-05 10:05:57 -03:00
Gabriel Porfirio
a1e14131af refactoring and adding two tests for lock viewers 2023-07-04 15:01:19 -03:00
KDSBrowne
3c1b50c99a fix whiteboard crash when switching presentations with zoomed slide 2023-07-03 16:03:38 +00:00
Ramón Souza
cc5c6cf94f fix force panning 2023-06-22 09:53:32 -03:00
Anton Georgiev
cbedeef4e7
Merge pull request #18189 from ramonlsouza/tp27a2-2
fix: presenter permission for poll results annotation
2023-06-21 14:26:15 -04:00
Ramón Souza
0f4f4e29ff reset slide position if zoom is 100% 2023-06-21 09:46:07 -03:00
Ramón Souza
fc38cb4d95 fix presenter permission for poll results 2023-06-20 13:21:32 -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
Ramón Souza
bb88dae48f
Merge pull request #18104 from KDSBrowne/bbb-18026
fix: Preserve Canvas Position On Slide Change
2023-06-08 17:27:23 -03:00
Ramón Souza
f72f84106a
Merge pull request #18106 from hiroshisuga/dev2.6_pointerSize
feat(config): Configurable presentation pointer size
2023-06-08 09:19:27 -03:00
hiroshisuga
a6d353a7b1
Update component.jsx 2023-06-07 22:46:47 +09:00
KDSBrowne
e138d17b4f preserve canvas position on slide change 2023-06-07 05:12:07 +00:00
Ramón Souza
dd49ebfb8a fix edit shape 2023-06-06 09:11:58 -03:00
Ramón Souza
4686f856a6 client side checks 2023-06-06 08:57:36 -03:00
Ramón Souza
baf3690f5a fix dock param 2023-06-06 08:56:05 -03:00
Anton Georgiev
748c7a4a0b Merge branch 'v2.6.x-release' of github.com:bigbluebutton/bigbluebutton into june227 2023-06-02 09:45:34 -04:00
Anton Georgiev
f6d2ed10f3
Merge pull request #18042 from ramonlsouza/issue-18039
fix: Viewer gets blank presentation after minimize/restore
2023-05-30 14:55:41 -04:00
Ramón Souza
c8cd7f3a33 change checks 2023-05-30 10:18:11 -03:00
Ramón Souza
d9a18a9e14 add inline comments 2023-05-30 09:54:35 -03:00
Ramón Souza
6b747ccc9e fix blank presentation after minimizing 2023-05-30 09:39:31 -03:00
KDSBrowne
4e701201c5 update whiteboard toolbar responsive size to fix overlap 2023-05-29 18:03:39 +00:00
KDSBrowne
07c7e2c66e fix setting tldraw dock position 2023-05-26 18:39:09 +00: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
Ramón Souza
60713e6f54 fix slide render issue in firefox 2023-05-24 14:36:58 -03:00
GuiLeme
1b26302745 [issue-17531] - merge upstream/v2.7.x-release 2023-05-16 15:30:15 -03:00
Ramón Souza
40c826b127 preserve font settings on page change 2023-05-16 10:41:24 -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
André Castro
e9ae302d54
Making editing possible to presenter 2023-05-12 11:15:41 -03:00
GuiLeme
4c2806a018 [issue-17531] - changes in review and ES-lint fixes 2023-05-11 18:06:48 -03:00
KDSBrowne
eb1f5f5935 update to react 18 2023-05-11 16:16:10 +00:00
Scroody
cdfa38ad85 Change of approach 2023-05-09 15:51:35 -03:00
Scroody
46b9cfa1e2 Id correction 2023-05-08 16:03:24 -03:00
Scroody
d0b73e9c0b Fix: editable polls. 2023-05-08 15:50:43 -03:00
Anton Georgiev
5f0686697a
Merge pull request #17792 from Scroody/I-17741
fix: Default cursor not appearing when entering meeting.
2023-05-04 10:38:31 -04:00
Ramón Souza
c3ad0e7727 fix cursor for multi-user whiteboard 2023-05-04 09:20:36 -03:00
GuiLeme
90078aedc7 [issue-17531] - resolve conflicts with 2.7 2023-05-04 08:56:27 -03:00
GuiLeme
f650ade561 [issue-17531] - prevent user from exporting annotations when there is no annotation 2023-05-04 08:48:32 -03:00
Anton Georgiev
80079bd3bf
Merge pull request #17798 from Scroody/meteor-migration
fix: Meteor migration async annotation tweaks
2023-05-03 15:12:12 -04:00
Scroody
ab8e8b9ddb Changes to annotations async 2023-05-03 13:56:47 -03:00
Scroody
1a75eb884e Tweeks to annotations async 2023-05-03 13:53:28 -03:00
Scroody
85669f0038 Fix: Default cursor not appearing when entering meeting. 2023-05-02 15:32:10 -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
KDSBrowne
82c946233f
Update bigbluebutton-html5/imports/ui/components/whiteboard/cursors/component.jsx
Co-authored-by: Anton Georgiev <antobinary@users.noreply.github.com>
2023-04-20 16:14:42 -04:00
KDSBrowne
8ee76b6b3e restore chat text selection | disable loupe in ipad while writing on canvas 2023-04-20 18:13:45 +00:00
KDSBrowne
65ac2b6d55 patch auto hidden tools to stay invisible on page change 2023-04-18 20:56:18 +00:00
Ramón Souza
2c8f357977 keep whiteboard toolbar hidden on resize / slide change 2023-04-18 15:03:22 -03:00
KDSBrowne
3a6fde4fd0 disable toolbar autohide animations based on app settings 2023-04-14 15:27:37 +00:00
KDSBrowne
d0d3862708 Merge branch 'v2.6.x-release' of https://github.com/bigbluebutton/bigbluebutton into bbb-hover-tools 2023-04-13 17:45:39 +00:00
André Castro
e00a258d0d
Merge branch 'v2.6.x-release' into fix-warnings-on-create 2023-04-13 11:27:50 -03:00
Scroody
100e96bb99 panSelected added back to styles.js 2023-04-13 11:20:32 -03:00
Scroody
416656087a panSelected now passed as styleProp 2023-04-13 11:13:20 -03:00
KDSBrowne
628f001de6 handle update when userlist is resized 2023-04-12 18:36:13 +00:00
KDSBrowne
b9c04ad319 add presentationAreaHeight & presentationAreaWidth to editable wb key | remove throttle func 2023-04-12 17:03:54 +00:00
Ramón Souza
6a06f994a9
Merge branch 'v2.6.x-release' into meteor-migration 2023-04-12 11:03:13 -03:00
Ramón Souza
fb308f0a60
Merge pull request #17397 from hiroshisuga/dev2.6.1_tooltip
[2.6 fix] Show the pan tool tip at the same timing and position as other tools
2023-04-11 13:18:18 -03:00
Scroody
69f39da665 Fix: Poll results not appearing. 2023-04-10 11:17:35 -03:00
Scroody
958170bf8a Fix: Warnings when creating new meetings solved. 2023-04-06 16:22:21 -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
Ramón Souza
cd7fc0b11f
Merge pull request #17392 from KDSBrowne/bbb-17164
fix: Preserve Tool & Style Settings On Page Change
2023-04-06 09:09:51 -03:00
Anton Georgiev
173ca01519
Merge pull request #17344 from KDSBrowne/bbb-17331
fix: Move Setting isForcePanning To Patch Event
2023-04-05 15:16:29 -04:00
Ramón Souza
7438f100fe remove new instances of lodash methods 2023-04-05 09:44:47 -03: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
hiroshisuga
b3e6cf0c78
Fix a bug
Clicking the presentation with the pan tool selected grayed the presentation.
2023-04-04 17:40:21 +09:00
hiroshisuga
5bc2976328
lower case to avoid warning 2023-04-04 12:08:35 +09:00
hiroshisuga
828f692d7b
add two props to pan injector 2023-04-03 17:09:53 +09:00
hiroshisuga
d873156ed8
Update styles.js 2023-04-03 00:30:22 +09:00
hiroshisuga
2a31b1e0ee
Update styles.js 2023-04-03 00:13:44 +09:00
hiroshisuga
5be3e2ef1c
Update component.jsx 2023-04-02 23:42:12 +09:00
hiroshisuga
476c31a912
Update component.jsx 2023-04-02 23:39:41 +09:00
hiroshisuga
8b92b444ca
Update styles.js 2023-04-02 23:38:32 +09:00
KDSBrowne
a0f6bfcff2 fix the need to double click on style items 2023-04-01 21:05:27 +00:00
KDSBrowne
da66eeccc4 Merge branch 'v2.6.x-release' of https://github.com/bigbluebutton/bigbluebutton into bbb-17164 2023-04-01 20:22:50 +00:00
KDSBrowne
9abc00bcbc preserve tool and style setting on page change 2023-04-01 20:18:03 +00:00
Anton Georgiev
eecde552ce Merge branch 'v2.6.x-release' of github.com:bigbluebutton/bigbluebutton into mar-30-1 2023-03-30 08:47:07 -04:00
Ramón Souza
671d9a589e
Merge branch 'v2.6.x-release' into I-17081 2023-03-30 08:58:58 -03:00
imdt
573c8a47a9 Fixed: another bug cause by undo related to the one solved initial PR. 2023-03-29 16:30:32 -03:00
Ramón Souza
ab8d9214af fix empty slide on presentation change 2023-03-29 09:35:10 -03:00
KDSBrowne
8af51216fb move setting isForcePanning to patch event 2023-03-28 16:48:25 +00:00
Ramón Souza
22ce3af864
Merge pull request #17322 from ramonlsouza/issue-17022
fix(whiteboard): Bug while panning the slide by pressing the scroll mouse button or spacebar
2023-03-28 10:25:24 -03:00
Ramón Souza
1fcad3e2f3
Merge pull request #17325 from KDSBrowne/bbb-16946
fix: Update Style Menu Position On Iphone
2023-03-28 09:41:42 -03:00
Anton Georgiev
f31378ceee
Merge pull request #17163 from ramonlsouza/meteor-tests
refactor: migrate Meteor backend to new async api
2023-03-27 15:07:00 -04:00
KDSBrowne
481582cbbd add missing isIphone value 2023-03-27 15:45:16 +00:00
KDSBrowne
fc001edd51 update style menu position on iphone 2023-03-27 15:33:10 +00:00
Ramón Souza
5cd5c14c3d do not display grab cursor if the user is not presenter 2023-03-27 11:32:43 -03:00
Ramón Souza
b3754570ed fix force panning 2023-03-27 10:38:05 -03:00
Ramón Souza
fdf9b1a7cc fix drag presentation after rotating shape 2023-03-27 09:01:59 -03:00
KDSBrowne
72adc96dbe add autohide option for whitboard toolbars 2023-03-26 22:08:09 +00:00
André Castro
97749719b6 Fix: Undo bug returning to slide '0'. 2023-03-22 18:00:19 +00:00
Tainan Felipe
77fc5d4067 Refactor: Migrate annotations for the Meteor 3.0 api 2023-03-20 16:16:52 -03:00
Ramón Souza
3b849a9600 fix poll results size on firefox 2023-03-17 14:51:39 -03:00
Ramón Souza
f4bd2e8bef
Merge pull request #17039 from ramonlsouza/issue-16682
fix: Poll results are difficult to read and not scaled to fit slide
2023-03-17 08:41:01 -03:00
Ramón Souza
dcc9e4fb64 add links to tldraw functions 2023-03-17 08:40:24 -03:00
Ramón Souza
1cc60fda31 adjust size calculation, preload font 2023-03-16 15:55:56 -03:00
Ramón Souza
5d0b1c842f handle select all shortcut in whiteboard 2023-03-15 11:39:33 -03:00
Ramón Souza
cc4f7a9f0b
Merge pull request #17018 from KDSBrowne/bbb-16379
Zoom By Mouse Wheel Only Operation
2023-03-14 17:21:43 -03:00
Ramón Souza
fa1ad677d6 add border and formatting to poll results 2023-03-14 15:16:21 -03:00
KDSBrowne
5fe6a9a0a9 add query for canvas element 2023-03-13 17:22:38 +00:00
KDSBrowne
53cc7c48f3 intercept wheel event and force ctrl key for zooming 2023-03-13 16:16:37 +00:00
Ramón Souza
4a6c10a3dd fix whiteboard snapshot 2023-03-13 09:17:14 -03:00
KDSBrowne
e577d0a8f7 remove disabled from pan tool 2023-03-11 17:11:48 +00:00
KDSBrowne
8eba308f36 add crosshair cursor for arrow and eraser tool 2023-03-11 16:09:30 +00:00
germanocaumo
a0ef1957c6 fix(pantool): prop type warning 2023-03-10 12:36:54 +00:00
germanocaumo
d09f2681d9 refactor(html5): presentation/whiteboard/cursor code cleanup and linting 2023-03-10 11:30:46 +00:00
Ramón Souza
6970fef004
Merge pull request #16962 from germanocaumo/cursor-fixes
fix(tldraw): cursor fixes
2023-03-10 08:04:31 -03:00
germanocaumo
a3f8147b42 fix(cursor): remove duplicate code 2023-03-09 23:10:18 +00:00
Ramón Souza
9a60bdcd06
Merge pull request #16971 from KDSBrowne/bbb-16959
fix: Stop Tool Lock Being Reset on Updates
2023-03-09 10:47:36 -03:00
KDSBrowne
c6379443cc
update isToolLocked initial value 2023-03-09 08:42:05 -05:00
KDSBrowne
47e7bda1a9 stop tool lock being reset on updates 2023-03-08 20:41:25 +00:00
germanocaumo
8aa15ef861 fix(cursor): send cursor position disabled on unmount
This fixes the cursors staying visible in the recording after the multiuser was disabled.
Also stop sending some unnecessary end events.
2023-03-08 16:39:53 +00:00
Ramón Souza
8ee8a5508f fix whiteboard crash when adding a new presentation 2023-03-08 10:01:18 -03:00
Anton Georgiev
8e640a7918 fix: avoid wb crash when switching presentation 2023-03-07 16:11:40 -05:00
germanocaumo
c1810360ef fix(cursor): improve cursor position for others
Cursor position was desynced after the presenter zoomed with ctrl+scroll, also fixes the last position of the cursor not being sent sometimes.
Move the throttle to the service call so it is considered in all cases (and there was already a throttle there).
2023-03-07 19:03:07 +00:00
hiroshisuga
20325de995
typo 2023-03-07 13:29:00 +09:00
KDSBrowne
95fd2e3d3e fix moving a group of objects | add select cursor 2023-03-05 23:20:56 +00:00
Ramón Souza
50000ad806
Merge pull request #16851 from KDSBrowne/bbb-pan-fixes
fix: Prevent Lines Being Drawn While Panning | Style Updates
2023-03-02 17:05:19 -03:00
Anton Georgiev
932f5ecf71
Merge pull request #16842 from ramonlsouza/issue-16818
fix: Deleting the target object for an arrow crashes the presentation area
2023-03-02 13:25:38 -05:00