Commit Graph

643 Commits

Author SHA1 Message Date
KDSBrowne
2d7ef92581 disable hover highlight for background slide image 2022-06-28 14:15:20 +00:00
germanocaumo
853d0dfd9b fix(whiteboard): tldraw recording processing/publishing
Changed the names of tldraw record events to differentiate from before.
Publish tldraw.json file with all shape information during the meeting to be used in playback.
Adapted cursor.xml and panzoom.xml to store tldraw data.
Publish slides svgs to be used by playback's tldraw component (otherwise we have different image sizes in pngs and thus messing the coordinates).
Retro-compatible with old recordings.
2022-06-23 17:04:09 +00:00
Ramón Souza
97f6857fd3
Merge pull request #15189 from KDSBrowne/2.6-disable-fd
fix: Disable File Drop on Whiteboard
2022-06-20 13:19:34 +01: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
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
KDSBrowne
8dac344f43 replace zoom minBound with zoomed state 2022-06-15 19:46:06 +00:00
KDSBrowne
5828ed2149 add comment 2022-06-15 17:55:14 +00:00
KDSBrowne
6546b32585 disable dropping of assets on whiteboard 2022-06-15 17:43:58 +00:00
KDSBrowne
6d4d11a34d fix cursors lock for viewers 2022-06-02 15:00:28 +00:00
germanocaumo
08b3659b68 fix(whiteboard): missing import 2022-06-01 13:47: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
KDSBrowne
f683740a2e allow pan when multiuser enabled 2022-05-30 14:51:08 +00:00
KDSBrowne
f58882ffcc stop rendering curors when they leave the WB area 2022-05-29 16:24:44 +00:00
KDSBrowne
d404bd3e0f disable pan when multiuser access is off 2022-05-29 15:14:39 +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
germanocaumo
0bfda4bc53 fix persist of other tldraw shape operations (including groups and copy/paste) +
fix shape not persisting when other user than the owner changed it
2022-05-20 17:14:32 +00:00
germanocaumo
dc56b969ed fix viewer crash when there is no presentation + some cleanup 2022-05-20 12:12:58 +00:00
germanocaumo
3a156ace07 fix camera zoom bugs and mantain zoom when switching slides 2022-05-19 17:24:47 +00: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
e9208cad16 remove hard coded slide dimensions 2022-05-17 12:19:10 +00:00
KDSBrowne
39dd622cab handle move_to_page event 2022-05-16 19:29:21 +00:00
KDSBrowne
c20e54b95d prevent clients crashing when presenter reloads 2022-05-16 19:04:40 +00:00
Joao Victor
7ff6f8750d [2.5] fix(whiteboard): border-radius of toolbar buttons #15009 2022-05-16 10:20:16 -03:00
KDSBrowne
920d1def89 restore presentation toolbar 2022-05-16 02:35:17 +00:00
KDSBrowne
4478f9d389 add const to annotations variable 2022-05-13 15:41:10 +00:00
KDSBrowne
6cd5006999 add client logger to try / catch 2022-05-13 15:15:44 +00:00
KDSBrowne
fada3284ab fix reported bugs 2022-05-13 14:51:41 +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
germanocaumo
234b2869e5 WIP: tldraw in akka-model & starting cleanup 2022-05-13 02:47:39 +00:00
KDSBrowne
3ee7297d79 add isLocked to background images 2022-05-13 02:43:41 +00:00
KDSBrowne
36b1fccbca handle sending shapes in onCommand instead of onPersist 2022-05-13 02:43:40 +00:00
KDSBrowne
10c8d3759d hack adding pres slide images and page switching 2022-05-13 02:43:40 +00:00
KDSBrowne
00c66cc26e clean up cursor component 2022-05-13 02:21:36 +00:00
KDSBrowne
39e76da995 fix moving linked shape bug | embed cursors with relative position 2022-05-13 02:21:36 +00:00
KDSBrowne
86e7dd52f6 fix shapes overwriting each other 2022-05-13 02:21:36 +00:00
KDSBrowne
5cb29535f7 embed Tldraw into BBB client 2022-05-13 02:21:35 +00:00
Lucas
2db9a1b343
Merge branch 'develop' into develop-bbb 2022-04-26 15:08:43 -03:00
Ramon Souza
76272d8a51 Merge remote-tracking branch 'upstream/v2.5.x-release' into 25-dev-apr19 2022-04-19 11:34:29 -03:00
Joao Victor
62d56eeb00 fix: whiteboard toolbar border-radius 2022-04-19 10:28:02 -03:00
Anton Georgiev
c00b8f5fd9
Merge pull request #14829 from ramonlsouza/issue-6244
feat: Confirm dialog on clear all annotations
2022-04-14 14:55:27 -04:00
Ramon Souza
5b52665cd2 add confirmation modal to clear all annotations whiteboard action 2022-04-14 10:54:53 -03: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
8ab4023eb5
Merge pull request #14783 from frankemax/bbb-darkmode-25
feat(theme): add dark mode
2022-04-12 10:35:31 -04:00
Max Franke
6b05e431dd feat(theme): add dark mode theme 2022-04-08 16:05:29 -03:00
Joao Victor
9b6c43fa2b Use forEach instead of map 2022-04-07 14:06:51 -03:00
Arthurk12
420bd8b526 refactor(whiteboard): text tool updates
Makes the whiteboard text tool send annotation updates.
Partially reverts 40b18b0662.
2022-03-29 11:46:47 -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
246e3b3e8f move button component to common folder 2022-02-14 20:20:50 +00: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
Ramón Souza
115ba187b5 remove unused imports/variables 2022-01-24 13:12:37 +00:00
Anton
7f075be033 fix all test selectors 2022-01-20 10:03:18 -03:00
Anton Georgiev
797fc49633 TEMP 2021-12-09 20:37:05 +00:00
Ramón Souza
1f42751c23 keep original order of poll answers in whiteboard annotation 2021-12-09 14:20:34 +00:00
hiroshisuga
7b92a61cec
Fix typo: "Unset" -> "Unsent" UnsentAnnotations (#13684) 2021-12-02 09:37:31 -05:00
Ramón Souza
cb04e0b74c whiteboard toolbar component isPresenter rework 2021-11-23 14:51:41 +00:00
Ramón Souza
4415598243 remove duplicated isPresenter in whiteboard annotations text component 2021-11-23 12:50:26 +00:00
hiroshisuga
a8e1462744
fix: Fix wrong annotation codes (#13674)
Fix wrong annotation codes #13674
2021-11-22 10:43:02 -05:00
hiroshisuga
d11ac50112
Update component.jsx 2021-11-20 17:48:41 +09:00
hiroshisuga
4e201fa773
No flickering anymore 2021-11-20 17:35:41 +09: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
34923cc6a0 remove whiteboard toolbar styles 2021-11-11 11:34:45 +00:00
Joao Victor
5e82448be3 fixes the publication for user response polls 2021-11-05 11:11:55 -03:00
Tainan Felipe
f5eef03f3f Improve data structure to not break on reconnections 2021-11-03 14:37:54 -03:00
Anton Georgiev
a654f44011
Merge pull request #13623 from ramonlsouza/styled-components-7
refactor: styled-components conversion - partial
2021-11-03 08:44:04 -04:00
Ramón Souza
1c084c6b8f convert whiteboard-toolbar component 2021-11-02 20:05:49 +00:00
Anton Georgiev
13aba985cb
Merge pull request #10737 from hiroshisuga/fillshape
feat: Fill shape in whiteboard
2021-11-02 15:03:22 -04:00
Ramón Souza
e7b282a127 convert toolbar-submenu component 2021-11-02 17:43:42 +00:00
Ramón Souza
d926c40e64 convert toolbar-submenu-item component 2021-11-02 17:27:25 +00:00
Ramón Souza
f5e0a97c3d convert toolbar-menu-item component 2021-11-02 17:11:41 +00:00
Ramón Souza
f6f47bf25a convert whiteboard annotations component 2021-11-02 16:35:54 +00:00
Anton Georgiev
c60ef3c179
Merge pull request #13253 from ramonlsouza/PR-11359
feat: multiple choice poll
2021-10-26 14:42:29 -04: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
1cc066366f Merge remote-tracking branch 'upstream/develop' into PR-11359 2021-10-19 16:41:36 +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
hiroshisuga
7ce8e6859a Fix toolbar item vanish 2021-10-04 18:10:19 +00:00
hiroshisuga
0ee8700bfc
Fix toolbar item vanish 2021-10-03 10:25:30 +09:00
Lucas Fialho Zawacki
d7f3924350 Enable swap layout for screenshare and external video 2021-09-27 21:03:20 +00:00
Ramon Souza
a8541eda6e remove linting 2021-09-17 10:38:10 -03:00
Ramon Souza
0ca1b7896e Merge remote-tracking branch 'upstream/develop' into PR-11359 2021-09-17 09:12:43 -03:00
KDSBrowne
aa3601f5fa add aria region & label to whiteboard toolbar 2021-09-13 14:03:40 +00:00
KDSBrowne
a87a0c8867 add aria-expanded to whiteboard toolbar submenu btns 2021-09-13 13:40:22 +00:00
hiroshisuga
75a14932ef fix bug when a coordinate is zero 2021-06-22 13:23:02 +00:00
germanocaumo
e252012bd5 fix(poll): missed test for polls with > 5 default answers 2021-06-16 23:16:28 +00:00
hiroshisuga
077941db99
update for palm rejection PR 2021-06-13 22:25:39 +09: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
Ramon Souza
7c2a1384e2 remove useless conditional in whiteboard toolbar 2021-05-19 09:07:14 -03:00
hiroshisuga
e0a78ffbac
Merge branch 'develop' into fillshape 2021-05-14 20:57:16 +09:00
Ramon Souza
7a28119bc9 adjust poll annotations 2021-05-06 15:38:01 -03:00
Ramon Souza
5a771b8281 fix toolbar crash 2021-05-05 15:59:16 -03:00
Anton Georgiev
403329c324
Merge pull request #12224 from ramonlsouza/fix-poll-reduced-results
fix: number of votes displayed in poll results annotation
2021-05-04 10:41:52 -04:00
hiroshisuga
35443a2e29
chore: Typo in palm detection (#12236)
* Typo fix
2021-05-02 08:47:48 -04:00
Michael Zinsmeister
5ca831ff86 Merged upstream develop branch 2021-05-01 16:59:20 +02:00
Ramon Souza
7af5b0cea0 fix number of votes in poll results annotation 2021-04-30 13:40:46 -03:00
Ramon Souza
2e82bb2f64 resize whiteboard poll results 2021-04-23 11:24:01 -03:00
Anton Georgiev
651d09cbd0
Merge pull request #11224 from sapsDev/palm-rejection-develop-v2.3
Fix unintetionally drawing while using an active pencil
2021-04-15 13:34:01 -04:00
Ramon Souza
e7366485aa removing unused imports 2021-04-13 08:43:08 -03:00
Pedro Beschorner Marin
4170b9d1ac fix: whiteboard access for multiple presentations
Whiteboard service wasn't considering the current presentation id when
fetching for the current whiteboard id. Calls were always returning
the id of the first slide available. This was effecting the state of the
whiteboard access feedback at the users' list.
2021-04-12 11:06:43 -03:00
KDSBrowne
3d6c8fc194 fix text-area's not opening iOS virtual keyboard 2021-04-08 02:51:49 +00:00
Ramon Souza
98bc3e1cff remove edge specific code in whiteboard toolbar 2021-04-07 16:56:51 -03:00
Ramon Souza
fe53d4a1d8 do not show real font-size in tool button 2021-04-07 13:15:31 -03:00
Anton Georgiev
2dfb9d6fa7
Merge branch 'develop' into multiple-choice-poll 2021-04-01 12:38:44 -04:00
Ramon Souza
05a0d5afbf move browser info to helper + remove unused libs 2021-04-01 08:14:24 -03:00
Anton Georgiev
c9d2a17a4f
Merge branch 'develop' into multiple-choice-poll 2021-03-30 13:23:48 -04:00
Anton Georgiev
85a84f7cbf
Revert "Change browser detection library from browser-detect to bowser" 2021-03-30 13:16:10 -04:00
Anton Georgiev
cf6491adc8
Merge branch 'develop' into multiple-choice-poll 2021-03-30 12:49:35 -04:00
Anton Georgiev
027658ac5c
Merge pull request #11806 from ramonlsouza/mobile-detect
Change browser detection library from browser-detect to bowser
2021-03-30 12:28:13 -04:00
Ramon Souza
3fa193005b change browser detection lib to bowser 2021-03-30 09:53:47 -03:00
Mohamed Amine Ben Salah
cd985a02c2
Add additional user whiteboard access test spec (#11799)
* WIP adding whiteboard special user access test spec

* Adds additional user whiteboard access test spec to whiteboard.obj.js
2021-03-30 06:49:07 -04:00
Anton Georgiev
aae72c0547
Merge branch 'develop' into multiple-choice-poll 2021-03-29 11:54:44 -04:00
Anton Georgiev
7d9abe77a0
Merge pull request #11127 from FarzadKarkhani/patch-2
Fix for poll result in RTL languages
2021-03-26 16:35:33 -04:00
Ramon Souza
84f5ef9133 check+retry sending annotations if userid is not available 2021-03-25 09:47:57 -03:00
Michael Zinsmeister
5fb33d5224 merge upstream develop branch into current 2021-03-23 18:01:11 +01:00
Anton Georgiev
fe58a11249
Merge pull request #11718 from MaximKhlobystov/typed-poll-case-insensitive
Case insensitive typed poll responses grouping
2021-03-23 10:58:15 -04:00
Simon Hirtreiter
07b8946b39 Merge commit develop into multiple-choice-poll 2021-03-23 09:38:45 +01:00
Maxim Khlobystov
5adb3429eb Make typed poll responses grouping case insensitive 2021-03-23 06:30:37 +00:00
Jonathan S
fc367b7641 Mouse input isn't affected by palm rejection. 2021-03-19 12:35:30 +00:00
Jonathan S
87a9386f93 Delete text pointer listener. Textfields aren't affected by palm rejection. 2021-03-19 12:35:30 +00:00
Jonathan S
b5a014eea7 Add icon to new button. 2021-03-19 12:35:30 +00:00
Jonathan Schilling
7313916940 Add browser sniffing.
If a browser version can not handle the pointer events, it becomes detected and that browser uses the mouse event etc.
For these browser is no palm rejection provided. All other browser use the pointer events.
2021-03-19 12:35:29 +00:00
Jonathan Schilling
fc1b09b5ca Palm rejection menu button only appears if the browser supports pointer events. 2021-03-19 12:35:29 +00:00
Jonathan Schilling
a9e971cd60 Add palm rejection mode to pointer event handler. 2021-03-19 12:35:29 +00:00
Jonathan Schilling
a19451a2c4 Create pointer event handler for pencil, shape and text. 2021-03-19 12:35:29 +00:00
Jonathan Schilling
52637c59e0 Prepare whiteboard toolbar for palm rejection:
* add button to the toolbar to switch palm rejection mode
  * add a message for that new button to the locales/en
  * add boolean palmRejection to state of the toolbar
  * save that boolean also to the session storage, so it is ready to use it in the input handler
2021-03-19 12:35:28 +00:00
Pedro Beschorner Marin
92d3300d81 Handle multi-user whiteboard for solo presenter
Adjusts the user interface to keep coherence when activating the multi-user
whiteboard while there is only the presenter in the meeting.
2021-03-18 14:53:11 -03:00
Anton Georgiev
b1bbc3fd52
Merge branch 'develop' into multiple-choice-poll 2021-03-17 16:11:49 -04: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
Michael Z
4d3bda1306
Merge branch 'develop' into multiple-choice-poll 2021-03-16 18:38:48 +01:00
hiroshisuga
cabddc6ddf
Change the color of color-picker icon even when the text tool is selected (#11642) 2021-03-15 14:19:52 -04:00
Michael Zinsmeister
214b236701 Merge with upstream 2021-03-07 15:12:49 +01:00
KDSBrowne
d2c36c1c94 update handleClick condition (fix text-area for FireFox) 2021-02-24 02:05:23 +00: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
KDSBrowne
2f094f7048 skip publishing poll annotation to whiteboard if presentation swapped 2021-02-17 14:15:20 +00:00
Michael Zinsmeister
6ad4828955 Merge remote-tracking branch 'upstream/develop' into multiple-choice-poll 2021-02-11 10:12:34 +01:00
Ramon Souza
672bd3f318 Merge branch 'PR-10217' into develop 2021-02-10 17:55:32 -03:00
Ramon Souza
3652562b63 resolve conflict 2021-02-10 17:35:55 -03:00
Michael Zinsmeister
eaa6f0260c Fix poll results and add locale entries 2021-02-08 10:57:39 +01: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
Anton Georgiev
b2c702417c
Merge pull request #11216 from werk21/9101_add_poll_abstention
9101 add poll abstention
2021-01-27 11:57:15 -05:00
KDSBrowne
47e2f12b74 prevent open textarea blocking dropdown menus 2021-01-26 17:13:18 -05:00
Tainan Felipe
3aa8e115b5
Merge branch 'develop' into unsafe-whiteboard-components 2021-01-25 17:36:12 -03:00
werk21
80af96ff76 9101: Survey: New profile yes/no/abstention 2021-01-24 02:22:40 +01:00
KDSBrowne
a76b740ffe prevent open textarea blocking dropdown menus 2021-01-22 21:42:45 +00:00