Commit Graph

27232 Commits

Author SHA1 Message Date
Vitor Mateus De Almeida
f57bacd8b7 When disable autoarrange keep layout as is 2020-07-20 16:19:11 -03:00
Vitor Mateus De Almeida
b82587bac0 Fix Inconsistent resize behaviour 2020-07-20 16:18:56 -03:00
Vitor Mateus De Almeida
1a112114f1 Layout doesn't change when pass a slide 2020-07-20 16:18:42 -03:00
Vitor Mateus De Almeida
a4393c0191 fix enable autoarrange doesn't work correctely 2020-07-20 16:18:26 -03:00
Vitor Mateus De Almeida
d6938f1d69 fixing automatically placement 2020-07-20 16:18:06 -03:00
Vitor Mateus De Almeida
ae29ba58c1 Fixes 2020-07-20 16:17:40 -03:00
Vitor Mateus
ecc8f4a056 wip 2020-07-20 16:16:39 -03:00
Vitor Mateus
b93e99b1c3 Fix presentation size 2020-07-20 16:14:54 -03:00
Vitor Mateus
a9037224c7 calculates layout optimization 2020-07-20 16:14:25 -03:00
Vitor Mateus
e2db60e662 WIP Resizable works fine 2020-07-20 16:11:09 -03:00
Vitor Mateus
297154f78a The presentation gets the size from the layout manager 2020-07-20 16:02:53 -03:00
Vitor Mateus
7f095c1cad Create layout context and add a layout manager 2020-07-20 15:48:54 -03:00
Jesus Federico
56403c31a0
enable post_events by default by setting keepEvents=true (#10097) 2020-07-20 08:11:02 -04:00
Jesus Federico
0bbe69b74d
added post_events scripts (example and analytics callback) (#10080)
* added post_events example and analytics callback

* updated dependency
2020-07-17 14:34:57 -04:00
Anton Georgiev
3cc7aa70f2
Merge pull request #10090 from antobinary/meteor-1.10
Update Meteor from 1.9 to 1.10.2
2020-07-17 11:36:47 -04:00
Anton Georgiev
efc13bb175 updated npm packages 2020-07-17 15:32:11 +00:00
Anton Georgiev
0de3889d14 updated Meteor from 1.10.1 to 1.10.2 2020-07-17 15:07:37 +00:00
Anton Georgiev
59ae8e3bbf Merge branch 'develop' of github.com:bigbluebutton/bigbluebutton into develop 2020-07-17 14:53:54 +00:00
Anton Georgiev
4b2fab6f01
Set bbbServerVersion to 2.3-dev 2020-07-16 15:45:25 -04:00
Anton Georgiev
a49485dba7 Merge branch 'develop' of github.com:bigbluebutton/bigbluebutton into develop 2020-07-15 20:12:43 +00:00
Anton Georgiev
819a4ea8fb
Merge pull request #10077 from bigbluebutton/revert-9498-issue-8744
Revert "Replace unsafe react lifecycle methods"
2020-07-15 15:53:36 -04:00
Anton Georgiev
21b6def708
Revert "Replace unsafe react lifecycle methods" 2020-07-15 15:52:34 -04:00
Anton Georgiev
f7ca8423c0
Merge pull request #10075 from bigbluebutton/revert-8729-layout
Revert "Create layout context and add a layout manager"
2020-07-15 12:47:45 -04:00
Anton Georgiev
7535e6fa59
Revert "Create layout context and add a layout manager" 2020-07-15 12:44:59 -04:00
Anton Georgiev
b747f84f44 Merge branch 'update-meteor-1101' of github.com:Tainan404/bigbluebutton into develop 2020-07-14 16:16:35 +00:00
Anton Georgiev
b8611f6c1f
Merge pull request #9958 from daminebenq/fix-breakout-autotest
Fix breakout autotest
2020-07-14 11:20:31 -04:00
Anton Georgiev
7d75843140
Fix a forgotten line left while resolving conflict 2020-07-14 11:19:11 -04:00
Anton Georgiev
6fba72f282
Merge pull request #10061 from KDSBrowne/issue-9986
Auto select default.pdf after deleting the current presentation
2020-07-14 10:36:44 -04:00
Anton Georgiev
4e06ec51c1
Merge pull request #8729 from vitormateusalmeida/layout
Create layout context and add a layout manager
2020-07-14 10:34:11 -04:00
Anton Georgiev
b9b4490d8c
Merge branch 'develop' into layout 2020-07-14 10:32:24 -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
KDSBrowne
f063fedb9c auto select default.pdf if no actual current / new current active on delete 2020-07-14 13:49:00 +00:00
Anton Georgiev
de14c705f4
Merge pull request #10027 from wolbernd/develop
Make List of waiting users scrollable
2020-07-10 11:31:54 -04:00
wolbernd
57eeb43a3b
Make List of waiting users scrollable 2020-07-10 10:08:09 +02:00
Anton Georgiev
4e59f1e881
Merge pull request #10023 from vitormateusalmeida/issue-9970
Drop webcam when join a breakout room by clicking 'Join room'
2020-07-09 16:14:58 -04:00
Vitor Mateus De Almeida
7f7e96ee79 Drop webcam when join a breakout room by clicking 'Join room' 2020-07-09 16:49:42 -03:00
Anton Georgiev
0e2fc99429
Merge pull request #10003 from antobinary/enable-multi-webcams-by-default
Enable multiple webcams and network stats by default
2020-07-07 15:11:23 -04:00
Anton Georgiev
c5e6de2296 Enable multiple webcams and network stats by default 2020-07-07 18:43:46 +00:00
Anton Georgiev
e4e4446633
Merge pull request #9999 from antobinary/merge-2.2-into-2.3-july-6
Merge 2.2.19 into 2.3
2020-07-07 11:22:19 -04:00
Anton Georgiev
b0e1dc8378 Merge branch 'v2.2.x-release' of github.com:bigbluebutton/bigbluebutton into merge-2.2-into-2.3-july-6 2020-07-07 14:35:34 +00:00
Anton Georgiev
420f8bf0a4 Merge branch 'develop' of github.com:bigbluebutton/bigbluebutton into merge-2.2-into-2.3-july-6 2020-07-07 14:13:58 +00:00
Vitor Mateus De Almeida
06329e9442 Fix lodash import 2020-07-06 16:11:37 -03:00
Vitor Mateus De Almeida
880963e0e7 Merge remote-tracking branch 'upstream/develop' into layout 2020-07-06 13:36:38 -03:00
Vitor Mateus De Almeida
fdcfd39f04 Merge remote-tracking branch 'upstream/master' into layout 2020-07-06 12:44:47 -03:00
Anton Georgiev
4321b4c967
Merge pull request #9971 from pedrobmarin/skip-norecord
Skip recording process step for norecord meetings
2020-07-06 11:17:13 -04:00
Vitor Mateus De Almeida
9a08349b36 Fix webcams bug in screenshare 2020-07-06 11:35:11 -03:00
Vitor Mateus De Almeida
cd289a47c3 Fix visual bug 2020-07-06 09:58:50 -03:00
Fred Dixon
7d42aa0ea6
Merge pull request #9578 from znerol-forks/feature/develop/config-support-default-server-name
bbb-conf: respect underscore in nginx server_name
2020-07-05 16:02:52 -04:00
Fred Dixon
a6eda3da91
Merge pull request #9924 from prlanzarin/upstream-2.2-webhooks-timeout
bbb-webhooks: add a timeout configuration to be used on POST requests
2020-07-05 16:01:19 -04:00
Fred Dixon
1da679a9ad
Merge pull request #9923 from kepstin/rec-fixes
Recording bugfixes for presentation format
2020-07-05 16:00:42 -04:00