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
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
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
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