BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
33,869 Commits 13 Branches 260 Tags 1.1 GiB
9c978e91ee
Commit Graph

532 Commits

Author SHA1 Message Date
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