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

1059 Commits

Author SHA1 Message Date
Arthurk12
d2b2acbf2d fix(whiteboard): re-adds right click to cancel 
Re-adds cancelling text annotation on right click. To achieve this,
some mechanisms that were previously used to handle live synced annotations
were rescued. So this partially reverts 40b18b0.
 2022-09-01 12:40:14 +00:00
Arthurk12
480925517c fix(whiteboard): text annotations stuck as fake 
Cleans up and modifies the added annotation handler to suit only for text
annotation. As soon as the DRAW_END message is sent, the local fake
annotations are removed and replaced by the complete/not fake annotation.
 2022-09-01 12:40:10 +00:00
KDSBrowne
3277286525 persist patched text changes 2022-08-31 19:01:53 +00:00
Joao Victor
aefc5c6c6a Merge branch 'v2.6.x-release' into issue-15536 2022-08-31 10:47:58 -03:00
Arthurk12
070aa3425f Revert "fix: don't clear text fake annotations" 
This reverts commit 74c4c1c4cc.
Reverting this commit because it causes fake annotations from the text
tool not to be removed. Since the text tool is the only one that
generates fake annotations(because it is the only one that is live
synced), the function to clear fake annotations is directly intended to
clear them.
 2022-08-30 20:08:26 +00:00
Ramón Souza
470f491352
Merge pull request #15583 from germanocaumo/tldraw-viewbox-sync 
fix(tldraw): sync viewed area between presenter/viewers +
 2022-08-30 17:00:14 -03:00
Ramón Souza
e7107f87a7
Merge pull request #15598 from ramonlsouza/merge-2526-aug25 
chore: Merge v2.5.5 into v2.6
 2022-08-29 15:58:53 -03:00
germanocaumo
105ed256c3 fix: tldraw not changing pages correctly 2022-08-29 12:27:17 +00:00
Ramón Souza
62f8ab3cb2 Merge remote-tracking branch 'upstream/v2.6.x-release' into pr-15460-aug26 2022-08-26 14:05:45 -03:00
Ramón Souza
609d43157a Merge tag 'v2.5.5' into merge-2526-aug25 2022-08-25 14:33:44 -03:00
KDSBrowne
45b3166863 Merge branch 'tldraw-viewbox-sync' of https://github.com/germanocaumo/bigbluebutton into tldraw-viewbox-sync 2022-08-24 11:55:38 +00:00
KDSBrowne
c758664651 remove toolbar from non presenter cursor calculation 2022-08-24 11:55:31 +00:00
germanocaumo
61cb5b8ef4 fix(tldraw): fit to width / presenter / slide changing 2022-08-23 18:19:17 +00:00
KDSBrowne
9f7b45b172 hide eraser animation on mobile 2022-08-23 12:08:31 +00:00
KDSBrowne
ab4cb469fb Merge branch 'tldraw-viewbox-sync' of https://github.com/germanocaumo/bigbluebutton into tldraw-viewbox-sync 2022-08-22 19:07:23 +00:00
KDSBrowne
9df18af50f update presentation offset for cursor (mobile) 2022-08-22 19:05:02 +00:00
germanocaumo
0e7c27968e Merge branch 'tldraw-viewbox-sync' of https://github.com/germanocaumo/bigbluebutton into tldraw-viewbox-sync 2022-08-22 18:11:40 +00:00
KDSBrowne
eb7c3dcbc8 update pan tool button after zoom changes 2022-08-22 16:55:44 +00:00
João Victor Nunes
aba9d86904
Merge branch 'v2.6.x-release' into issue-15276 2022-08-22 13:05:25 -03:00
germanocaumo
c948f39392 Merge branch 'v2.6.x-release' of https://github.com/bigbluebutton/bigbluebutton into tldraw-viewbox-sync 2022-08-22 15:47:51 +00:00
germanocaumo
f209fd17c1 Merge branch 'tldraw-viewbox-sync' of https://github.com/germanocaumo/bigbluebutton into tldraw-viewbox-sync 2022-08-22 15:43:04 +00:00
KDSBrowne
1de4b3f644 update cursor position handling | temp hide eraser animation 2022-08-22 14:37:34 +00:00
Ramón Souza
9303c598c1
Merge pull request #15532 from KDSBrowne/bbb-responsive-wb-toolbar 
fix: Make Whiteboard Toolbar Responsive to Smaller Sizes
 2022-08-22 11:33:46 -03:00
KDSBrowne
9c018ee6db restore large toolbar size when view enlarged 2022-08-21 21:38:54 +00:00
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
germanocaumo
99549d880f fix(tldraw): fit-to-width / presenter change view area sync 
- Correctly sync the viewed area when in fit-to-width mode and when the presenter reloades the page or the presenter changes to another user.
 2022-08-18 18:18:02 +00:00
Ramón Souza
81b15ae329
Merge pull request #15518 from JoVictorNunes/issue-15291 
fix: incorrect calculation of number of users in multi user whiteboard
 2022-08-18 10:52:34 -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
KDSBrowne
12a324631f update cursor type when pan enabled 2022-08-15 13:02:56 +00:00
KDSBrowne
26f3e5dc3f add pan button to presentation toolbar 2022-08-14 22:49:39 +00:00
KDSBrowne
df0fc0da15 make whiteboard toolbar responsive to small screens 2022-08-12 19:08:26 +00:00
Joao Victor
8e9ca4b2c8 fix: incorrect calculation of number of users in multi user whiteboard 2022-08-11 15:44:16 -03:00
Joao Victor
60857a0056 fix(tldraw): hide context menu for users who don't have access to whiteboard 2022-08-11 13:38:17 -03:00
KDSBrowne
3ebfdef9bd use api toolbar general position | sync current locale 2022-08-08 22:47:51 +00:00
Joao Victor
74c4c1c4cc fix: don't clear text fake annotations 2022-08-08 17:07:41 -03:00
KDSBrowne
48cc57dbaf move variable definition 2022-08-03 14:30:22 +00:00
KDSBrowne
b66e44a4cb Upgrade tldraw to latest version 2022-08-03 14:19:12 +00:00
Gabriel Porfirio
8198953f30 removing unused imports 2022-07-28 16:50:31 -03:00
KDSBrowne
a485f372f6 fix console error 2022-07-27 18:46:44 +00:00
KDSBrowne
9234dee077 fix viewer wb crash switching to rtl 2022-07-20 19:54:23 +00:00
KDSBrowne
db41932fe7 update render wb condition | add operator 2022-07-20 19:20:46 +00:00
KDSBrowne
21f2a441ee update editable whiteboard component key 2022-07-20 19:03:26 +00:00
KDSBrowne
9d8ce2215d remove key prop 2022-07-20 18:51:50 +00:00
KDSBrowne
fb63975a7e fix viewer WB crash when resizing 2022-07-20 18:50:13 +00:00
KDSBrowne
100bfcfb86 update fullscreen element check 2022-07-19 10:51:59 +00:00
KDSBrowne
ed55d58b01 handle cursor positions for video focus 2022-07-19 03:37:47 +00:00
KDSBrowne
47303757de handle cursor position for fullscreen presentation 2022-07-19 01:23:10 +00:00
Ramon Souza
db5ac1428a Merge tag 'v2.5.3' into merge25-26-jul14 2022-07-15 11:08:02 -03: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
Anton Georgiev
70c084bfdb
Merge pull request #15300 from JoVictorNunes/fix-focus-loss-Jun-30 
fix: disable Tldraw autofocus
 2022-07-13 09:39:06 -04:00
