Commit Graph

546 Commits

Author SHA1 Message Date
Anton Georgiev
e966d6c7b6
Merge pull request #11366 from MaximKhlobystov/updating-poll-ui
Updated poll UI: question field and typed responses
2021-02-18 10:32:33 -05:00
Ramon Souza
c88e4e3133 show uploaded slides from other users 2021-02-15 15:23:02 -03:00
Anton Georgiev
39759c7a16
Merge pull request #11298 from ramonlsouza/issue-11270
Set safe default values for slide position (WIP)
2021-02-11 12:34:23 -05:00
Maxim Khlobystov
ff4260dc98 Merge branch 'develop' of https://github.com/bigbluebutton/bigbluebutton into updating-poll-ui 2021-02-08 21:41:43 +00:00
Ramon Souza
463694aff9 moved fullscreen pollingContainer to PresentationArea + fix duplicated component in fullscreen 2021-02-08 08:50:47 -03:00
Ramon Souza
06bd75dd9e make sure slidePosition is only used if it exists 2021-02-03 16:38:09 -03:00
Ramon Souza
49ee9821f8 possible fix for #11270 2021-02-03 13:49:14 -03: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
werk21
80af96ff76 9101: Survey: New profile yes/no/abstention 2021-01-24 02:22:40 +01:00
Fred Dixon
27cb9e8a39
Merge pull request #11078 from hiroshisuga/patch-11
Remove mountModal requirement in presentation uploader
2021-01-15 22:53:53 -04:00
Fred Dixon
9e7bd44c9b
Merge pull request #10604 from hiroshisuga/patch-8
Fix slide size problem at fullscreen <-> window-mode transition
2020-12-30 08:08:38 -04:00
hiroshisuga
4e4d3beb10
Update component.jsx 2020-12-27 10:36:01 +09:00
Anton Georgiev
3930e164e6
Merge branch 'develop' into debug-window 2020-12-08 16:16:24 -05:00
Anton Georgiev
f34826718d include instanceId in resources url 2020-11-30 16:09:35 +00:00
Anton Georgiev
3faabd1821 Merge 2.2.29 and 2.2.30 into 2.3.x 2020-11-24 15:13:09 +00:00
Fred Dixon
97da7d6023
Merge pull request #10704 from KDSBrowne/2.2-upload-modal-error-bound
Add error boundary to presentation upload modal
2020-11-06 16:40:50 -05:00
KDSBrowne
7c690ab22c fix presentation downloadable tooltip msg 2020-10-30 13:00:07 +00:00
KDSBrowne
e116396481 add error boundry to presentation upload modal 2020-10-22 13:00:09 +00:00
KDSBrowne
73f890c9d8 Merge branch 'develop' of https://github.com/bigbluebutton/bigbluebutton into 2.3-updated-polling 2020-10-21 16:05:03 +00:00
Joao Siebel
dadca62741 Merge remote-tracking branch 'upstream/develop' into connection-manager 2020-10-13 10:49:12 -03:00
hiroshisuga
28c9ca6484
Update component.jsx 2020-10-07 17:21:18 +09:00
hiroshisuga
e5f6fe77b1
Update component.jsx 2020-10-05 11:26:24 +09:00
KDSBrowne
45c1f7a331 fix starting poll via quick poll btn 2020-10-03 12:42:34 +00:00
Vitor Mateus De Almeida
69eb26f281 Merge remote-tracking branch 'upstream/develop' into debug-window 2020-09-22 09:37:42 -03:00
Joao Siebel
b2adffa4c2 Merge remote-tracking branch 'upstream/develop' into connection-manager 2020-09-18 16:30:20 -03:00
Anton Georgiev
33a71e5f67
Merge pull request #10218 from Tainan404/unsafe-media-and-presentation-components
Remove unsafe lifecycle from all media and presentation components
2020-09-10 15:23:48 -04:00
Anton Georgiev
d8b185f2b3 Merge branch 'issue-9219' of github.com:Tainan404/bigbluebutton into locales-total 2020-09-09 19:29:18 +00:00
Joao Siebel
6e4e0a510a Merge branch 'remove-user-on-exit' into connection-manager 2020-09-08 16:36:01 -03:00
Vitor Mateus De Almeida
1e3c531b76 Enable the auto arrange layout when change the presentation aspect ratio 2020-09-03 20:57:41 -03:00
Anton Georgiev
5922a9890b
Merge pull request #10382 from KDSBrowne/2.3-issue-10372
Fix presentation width of undefined or null
2020-09-02 10:00:53 -04:00
KDSBrowne
fbf277ee76 fix width of undefined or null 2020-09-02 13:30:44 +00:00
KDSBrowne
b33b5f3f01 Merge branch 'develop' of https://github.com/bigbluebutton/bigbluebutton into 2.3-remove-css-variable-duplicates 2020-09-01 21:17:25 +00:00
KDSBrowne
77b71a4d1f fix duplicate css variables being loaded (improve imports) 2020-09-01 18:46:13 +00:00
Anton Georgiev
8cc8474655 Merge branch 'v2.2.x-release' of github.com:bigbluebutton/bigbluebutton into 08-26-merge 2020-08-27 19:09:07 +00:00
KDSBrowne
916b7d7f31 add slide text for screeen reader 2020-08-20 01:48:10 +00:00
Anton Georgiev
b6d71fd66d
Merge branch 'develop' into issue-9219 2020-08-19 16:02:43 -04:00
Joao Siebel
f33bd10640 Remove user from collection when leaves 2020-08-19 13:22:43 -03:00
Tainan Felipe
5bfeab289c Merge remote-tracking branch 'upstream/develop' into issue-9219 2020-08-19 10:41:03 -03:00
Tainan Felipe
73ba3ef2e9
Merge branch 'develop' into issue-9011 2020-08-19 10:14:12 -03: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
KDSBrowne
bb22ab84fc add download link to current presentation toast 2020-08-10 12:51:06 +00:00
Tainan Felipe
cf1d0cedef Remove unsafe lifecycle from all madia and presentation related components 2020-08-07 17:32:46 -03:00
KDSBrowne
7f7e24bfb4 prevent negative values being supplied to svg height / width 2020-07-31 14:19:28 +00:00
Anton Georgiev
570f482d4c
Merge pull request #10144 from vitormateusalmeida/layout-manager-2
Add Layout Context and Layout Manager
2020-07-29 10:00:59 -04:00
Tainan Felipe
e64c0e1c62
Merge branch 'develop' into issue-9219 2020-07-28 13:28:32 -03:00
Anton Georgiev
6a738a43d5
Merge pull request #8464 from KDSBrowne/add-upload-toast
Non-blocking presentation upload
2020-07-28 10:40:41 -04:00
Vitor Mateus De Almeida
ed8b3adb0b Merge remote-tracking branch 'upstream/develop' into layout-manager-2 2020-07-23 16:54:50 -03:00
KDSBrowne
c9215ca14d Merge branch 'develop' of https://github.com/bigbluebutton/bigbluebutton into issue-10072 2020-07-22 22:09:03 +00:00
KDSBrowne
0877045696 fix tooltips not displaying when presentation is fullscreen 2020-07-22 22:08:55 +00:00
KDSBrowne
4373d613ec Merge branch 'develop' of https://github.com/bigbluebutton/bigbluebutton into add-upload-toast 2020-07-22 13:55:28 +00:00