Tainan Felipe
|
e1573bded9
|
Merge remote-tracking branch 'upstream/develop' into issue-8744
|
2020-05-26 11:44:20 -03:00 |
|
Anton Georgiev
|
24ea6b889e
|
Bump up version number
|
2020-05-26 10:31:22 -04:00 |
|
Anton Georgiev
|
5e90092fac
|
Merge pull request #8999 from kepstin/missing-font-size
presentation: ignore text shapes with missing calcedFontSize
|
2020-05-26 10:28:19 -04:00 |
|
Anton Georgiev
|
7086bbd1bb
|
Merge pull request #9688 from antobinary/adjust-eject-akka-apps
Do not ban user who left while in waiting list. Adjusting after mergi…
|
2020-05-26 10:06:56 -04:00 |
|
Anton Georgiev
|
68f0710cbf
|
Merge pull request #9686 from KDSBrowne/dev2.3-chat-input-moving
Prevent chat input shifting with error & typing messages
|
2020-05-26 10:06:39 -04:00 |
|
Anton Georgiev
|
3b843e7c56
|
Do not ban user who left while in waiting list. Adjusting after merging 2.2. into 2.3 in #9672
|
2020-05-26 13:55:38 +00:00 |
|
Anton Georgiev
|
9053450a25
|
Merge pull request #9687 from bigbluebutton/revert-9189-catalyst-fix-calcGuestStatus
Revert "Fix calcGuestStatus"
|
2020-05-26 09:42:13 -04:00 |
|
Anton Georgiev
|
d1924c5bb2
|
Revert "Fix calcGuestStatus"
|
2020-05-26 09:28:00 -04:00 |
|
Martin Beckmann
|
630f3393aa
|
Integration of PR #9292 (by weeman1337) and PR #9658 (by mantridereso)
..oops, forgot to update settings.yml
|
2020-05-26 15:17:11 +02:00 |
|
Anton Georgiev
|
90fdbd4efa
|
Merge pull request #9676 from basisbit/patch-4
Add pull request template
|
2020-05-26 09:09:43 -04:00 |
|
Martin Beckmann
|
c3f0447105
|
Integration of PR #9292 (by weeman1337) and PR #9658 (by mantridereso)
|
2020-05-26 15:07:37 +02:00 |
|
Anton Georgiev
|
f4742e8a9f
|
Merge pull request #9683 from KDSBrowne/issue-9679
Fix non userData defined shortcuts not functioning
|
2020-05-26 08:57:48 -04:00 |
|
KDSBrowne
|
4e68ea07fd
|
fix non userData shortcuts not functioning
|
2020-05-26 12:12:57 +00:00 |
|
basisbit
|
4f35b3464f
|
Create PULL_REQUEST_TEMPLATE.md
|
2020-05-26 03:05:30 +02:00 |
|
Fred Dixon
|
13d123058a
|
Merge pull request #9671 from kepstin/missing-font-size
presentation: ignore text shapes with missing calcedFontSize
|
2020-05-25 18:19:53 -04:00 |
|
KDSBrowne
|
aff51f603f
|
prevent chat input shifting with error & typing messages
|
2020-05-25 20:56:26 +00:00 |
|
KDSBrowne
|
be10e25eef
|
make presentation area not visible when minimized
|
2020-05-25 20:18:58 +00:00 |
|
Anton Georgiev
|
839d104fc5
|
Merge pull request #9673 from antobinary/merge-2.2-into-develop
Merge 2.2 into develop, May 25, 2020 part 2
|
2020-05-25 15:57:41 -04:00 |
|
Anton Georgiev
|
9f60e925b5
|
Merge branch 'v2.2.x-release' of github.com:bigbluebutton/bigbluebutton into merge-2.2-into-develop
|
2020-05-25 19:55:36 +00:00 |
|
Anton Georgiev
|
82930ad4bd
|
Merge pull request #9672 from antobinary/merge-2.2-into-develop
Merge 2.2 into develop, May 25, 2020
|
2020-05-25 15:44:33 -04: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 |
|
Fred Dixon
|
dc4cc11a8a
|
Use the specified ESL password
|
2020-05-24 11:20:25 -05:00 |
|
Anton Georgiev
|
2f665bb114
|
Bump up to to a "safe" version number
|
2020-05-24 08:26:40 -04:00 |
|
Anton Georgiev
|
f3199c8292
|
Merge pull request #9662 from antobinary/do-not-return-on-missing-meetingId-in-header
Logging with JSON stringify was leading to crashes. Reverting, need t…
|
2020-05-24 08:25:35 -04:00 |
|
Anton Georgiev
|
4a38524778
|
Logging with JSON stringify was leading to crashes. Reverting, need to investigate further
|
2020-05-24 08:22:10 -04:00 |
|
Martin Beckmann
|
ea3926e8ef
|
attempt to introduce an additional UserSettings parameter 'bbb_show_public_chat_on_login' as a co-parameter of 'bbb_show_participants_on_login' (the former intended to only have an effect if the latter is 'true')
|
2020-05-23 22:28:56 +02:00 |
|
Martin Beckmann
|
d6956a5516
|
test...
|
2020-05-23 21:43:26 +02:00 |
|
Martin Beckmann
|
f9c7c20d5a
|
test...
|
2020-05-23 21:40:39 +02:00 |
|
Martin Beckmann
|
51d3b3a94d
|
test...
|
2020-05-23 20:44:11 +02:00 |
|
Fred Dixon
|
8938383d67
|
Merge pull request #9654 from bigbluebutton/ffdixon-patch-2
Update bbb-record
|
2020-05-23 12:49:47 -04:00 |
|
Fred Dixon
|
bcf2b83c7f
|
Update bbb-record
Fix #9652
|
2020-05-23 12:49:22 -04:00 |
|
Felipe Cecagno
|
fc95e052a6
|
Sort sanity files so it processes older recordings first
|
2020-05-23 01:28:43 -03:00 |
|
Fred Dixon
|
755d161393
|
Merge pull request #9597 from basisbit/patch-4
Workaround for freeswitch clock out of sync problems
|
2020-05-22 22:55:26 -04:00 |
|
Anton Georgiev
|
54fe878a05
|
Merge pull request #9643 from jfsiebel/save-settings-on-start
Prevent userChangedLocalSettings call failing at start
|
2020-05-22 14:52:50 -04:00 |
|
Joao Siebel
|
7d9f4c70ad
|
Prevent userChangedLocalSettings call failing at start
|
2020-05-22 13:54:00 -03:00 |
|
Anton Georgiev
|
9afb42aadf
|
Merge pull request #9642 from KDSBrowne/remove-user-style-updates
Update message / style for remove user confirmation
|
2020-05-22 12:45:49 -04:00 |
|
KDSBrowne
|
03d0931c1c
|
add style / message updates
|
2020-05-22 16:39:54 +00:00 |
|
Anton Georgiev
|
ede8d82384
|
Merge pull request #9641 from antobinary/locales-may-22
Pulled HTML5 locales May 22, 2020
|
2020-05-22 11:55:19 -04:00 |
|
Anton Georgiev
|
c9faef96c9
|
Pulled HTML5 locales May 22, 2020
|
2020-05-22 11:48:11 -04:00 |
|
Anton Georgiev
|
fdcccbbc29
|
Merge pull request #9640 from antobinary/ban-eject-user
Distinguish between eject and ban for Remove user
|
2020-05-22 11:37:11 -04:00 |
|
Anton Georgiev
|
b6194f96cb
|
Add log in akka-apps to show whether user was banned or simply ejected
|
2020-05-22 11:12:19 -04:00 |
|
Anton Georgiev
|
ca9ae8d861
|
cleanup
|
2020-05-22 10:55:11 -04:00 |
|
KDSBrowne
|
afe995393e
|
remove className
|
2020-05-22 10:47:22 -04:00 |
|
KDSBrowne
|
274335cc9d
|
add checkbox toremove user modal
|
2020-05-22 10:47:03 -04:00 |
|
Anton Georgiev
|
e7917994d5
|
add banUser field in EjectUserFromMeetingCmdMsgBody
|
2020-05-22 10:45:28 -04:00 |
|
Anton Georgiev
|
aeeac803c7
|
Merge pull request #9620 from antobinary/simplify-publish
Simplify the code used for promote-demote subscriptions
|
2020-05-21 17:14:16 -04:00 |
|
Anton Georgiev
|
c290c9ee60
|
Merge branch 'v2.2.x-release' of github.com:bigbluebutton/bigbluebutton into ban-eject-user
|
2020-05-21 16:54:31 -04:00 |
|
Anton Georgiev
|
1874cf8392
|
Add visuals for banning vs ejecting user
|
2020-05-21 16:40:08 -04:00 |
|
Anton Georgiev
|
b6524e66c7
|
Fix typo closing parenthesis
|
2020-05-21 15:11:11 -04:00 |
|
Anton Georgiev
|
e08ee31338
|
Merge pull request #9629 from KDSBrowne/issue-9569
Update shared note item style
|
2020-05-21 15:06:45 -04:00 |
|