Anton Georgiev
20762cfac6
Merge pull request #15310 from germanocaumo/tldraw-production-fix 
fix(tldraw): fix shapes not persisting in production +
 2022-07-13 09:36:44 -04: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
Ramón Souza
1b03b1fd50
Merge pull request #15301 from KDSBrowne/z-26-rtl-cursor 
Fix RTL Cursor Position on Whiteboard
 2022-07-06 21:40:19 +01:00
KDSBrowne
046518abe5 handle cursor positions for smart layout 2022-07-06 20:03:04 +00:00
KDSBrowne
42acca2124 handle cursor position for all custom layout orientations 2022-07-06 17:17:05 +00:00
KDSBrowne
b075cf822b fix delay minimizing presentation | display default cursor for no MUA 2022-07-05 20:16:55 +00:00
germanocaumo
8cacd96a0c fix(tldraw): fix shapes not persisting in production + 
Tldraw uses the constructor name for session complete names:
80ed0bf27b/packages/tldraw/src/state/TldrawApp.ts (L2916)
So in production they are changed because of js minifier.

I changed the onCommand reactor to be one generic for all session:complete actions.
Also fixed some crashes with grouping and ungrouping shapes, in those cases the order of adding/removing is important because children have a reference to the father (grouping shape).
 2022-07-02 14:16:45 +00:00
Joao Victor
66d3d2c13b fix: clear fake annotations on multi-user whiteboard off 2022-07-01 14:31:14 -03:00
KDSBrowne
438afa7db1 fix RTL cursor position 2022-06-30 16:48:42 +00:00
Joao Victor
ddcaa9590f fix: disable Tldraw autofocus 2022-06-30 13:23:35 -03:00
germanocaumo
c2db91b5f9 Merge branch 'v2.6.x-release' of https://github.com/bigbluebutton/bigbluebutton into tldraw-recording 2022-06-30 14:31:08 +00:00
Ramón Souza
1181b54a55
Merge pull request #15279 from KDSBrowne/2.6-mobile-cursor-fix 
Fix Cursor Not Updating For Mobile
 2022-06-30 14:10:11 +01:00
KDSBrowne
bf62362162 only render cursor label when mutiuser enabled 2022-06-29 20:27:14 +00:00
KDSBrowne
c702cc34a4 remove cursors from wb when multiuser is disabled 2022-06-28 20:13:05 +00:00
KDSBrowne
33e19124c1 disable shape selection for users without multiuser access 2022-06-28 19:16:35 +00:00
KDSBrowne
ee6a3dcc62 fix cursor not updating on mobile 2022-06-28 14:25:43 +00:00
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
Joao Siebel
fa0fd8a054 Add configurable process interval for cursor and annotations 2021-01-20 11:36:40 -03:00
Fazrad Karkhani
bdc3973538
Fix for poll result in RTL languages 2021-01-09 00:37:49 -08:00
hiroshisuga
06ef73b48a
fill property not always required 2020-12-24 21:06:45 +09:00
hiroshisuga
2f29d303f1
Bug fixed 2020-12-24 12:38:10 +09:00
Anton Georgiev
f34826718d include instanceId in resources url 2020-11-30 16:09:35 +00:00
KDSBrowne
bd4a3d2500 fix console errors in safari 2020-11-09 22:40:25 +00: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
hiroshisuga
0203d73061
Update component.jsx 2020-10-28 15:17:47 +09:00
hiroshisuga
70f398b0af
Update component.jsx 2020-10-28 15:09:23 +09:00
hiroshisuga
9efdb6777e
Update component.jsx 2020-10-28 14:57:45 +09:00
hiroshisuga
efa94b222e
Update component.jsx 2020-10-28 14:40:54 +09:00
hiroshisuga
677b26eb73
Update component.jsx 2020-10-28 14:39:33 +09:00
hiroshisuga
f5ac8470bb
Update component.jsx 2020-10-28 14:38:44 +09:00
hiroshisuga
dcf50d4e47
Update component.jsx 2020-10-28 14:37:49 +09:00
Mohamed Amine Ben Salah
bf45dbc7f9 adds visual regressions test with snapshots ready to use 2020-10-27 12:54:55 -03:00
Anton Georgiev
e18d94dd23 resolve media/component issues after 2.2.28 merge 2020-10-21 14:50:06 +00:00
Anton Georgiev
0c7ead1916 Merge branch 'v2.2.x-release' of github.com:bigbluebutton/bigbluebutton into oct16-merge 2020-10-21 14:48:02 +00:00
Joao Siebel
109c18beb0 Improve annotations and cursor streamer logs, also add a type info for some logs in authentication process 
and rollback some attempts to fix multiple leaving end call.
 2020-10-16 10:30:50 -03:00
KDSBrowne
9827664efc fix textArea width / height sent from client 2020-10-09 14:20:22 +00:00
Pedro Beschorner Marin
6b87491796 Check if DOMMatrix exists before cursor coordinate transform 
Cursor coordinates are calculated using the presentation SVG object
DOMMatrix. When getting this matrix, some browsers (Firefox at least)
responds it as null if the svg object does not have a visible area.

This adds a check before trying to transform the cursor coordinates
using the matrix inverse so we avoid calling a method from a null object.
If there isn't a DOMMatrix to be used as reference, returns a simple out of
bounds SVGPoint (-1, -1)
 2020-10-07 15:07:23 -03:00
KDSBrowne
f16dd6f702 Merge branch 'develop' of https://github.com/bigbluebutton/bigbluebutton into 2.3-per-user-wb 2020-09-21 23:41:40 +00:00
Anton Georgiev
d8b185f2b3 Merge branch 'issue-9219' of github.com:Tainan404/bigbluebutton into locales-total 2020-09-09 19:29:18 +00:00
KDSBrowne
77b71a4d1f fix duplicate css variables being loaded (improve imports) 2020-09-01 18:46:13 +00:00
Tainan Felipe
5bfeab289c Merge remote-tracking branch 'upstream/develop' into issue-9219 2020-08-19 10:41:03 -03:00
KDSBrowne
423a5fd1c2 Merge branch 'develop' of https://github.com/bigbluebutton/bigbluebutton into 2.3-per-user-wb 2020-08-17 17:13:36 +00:00
KDSBrowne
e596bfaefd add per user functionality to multi user whiteboard 2020-08-17 17:03:23 +00:00
Anton Georgiev
5be5aed1d9 Merge branch 'v2.2.x-release' of github.com:bigbluebutton/bigbluebutton into merge-2020-08-12 2020-08-12 17:12:58 +00:00
Tainan Felipe
bd6471b664 Remove unsafe lifecycle from all whiteboard related components 2020-08-07 17:21:28 -03:00
KDSBrowne
f409e912b1 add aria-label to whiteboard poll result 2020-07-31 13:20:48 +00:00
Tainan Felipe
e64c0e1c62
Merge branch 'develop' into issue-9219 2020-07-28 13:28:32 -03:00
Anton Georgiev
21b6def708
Revert "Replace unsafe react lifecycle methods" 2020-07-15 15:52:34 -04:00
Anton Georgiev
e48306431a
Merge pull request #9498 from Tainan404/issue-8744 
Replace unsafe react lifecycle methods
 2020-07-14 10:30:37 -04:00
Pedro Beschorner Marin
526f79e8f2 Merge remote-tracking branch 'bigbluebutton/v2.2.x-release' into bigbluebutton/develop 2020-06-30 18:15:18 -03:00
Anton Georgiev
789a7cb581
Merge pull request #9754 from KDSBrowne/issue-9451 
Fix poll annotation error with large presentations
 2020-06-19 13:25:36 -04:00
KDSBrowne
6cf519bfb4 add touch start event handler / update handleMouseDown 2020-06-19 16:37:48 +00:00
Joao Siebel
3e95ed0e4b Merge remote-tracking branch 'upstream/v2.2.x-release' into merge-2.2 2020-06-16 16:40:56 -03:00
KDSBrowne
e23b5c847d close whiteboard toolbar submenu on mousedown 2020-06-03 18:32:39 +00:00
KDSBrowne
dabc2e8213 fix poll annotation error with large presentations 2020-06-01 16:57:46 +00:00
Anton Georgiev
f510fdc484
Merge pull request #9517 from KDSBrowne/2.2-restore-presentation-on-update 
Restore minimized presentation for viewer on (slide or zoom change / pub…
 2020-05-29 13:20:31 -04:00
Tainan Felipe
e1573bded9 Merge remote-tracking branch 'upstream/develop' into issue-8744 2020-05-26 11:44:20 -03:00
Tainan Felipe
aa668e3f91 Merge remote-tracking branch 'upstream/develop' into issue-9219 2020-05-25 17:05:58 -03:00
Tainan Felipe
db8e7fcd39 Update react-intl and add fallback to unsupported languages 2020-05-25 17:00:13 -03:00
Anton Georgiev
c9e996de21 Merge branch 'v2.2.x-release' of github.com:bigbluebutton/bigbluebutton into merge-2.2-into-develop 2020-05-25 17:32:24 +00:00
KDSBrowne
f5d004c322 restore minimized presentation for viewer (slide or zoom change / published poll / added annotation) 2020-05-12 12:58:14 +00:00
Anton Georgiev
21375864fe
Merge pull request #9477 from KDSBrowne/issue-9302 
Localize default poll options before calculating annotation required space
 2020-05-11 14:48:22 -04:00
Anton Georgiev
b203095e07
Merge pull request #9173 from FarzadAkj/develop 
customSvgIcon css class bug fixed for rtl layouts
 2020-05-11 12:11:55 -04:00
Farzad Akbarinezhad
dd16e636ed customSvgIcon css class bug fixed for rtl layouts 
in RTL layout, selecting colors and font thickness parts in whiteboard, will not appear correctly when they expand; one item will be thrown out of the container (overflow).
the following images demonstrate the problems.
adding some additional style to customSvgIcon class in css will fix the bug.

http://up.maralhost.com/do.php?img=359
http://up.maralhost.com/do.php?img=364
 2020-05-11 12:03:17 -04:00
Tainan Felipe
851189f3c1 Merge remote-tracking branch 'upstream/develop' into issue-8744 2020-05-11 11:42:03 -03:00
Tainan Felipe
5b758a7cb9 Replace legacy react lifecycle on text draw listener 2020-05-11 11:36:18 -03:00
Tainan Felipe
44c8cd3f9b Replace legacy react lifecycle on pencil 2020-05-11 10:59:55 -03:00
KDSBrowne
eaccf8364c add outline to poll annotation text 2020-05-11 12:56:53 +00:00
KDSBrowne
41e33d9cda localise default poll options before calculating required annotation space 2020-05-08 18:17:50 +00:00
Tainan Felipe
8e02965e27 Replace legacy react lifecycle on poll anotation 2020-05-07 15:33:37 -03:00
Anton Georgiev
cc79c4b6ae merge 2.2.10 into 2.3 2020-05-05 19:52:44 +00:00
Tainan Felipe
6e43f262da Move unique ids to constructor 2020-05-05 13:33:28 -03:00
KDSBrowne
de7e2780c7 Fix exception in presentation when publishing poll while minimized 2020-04-27 17:25:22 +00:00
Farzad Akbarinezhad
4cb6e6af1b
customSvgIcon css class bug fixed for rtl layouts 
in RTL layout, selecting colors and font thickness parts in whiteboard, will not appear correctly when they expand; one item will be thrown out of the container (overflow).
the following images demonstrate the problems.
adding some additional style to customSvgIcon class in css will fix the bug.

http://up.maralhost.com/do.php?img=359
http://up.maralhost.com/do.php?img=364
 2020-04-21 11:34:16 +04:30
Chad Pilkey
40b18b0662 whiteboard performance improvements 2020-04-08 20:03:56 +00:00
KDSBrowne
50bb820eb7 Fix poll Maximum update depth exceeded error 2020-04-01 18:29:27 +00:00
Anton Georgiev
4b0452d1fd Merge branch 'v2.2.x-release' of github.com:bigbluebutton/bigbluebutton into feb14-merge-2.2-into-master 2020-02-14 21:43:35 +00:00
Tainan Felipe
4503e70051 Remove consoles 2020-01-24 16:44:47 -03:00
Tainan Felipe
d73b28eb06 Workaround to CTM request in svg of the screen 2020-01-23 14:52:16 -03:00
Joao Siebel
f95107e3a0 Remove JSON.parse and JSON.stringfy 2020-01-13 13:43:31 -03:00
Joao Siebel
b6c900ca84 Fix annotations and cursor streamer 
The problem was caused when meteor restarted without reloading the page,
the ddp subscription called a onStop event that set all handlers to undefined
after we set the handlers on the init function.
 2020-01-13 09:34:54 -03:00
KDSBrowne
9b8495ca09 fix whiteboard toolbar not accessible via mouse (after publish / presentation swap) 2019-12-16 14:58:52 +00:00
Anton Georgiev
98f4f731d0
Merge pull request #8235 from jfsiebel/update-annotations-streamer 
Update annotations/cursor streamer logic
 2019-11-19 11:56:49 -05:00
Anton Georgiev
42d640f3e2 Merge branch 'issue7791-add-support-to-new-parameters-name' of github.com:diegobenetti/bigbluebutton into test-7805 2019-11-05 11:59:00 -05:00
Joao Siebel
2443515cef Merge remote-tracking branch 'upstream/master' into update-annotations-streamer 2019-10-31 19:18:23 -03:00
Chad Pilkey
37b5286d3b throttle the pencil updates and increase cursor throttle 2019-10-24 15:25:50 -07:00
Joao Siebel
d0f0d91c01 Update annotations streams logic 2019-10-22 22:26:25 -03:00
Anton Georgiev
4a335a1db6 reduce db probes for getAvailableActions; simplify SaveUsernames 2019-09-06 16:28:02 -04:00
Anton Georgiev
c5856d43c8 moved static code outside of tracker 2019-09-04 14:32:58 -04:00
Anton Georgiev
ea18b09311 add a few more collection lookups "fields" delimiters 2019-08-29 12:26:07 -04:00
Anton Georgiev
cdb03042ee
Merge pull request #7952 from KDSBrowne/issue-7148 
Reduce chance of text Area displaying invisible border
 2019-08-28 15:13:00 -04:00
Chad Pilkey
83c727ac0d make sure the toolbar exists first before animating 2019-08-23 14:13:15 -07:00
KDSBrowne
79035443d3 make textarea border 2px for safari 2019-08-19 16:34:21 +00:00
KDSBrowne
74ac34c407 Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into issue-7148 2019-08-19 13:44:36 +00:00
Anton Georgiev
7ce13856f7
Merge pull request #7888 from vitormateusalmeida/issue-7340 
Change the default tool in multi-user
 2019-08-16 11:31:04 -04:00
Joao Siebel
4278b2b061 Add again handleMouseLeave function 2019-08-15 15:08:03 -03:00
Joao Siebel
ae87fe7e9d Remove handleMouseLeave function 2019-08-15 13:34:23 -03:00
Joao Siebel
5bedda90cb Remove unnecessary bind and revert the call of handleMouseLeave 2019-08-15 10:19:44 -03:00
Joao Siebel
632805c627 Prevent draw blocking buttons on tablets and mobile 
close issue #7904
 2019-08-14 17:28:27 -03:00
Vitor Mateus
dcf1e9986b Change default tool when component mount 
Change default tool when component mount
 2019-08-09 16:47:59 -03:00
KDSBrowne
8df0323bfe reduce the chance of textbox missing a border on render (firefox) 2019-08-09 15:35:41 +00:00
Vitor Mateus
a6ce565826 Change the default tool in multi-user 2019-08-06 10:16:33 -03:00
Chad Pilkey
e69931a0af Merge remote-tracking branch 'upstream/master' into fix-pan-lag 2019-07-25 16:29:52 -07:00
Chad Pilkey
c344a17adb pan/zoom and cursor refactor for better performance 2019-07-25 15:55:25 -07:00
Anton Georgiev
2bf8fb5cca minor optimization using Fields in miniMongo 2019-07-24 17:59:04 +00:00
Diego Benetti
f13239674b Changes other parameters to the new pattern 2019-07-24 14:04:46 -03:00
Anton Georgiev
901987282a
Merge pull request #7756 from vitormateusalmeida/webcams-draggable-refactor 
Webcam draggable refactoring
 2019-07-16 09:53:39 -04:00
Vitor Mateus
fc3f23266b Fix z-index 2019-07-11 10:49:06 -03:00
Joao Siebel
18670fdaf2 Merge remote-tracking branch 'upstream/master' into reconnection-improvement 2019-07-04 15:09:06 -03:00
KDSBrowne
7cc2f551b6 add parentheses to equation 2019-07-04 17:58:38 +00:00
KDSBrowne
2d3f43edf9 use calculation to find max z-index 2019-07-04 17:54:20 +00:00
KDSBrowne
2bf92f921b move comment 2019-07-04 17:48:13 +00:00
KDSBrowne
cd9e89ca88 fix Cannot read property 'focus' of null / lint issues 2019-07-04 17:35:32 +00:00
Anton Georgiev
3fcb95ab44 log structure {logCode, extraInfo}, comment 2019-06-28 21:45:50 +00:00
Joao Siebel
8f0783d34f update variable name 2019-06-26 13:29:34 -03:00
KDSBrowne
d8e4adfff3 fix published poll results in RTL 2019-06-26 12:03:34 +00:00
Joao Siebel
40d460b209 disabled some whiteboard tools 2019-06-24 10:14:14 -03:00
Anton Georgiev
b0cc316fcd set default whiteboard thickness to "1" 2019-06-20 15:13:52 +00:00
Chad Pilkey
e8bbe617ae
Fix the WB triangle colour in RTL mode 2019-06-17 15:11:06 -04:00
Chad Pilkey
f48cff6b25 set default tool to pan and add corner triangle 2019-06-13 15:42:20 -07:00
Chad Pilkey
c7d0bdcdac fix repeatCount usage in SVG animations 2019-06-03 09:55:43 -07:00
Anton Georgiev
72486014cd
Merge pull request #7524 from KDSBrowne/0A-access-10 
Make whiteboard toolbar accessible via keyboard
 2019-05-30 14:50:04 -04:00
KDSBrowne
fb38e2a2fd on open move focus in submenu to currently selected item 2019-05-29 19:11:25 +00:00
KDSBrowne
27c1099c77 allow whiteboard toolbar submenu items to be activated via keyboard 2019-05-27 17:27:58 +00:00
KDSBrowne
b87a33df10 allow whiteboard toolbar items to be activated via keyboard 2019-05-27 16:34:37 +00:00
Anton Georgiev
7b81af5ead
Merge branch 'master' into 02-poll-published-toast 2019-05-24 12:28:10 -04:00
Anton Georgiev
58ed0e4981 eslint whiteboard/annotations/poll/component 2019-05-24 16:18:55 +00:00
Diego Benetti
3998898319 Merge branch 'kert-pr-7498' into issue7461-localize-remaining-labels 2019-05-23 18:13:42 -03:00
KDSBrowne
aa2ec33afb localize default poll answers 2019-05-22 18:00:44 +00:00
KDSBrowne
558e25ec9b fix published poll toast notifications for old polls 2019-05-22 14:44:17 +00:00
Ghazi Triki
1f6326f7fd Change layout direction for RTL languages. 
Update styles for RTL layout.
 2019-05-14 14:17:19 +01:00
Anton Georgiev
c033b638f3
Merge pull request #7420 from KDSBrowne/_summit-fix-whiteboard-toolbar-icon-not-updating 
Fix thickness icon not updating (whiteboard toolbar)
 2019-05-13 16:29:16 -04:00
KDSBrowne
94288cbaf0 fix thickness icon not updating without refresh 2019-05-10 17:40:13 +00:00
KDSBrowne
983af56379 add formatted message 2019-05-08 13:36:40 +00:00
KDSBrowne
8d6c42fbd8 partial implimentation of published poll feedback 2019-05-08 13:24:18 +00:00
KDSBrowne
0e724fb890 Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into 2.2-High-contrast-outline 2019-04-18 14:29:17 +00:00
KDSBrowne
38ba8f8895 add outlines for high contrast themes (windows) 2019-04-08 14:22:22 +00:00
KDSBrowne
f0cf490159 better restrict when spacebar shortcut is activated 2019-04-04 13:55:35 +00:00
Chad Pilkey
b75e579acf
Merge pull request #7062 from riadvice/html5-files-cdn 
Support loading the HTML5 main JS file and its assets from a CDN
 2019-03-29 16:38:01 -04:00
Ghazi Triki
b1e6cff44e Improve CDN CORS rules. 2019-03-29 18:33:23 +01:00
Ghazi Triki
5b87524520 Use the embedded meteor CDN feature. 2019-03-29 16:47:07 +01:00
KDSBrowne
afe128fdb7 add Spacebar shortcut to toggle whiteboard Pan 2019-03-27 17:15:19 +00:00
Ghazi Triki
106058e1dd Support loading the HTML5 main JS file and its assets from a CDN. 2019-03-18 09:57:43 +01:00
KDSBrowne
a2c57796bd fix animations / some whiteboard toolbar icons not rendering 2019-02-28 15:11:36 +00:00
Joao Siebel
9cba56d0f9 fix drawing problem by guaranteeing points order. close #6038 2019-02-13 14:15:09 -02:00
Maxim Khlobystov
b86a990612 Add logCode and build number to log messages 2019-02-01 14:12:06 -05:00
Anton Georgiev
3dda92b006
Set the default draw thickness to 2 
Close #6572
 2019-01-16 14:17:26 -05:00
Vitor Mateus
5a21ae41ef Changed default color in the whiteboard toolbar #5691 2019-01-14 16:11:06 -02:00
KDSBrowne
462f20d9bb Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into html5-packages-upgrade 2018-12-05 20:54:37 +00:00
KDSBrowne
39c75fd449 fix remaining bugs / console errors 2018-12-05 19:31:33 +00:00
Anton Georgiev
5f5a7f00f2 change icon for clearing annotations in whiteboard 2018-11-29 20:35:34 +00:00
KDSBrowne
538e248058 Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into start-poll-01 2018-11-02 21:25:40 +00:00
Anton Georgiev
70ac42f6bb
Merge pull request #6199 from jfsiebel/configurable-whiteboard-tools-improvement 
Configurable whiteboard tools improvement
 2018-11-01 16:01:21 -04:00
João Francisco Siebel
b9aff5a6f1 handle empty tool list. close #6171 2018-10-26 11:17:41 -03:00
KDSBrowne
95bb36df82 Merge remote-tracking branch 'Upstream/master' into start-poll-01 2018-10-25 17:25:26 +00:00
Oswaldo Acauan
41cfdaaf30 Fix colors and sizes 2018-10-25 10:46:31 -02:00
João Francisco Siebel
a42946658f improve toolbar when have only one tool 2018-10-24 13:26:23 -03:00
Oswaldo Acauan
f71d32a464 Move from SCSS variables to CSS custom properties (variables) and add custom parameters for theming/skinning 
WIP

wip

wip

format

wip

Move from SCSS variables to CSS custom properties (variables) and add custom parameters for theming/skinning
 2018-10-23 14:21:58 -02:00
João Francisco Siebel
f936e319de implement configurable whiteboard tools. close #5826 2018-10-19 14:05:56 -03:00
João Francisco Siebel
252bacb917 Add multiUserPenOnly parameter in yml 2018-10-18 14:03:11 -03:00
KDSBrowne
86d48298c6 add ability to publish / stop poll 2018-09-24 22:43:54 +00:00
João Francisco Siebel
a445e0d2e5 make whiteboard tools list configurable 2018-09-21 16:42:39 -03:00
João Francisco Siebel
3c3a5ae59a implement multiUserPenOnly configuration 2018-09-21 13:42:00 -03:00
Tainan Felipe
2d045b415c Put the hand by default in mobile 2018-09-18 11:16:11 -03:00
Tainan Felipe
210dbbbeaf Merge remote-tracking branch 'upstream/master' into zoom-implementation 2018-09-17 15:20:20 -03:00
Tainan Felipe
ab75ffdddd Add pinch and double-tap zoom 2018-09-17 15:02:52 -03:00
Tainan Felipe
0372f736fc Add Double tap zoom and pan navigation 2018-09-12 11:36:04 -03:00
Anton Georgiev
1462810b96 Merge branch 'v2.0.x-release' of github.com:bigbluebutton/bigbluebutton into merge-2.0 2018-09-06 22:06:40 +00:00
Tainan Felipe
cce66b352e Add hand icon 2018-09-05 16:28:10 -03:00
Tainan Felipe
e501b9e5cc Implement pan zoom 2018-09-04 14:37:36 -03:00
Anton Georgiev
8e553ab0c6
Merge pull request #5855 from musickiper/discard-cur-annotation-via-right-click 
Add fuctionality for discard current annotation via right-click
 2018-09-04 11:13:00 -04:00
James Jung
4db30fe741 Delete useless logics, and make codes more readable 2018-08-23 13:07:56 -04:00
James Jung
3dd288c0ca Remove loop inside "addAnnotationToDiscardedList" 2018-08-23 12:35:26 -04:00
James Jung
b0a93e5377 Move the placement of undoAnnotation from service.js to draw-listeners 
Make discardedList be updated on not only the side of the sender but also the side of receiver too
Add logic for preventing the size of discardedList getting bigger unlimitedly
 2018-08-23 11:42:34 -04:00
James Jung
86a0440703 Remove useless and error causing codes 2018-08-16 13:15:12 -04:00
James Jung
bac2854b77 Add extra comments to make code more readable 2018-08-14 16:00:15 -04:00
James Jung
dc71cd0382 Move filter logic from service method to draw-stream listener, and makes code more readable 2018-08-14 14:47:09 -04:00
Tainan Felipe
71bd889446 fix toolbars losing border radius when overlap the presentation 2018-08-14 10:30:46 -03:00
James Jung
3f8a10897a Initialize a list of discarded annotations, filter out discarded annotations inside AnnotationsStreamer added handler 2018-08-13 15:40:47 -04:00
James Jung
d95fff40f1 Remove a global let, improve global variable names' consistency and make codes inside service clean up 2018-08-01 16:15:52 -04:00
Anton Georgiev
6533802573
Merge pull request #5932 from oswaldoacauan/presentation-pods 
Presentation pods support
 2018-08-01 13:49:32 -04:00
Anton Georgiev
e64dbda4ce add check for logClient to handle media calls 2018-08-01 16:06:49 +00:00
James Jung
006ddf64cd Correct variables 2018-07-27 14:35:16 -04:00
James Jung
c73bebbdc3 Change wrong variable names, and make use Meteor setting's value than use literal for checking annotation's status 2018-07-27 11:06:49 -04:00
James Jung
46a382a80a Separate the logic for discarding the current annotation from each draw listener component to the service of whiteboard 2018-07-26 14:06:16 -04:00
Oswaldo Acauan
b7823c406c Merge remote-tracking branch 'upstream/v2.2-dev' into presentation-pods 2018-07-24 17:20:37 -03:00
James Jung
204921e043 Make code more readable, and make clicking the mouse right button not to draw annotation 
Seperate the function 'contextMenuHandler' of drawing listeners into the service for reusability

Call the 'UndoAnnotation' method from Whiteboard-toolbar's service to use inside Whiteboard-overlay's draw listeners,
rather than initializing the same method inside Whiteboard-overlay's service to use

Make drawing annotations using the mouse right button inactive
 2018-07-23 17:25:06 -04:00
James Jung
df17e36462 Change the functionality for discard current annottation via right-click, based on its purpose 
The annotaion can be discarded using the mouse right button, only when it is being drawn
 2018-07-20 16:17:41 -04:00
James Jung
cf96835280 Change the functionality for discard current annottation via right-click, based on its purpose 
The annotaion can be discarded using the mouse right button, only when it is being drawn
 2018-07-20 16:05:24 -04:00
James Jung
03cabb7c80 Change the 'contentMenuHandler' method of every whiteboard-draw-listener component to static 
This is for preventing Lint shows the error which a class method is implemented without using 'this' inside
 2018-07-20 12:05:06 -04:00
James Jung
4e1bba7ba5 Add functionality for discard current annotation via right-click 2018-07-16 17:03:24 -04:00
James Jung
40d16ca520 Add functionality for discard current annotation via right-click 2018-07-16 14:45:19 -04:00
Bobak Oftadeh
c98bd10024 Replaced console.errors with client logger and alterted logger configurations 2018-07-13 12:16:50 -07:00
James Jung
7344d2fc01 Add fuctionality for discard current annotation via right-click 2018-07-11 14:51:40 -04:00
James Jung
26a5522203 Add fuctionality for discard current annotation via right-click 2018-07-11 13:11:54 -04:00
Anton Georgiev
cd6417aa33
Merge pull request #5779 from oswaldoacauan/whiteboard-fixes 
Whiteboard fixes and improvements
 2018-07-03 11:33:35 -04:00
Oswaldo Acauan
c2f590e3fc Fix cursor and shapes listener not working in some areas. Closes #5768 2018-06-29 14:58:31 -03:00
Oswaldo Acauan
3e67501790 Clear optimistic shapes when the presenter/multiwb status change. Fix #5677 2018-06-28 11:27:40 -03:00
Oswaldo Acauan
46a469eb2a Prevent scrolling while drawing on iOS. Related #5672 2018-06-26 11:01:05 -03:00
Oswaldo Acauan
e4b0edefec Fix undo not working for text-tool. Closes #5619 2018-06-26 10:50:19 -03:00
Oswaldo Acauan
d413b2e156 Fix linter errors 2018-06-26 10:38:43 -03:00
Oswaldo Acauan
03a18b85b1 Prevent drawing while disconnected 2018-06-26 10:28:58 -03:00
KDSBrowne
7b739a9163 swap browser / os checks done by deviceInfo in favor of detect-browser 2018-06-11 23:12:43 +00:00
KDSBrowne
73dcf31f24 use noop included in lodash 2018-06-11 20:30:15 +00:00
KDSBrowne
b8e9f325e2 Merge branch '01.rework-edge-support' into xx.add.Edge-support-html5 2018-06-07 21:36:55 +00:00
KDSBrowne
41ecfd72ec adds and impliments react-render-in-browser package 2018-06-07 20:00:29 +00:00
Maxim Khlobystov
80da44bb26
Merge pull request #5594 from oswaldoacauan/streams-cursor-wb 
Whiteboard and Cursor performance update
 2018-05-30 11:42:52 -04:00
Oswaldo Acauan
ec07b4434d Change cursor and annotation to user streams and add optimistic updates 
WIP | Use streams to cursor and optimistic updates

WIP | Use streamss to whiteboard and optimistic updates

WIP | Remove fake delay

Add two way batching (server/client client/server)

Fix null userId exception and remove logs

wip

Add two way batching (server/client client/server) for cursor

Remove message frequency from draw-listeners component since we handle on message publication

Handle clear and undo messages
 2018-05-28 14:46:14 -03:00
Anton Georgiev
b6b93d8903
Merge pull request #5497 from musickiper/absPathToRelPath 
Change abs paths to use baseName config
 2018-05-16 08:51:05 -04:00
KDSBrowne
df1ddc94ee prevent whiteboard textarea's flickering / not appearing in Edge 2018-05-13 17:15:18 -07:00
KDSBrowne
567621e5f4 fix whiteboard-toolbar not displaying color Icon 2018-05-11 11:16:01 -07:00
KDSBrowne
e88fcee8c0 fix whiteboard-toolbar not displaying Drawing Thickness Icon 2018-05-11 11:12:27 -07:00
KDSBrowne
f8e2eb4295 prevent beginElement() breaking Edge browser 2018-05-11 09:26:31 -07:00
James Jung
2d7d513dc1 Initialize the variable for the baseName config inside whiteboard-overlay components to get better to read 2018-05-09 12:16:56 -04:00
James Jung
26271b0f0e Delete styles.scss file which stored images' links for the whiteboard cursor and put the links for the whiteboard cursor inside components 2018-05-08 18:06:31 -04:00
James Jung
583725053c Change some files permission from 755 to 644 2018-05-08 16:05:04 -04:00
James Jung
2e6e8e4418 Add missing settings of the pencil.png url 2018-05-08 14:10:36 -04:00
James Jung
ae9d92ea16 Update absolute paths to use baseName config 2018-05-07 19:15:50 -04:00
Tainan Felipe
ac1e6d4423 hide thickness and color buttons in whiteboard toolbar when is pointer tool 2018-04-27 16:44:33 -03:00
Tainan Felipe
2e76439395 Change hand to pointer icon 2018-04-18 16:32:13 -03:00
Oswaldo Acauan
115bc20b8f Remove wrong console.log 2018-04-16 12:36:09 -03:00
Oswaldo Acauan
dceae48d8c Fix the fit-to-width issue, added a throttle to the resize event and get the presentationWH from the viewBox 2018-04-12 15:45:23 -03:00
Oleksandr Zhurbenko
68aba8e0a2 Ajusted multi-user change to the new message format 2018-04-11 13:50:00 -07:00
Oleksandr Zhurbenko
0c8f1a3bfd Adjusted multi-user for 2.1 2018-04-09 16:18:49 -07:00
Oswaldo Acauan
01348ad4f3 Move the presentation controls to ontop of slide 2018-04-09 17:49:05 -03:00
Oswaldo Acauan
0fd5bf6710 Hide toolbar while mousedown 2018-04-09 17:37:09 -03:00
Oswaldo Acauan
23130319d9 Hide color/thickness for hand action 2018-04-09 17:18:35 -03:00
Oswaldo Acauan
20bf5b5296 Fix warning and pointer-events 2018-04-09 17:06:11 -03:00
Oswaldo Acauan
0510490dd5 Improve presentation/whiteboard controls and fix presentation area sizing 2018-04-04 15:18:46 -03:00
Tainan Felipe Pauli de Almeida
7328d33b6c add disabled label for whiteboard-toolbar. closes #5042 2018-03-29 13:43:41 -03:00
Oleksandr Zhurbenko
bfb41d74c7 Added an extra check to prevent an issue described in #5137 2018-02-12 14:59:05 -08:00
Oleksandr Zhurbenko
946c731471 Fixed pencil rendering during the race condition between clear annotations and pencil's draw_end message 2018-01-22 15:07:29 -08:00
Joao Siebel
0764ae867c Remove old whiteboard toolbar items config 2018-01-11 08:51:37 -02:00
Joao Siebel
0b02d90927 Resolve merge conflicts 2018-01-10 17:22:42 -02:00
Oleksandr Zhurbenko
ce1f40ac9a Updated Meteor to 1.6.0.1 2018-01-07 22:17:18 -08:00
Oleksandr Zhurbenko
962e659378 Switched the components from deprecated method to 2018-01-07 20:44:42 -08:00
Anton Georgiev
830627ea0c
Merge pull request #4831 from OZhurbenko/presenter-functionality-2x 
Improved Whiteboard toolbar's user experience
 2018-01-03 14:47:02 -02:00
Joao Siebel
c975228428 Fix proptype warning message for whiteboard toolbox labels 2017-12-18 08:37:17 -02:00
Oleksandr Zhurbenko
4b344853ff Disabling the Thickness and Colour menu items when the 'hand' tool is selected 
Fixes #4808
 2017-12-15 12:22:41 -08:00
Oleksandr Zhurbenko
b3450a46ff Changed a default tool to Pencil 
Fixes #4807
 2017-12-15 12:10:38 -08:00
Joao Siebel
b6eec76e70 Change event to onMouseUp again and linter code 2017-12-15 15:14:21 -02:00
Joao Siebel
45ec92c230 Merge remote-tracking branch 'upstream/v2.0.x-release' into whiteboard-toolbar-locale 2017-12-14 08:47:45 -02:00
Anton Georgiev
334c80083e
Merge pull request #4753 from jfsiebel/html5-tooltip 
Add tooltip for buttons without label
 2017-12-13 17:13:28 -02:00
Joao Siebel
bf058959eb Remove log and add delay between hover/focus and showing the tooltip 2017-12-08 11:45:25 -02:00
João Francisco Siebel
950eb488a0 Add locale to whiteboard toolbox items 2017-12-08 11:28:02 -02:00
Joao Siebel
b03efc021c Remove unused package and fix whiteboard toolbar submenu tooltip 2017-12-07 14:11:34 -02:00
Oleksandr Zhurbenko
33c190790c Fixed Android detection for the text shape 2017-12-06 12:00:18 -08:00
Oleksandr Zhurbenko
61c5478887 Disabled spellcheck for the text shape and added an android check 
.. so that tap-to-focus text shape workaround for FF 57 and 58 for Android didn't interfere with the desktop versions
 2017-12-05 17:22:24 -08:00
Oleksandr Zhurbenko
3c02dc1811 Added a workaround for a bug with focus in FF 57 and 58 
see https://bugzilla.mozilla.org/show_bug.cgi?id=1409113
 2017-11-23 15:47:36 -08:00
Oleksandr Zhurbenko
866f9308b9 Added support for touch events on iOS devices 2017-11-21 16:51:40 -08:00
Oleksandr Zhurbenko
bd26e17185 Added touch events support for the text shape, except Safari 2017-11-16 15:14:43 -08:00
Oleksandr Zhurbenko
b3061dda91 Adjusted the getTranformedSvgPoint func 2017-11-16 09:51:24 -08:00
Oleksandr Zhurbenko
cc457661ce Prevented wb toolbar from triggering focus on touch events 
To make it work well with the text shape, which always keeps the focus. And we don't want the keyboard to jump if you decide to change the font settings on the fly
 2017-11-15 16:34:50 -08:00
Oleksandr Zhurbenko
1472dbf39e Added touch events support for all common shapes (rectangle, triangle, ellipse, line) 2017-11-09 15:51:09 -08:00
Oleksandr Zhurbenko
450f2b2c89 Added touch events support for pencil 2017-11-08 16:47:29 -08:00
Oleksandr Zhurbenko
015ca3d719 Changed imports and removed 'initializeCursor.js' since it's not needed 2017-10-11 19:00:28 -07:00
Oleksandr Zhurbenko
4d8233fe10 Fix for the pencil Mongo additions 2017-10-09 18:30:29 -07:00
Oleksandr Zhurbenko
ab95c87f48 Fixed wb toolbar console warnings cause by improper props validation 2017-10-03 14:28:44 -07:00
Oleksandr Zhurbenko
f80d0bc083 Linting and moved whiteboard resize events into HoC 
Thus we won't clutter the code with unrelated events and can easily switch to a ResizeObserver when it is implemented by the browsers
 2017-09-25 16:45:44 -07:00
Oleksandr Zhurbenko
8b48dc692e Bug fix for the slide pushing toolbar case in multi-user in firefox 2017-09-23 18:40:42 -07:00
Oleksandr Zhurbenko
e0a7bfc9fa Refactored whiteboard-toolbar 2017-09-22 23:27:55 -07:00
Oleksandr Zhurbenko
4073501a28 Made actions import more clear to read 2017-09-21 17:18:15 -07:00
Oleksandr Zhurbenko
4a4a3d5574 Moved hex_to_int and int_to_hex functions to imports/utils 2017-09-21 16:52:43 -07:00
Oleksandr Zhurbenko
e054358947 Created a whiteboard config and moved static values there 2017-09-21 16:44:32 -07:00
Oleksandr Zhurbenko
a46469557f Minor corrections and improvements based on the #4345 reviews 2017-09-20 14:34:22 -07:00
Oleksandr Zhurbenko
2b10d5c1a7 Fixed based on the review of #4345 2017-09-20 14:05:17 -07:00
Oleksandr Zhurbenko
251bd22738 PR review fixes 2017-09-06 12:36:52 -07:00
Oleksandr Zhurbenko
9ee75331bf Removed an unnecessary rule 2017-09-05 19:02:23 -07:00
Oleksandr Zhurbenko
3014b26439 PR review fixes 2017-09-05 18:36:15 -07:00
Oleksandr Zhurbenko
b12e0b84a9 Using previously saved draw settings for the initial wb toolbar values 2017-09-05 15:55:18 -07:00
Oleksandr Zhurbenko
3c750575cf Fixed font-size normalization for the text-shape 2017-09-05 15:47:13 -07:00
Oleksandr Zhurbenko
2a91c6aa0b Fixed a bug initial cursor/shape coordinates on page zooming 2017-08-31 18:42:00 -07:00
Oleksandr Zhurbenko
28f7f8ad11 Minor fixes and adjustments 2017-08-30 16:12:03 -07:00
Oleksandr Zhurbenko
e4c4f4584d Prevented publishing messages on random clicks for common shapes, and enabled that for pencil 2017-08-30 13:45:47 -07:00
Oleksandr Zhurbenko
f78283a17d Fixes 
Hide wb toolbar when there is no slide; fixed cursor's text clipping; fixed exceptions thrown on 'Clear All' by reactive-annotation container; fixed shapes' thickness scaling on zoom; fixed dimensions' data types sent to akka (it doesn't accept Doubles)
 2017-08-29 18:43:55 -07:00
Oleksandr Zhurbenko
e1cf0ad9d5 Rewrite of the cursor component 2017-08-29 13:58:48 -07:00
Oleksandr Zhurbenko
5d2b215591 Added timers for the pencil and shape draw listeners and fixed a bug with clearing the Annotations collection 2017-08-27 01:12:27 -07:00
Oleksandr Zhurbenko
1a92a7f6a1 Changed annotations' rendering, refactored draw listeners, adjusted permissions for the publishAnnotation 2017-08-25 15:45:06 -07:00
Oleksandr Zhurbenko
f533b25d69 Improved whiteboard-toolbar and fixed linter warnings 2017-08-24 16:47:20 -07:00
Oleksandr Zhurbenko
f3481a7e4b Turned on multi-user drawings 2017-08-23 21:27:41 -07:00
Oleksandr Zhurbenko
321b47abd1 Fixed pencil and text draw listeners for presenters 2017-08-23 20:35:34 -07:00
Oleksandr Zhurbenko
af558ff61d Fixed cursor's rendering including smoothing; adjusted cursor's label 2017-08-22 13:20:12 -07:00
Oleksandr Zhurbenko
aa68421462 Fixed most of lint errors under components/whiteboard 
Except annotation group, which will be changed soon
 2017-08-19 23:32:01 -07:00
Oleksandr Zhurbenko
d5f07a574c Fixed publishShape message for 4 common shapes 
Line, Rectangle, Triangle, Ellipse
 2017-08-18 19:47:31 -07:00
Oleksandr Zhurbenko
643d55938c Merge branch 'bbb-2x-mconf' of https://github.com/bigbluebutton/bigbluebutton into presenter-functionality-2x 2017-08-16 19:24:59 -07:00
Oleksandr Zhurbenko
fa1458c3eb Handling and publishing multi-user mode switch 2017-08-02 18:24:38 -07:00
Klaus
4495c2e897 Move from annotation/ to annotations/ 2017-08-02 16:52:13 -03:00
Klaus
c13155aa6a Move shapes to annotations 2017-07-27 09:35:55 -03:00
Klaus
916713b1df Add safe true, preventing mess with the arrays, and refactored the shapes 2017-07-24 17:32:35 -03:00
Oleksandr Zhurbenko
a03ff03a84 Fixed shape's thickness 2017-07-17 16:41:07 -07:00
Oleksandr Zhurbenko
23263c997b Merge branch 'bbb-2x-mconf' of https://github.com/bigbluebutton/bigbluebutton into presenter-functionality-2x 2017-07-17 16:01:05 -07:00
Oleksandr Zhurbenko
1508ed566c Resolved some of the issues related to the 2.0 switch 2017-07-14 16:20:16 -07:00
Oleksandr Zhurbenko
d7a4cd7a67 Merge branch 'presenter-functionality' of https://github.com/OZhurbenko/bigbluebutton into presenter-functionality-2x 2017-07-14 16:15:26 -07:00
Oleksandr Zhurbenko
d7ec74dcde Added initial PanZoomDrawListener 2017-07-14 16:14:38 -07:00
Oleksandr Zhurbenko
82a1ad2c8a Merge branch 'presenter-functionality' of https://github.com/OZhurbenko/bigbluebutton into presenter-functionality-2x 2017-07-14 15:43:41 -07:00
Klaus
743e128b0f Fix Poll display on html5 2017-07-07 09:18:54 -03:00
Klaus
4138f54f17 Fix Poll display on html5 2017-07-07 09:18:37 -03:00
Klaus
8b6cb71854 Shapes add correct in the collection 2017-06-22 14:24:00 -03:00
Klaus
b3865ef90d Merge remote-tracking branch 'origin/Refactor2x' into SplitRedis 2017-06-20 14:11:19 -03:00
Klaus Klein
c627deca36 Move api to api/1.1 2017-06-19 08:57:32 -03:00
Oleksandr Zhurbenko
f7d1ff0df2 Text shape and bug fixes 
Restructured code, fixed a bug with thickness icon not displayed when switching from Text tool, added textshape container
 2017-06-16 19:32:41 -07:00