Commit Graph

29889 Commits

Author SHA1 Message Date
Ramon Souza
3030fbc206 Merge remote-tracking branch 'upstream/develop' into chat-alerts-refactor 2021-06-04 08:28:47 -03:00
Anton Georgiev
9a91fe9ca2
Merge pull request #12514 from antobinary/2.3.3-navbar
fix: endWhenNoModerator* passed meetingCreate params should override …
2021-06-03 16:00:01 -04:00
Anton Georgiev
06b73419a6 fix: endWhenNoModerator* passed meetingCreate params should override default values 2021-06-03 19:46:57 +00:00
Anton Georgiev
d0d04f4559
Merge pull request #12513 from antobinary/2.3.3-navbar
fix: Increase slightly area for webcam+presentation
2021-06-03 14:00:34 -04:00
Anton Georgiev
74ac0f8e01 fix: Increase slightly area for webcam+presentation 2021-06-03 17:55:13 +00:00
Anton Georgiev
ebcc9f806f
Merge pull request #12512 from bigbluebutton/revert-12497-navbar-with-large-fonts
Revert "fix: different navbar size for locales with large fonts"
2021-06-03 10:47:15 -04:00
Anton Georgiev
fd9b68b526
Revert "fix: different navbar size for locales with large fonts" 2021-06-03 10:42:02 -04:00
Fred Dixon
0ba5d37ed7
Merge pull request #12509 from bigbluebutton/Bump-2.3.3
Update bigbluebutton-release
2021-06-03 06:32:45 -04:00
Fred Dixon
b14443af52
Update bigbluebutton-release
Bump to release 2.3.3
2021-06-03 07:32:20 -03:00
Anton Georgiev
e6099c7717
Merge pull request #12497 from ramonlsouza/navbar-with-large-fonts
fix: different navbar size for locales with large fonts
2021-06-02 16:50:07 -04:00
Anton Georgiev
776d979e42
Merge pull request #12486 from ramonlsouza/actions-bar-new-lm
actions bar in new layout manager
2021-06-02 16:47:12 -04:00
Anton Georgiev
2902f61ac6
Merge pull request #12499 from KDSBrowne/bbb-sass-update
Update Node-Sass To Latest Version (6.0.0)
2021-06-02 16:44:23 -04:00
Gustavo Trott
02ef1186be Avoid set negative values in Extend time for breakout rooms 2021-06-02 17:36:43 -03:00
Anton Georgiev
fe403dfd05
Merge pull request #12506 from antobinary/june2-merge-into-develop
Merge 2.3.2 into 'develop'
2021-06-02 15:48:21 -04:00
Gustavo Trott
2551f71d7c
code fix: use 0 instead of string
Co-authored-by: Anton Georgiev <antobinary@users.noreply.github.com>
2021-06-02 16:16:35 -03:00
Anton Georgiev
e01bdf69c5 Merge branch 'v2.3.x-release' of github.com:bigbluebutton/bigbluebutton into june2-merge-into-develop 2021-06-02 18:45:31 +00:00
Gustavo Trott
fd2ef393ed Code fixes in Breakoutroom extend time parts 2021-06-02 15:38:26 -03:00
Gustavo Trott
a312557461 Adds extend breakout room time functionality 2021-06-02 15:29:40 -03:00
Pedro Beschorner Marin
d4888f585c refactor(external videos): state as integer
A media state may have more than 2 states. Moving this property back to
integer so it can be extended.
2021-06-02 15:07:03 -03:00
Pedro Beschorner Marin
4a5b92445a refactor(external videos): system stop
Move all external video's system stop control events to akka-apps:
- on presenter change
- on presenter leave
- on screenshare start
2021-06-02 15:06:17 -03:00
Arthur B. Grossi
b0f2297809 refactor(external videos): add akka-apps model 2021-06-02 13:06:41 -03:00
Pedro Beschorner Marin
6c84a3295b refactor(external videos): frontend permissions
Revoked extra frontend permission checks and removed dependency from
external video stop Meteor's system call.
2021-06-02 13:03:04 -03:00
Arthur B. Grossi
e606df6031 feat(external video): permission check
Checks permission of start, stop and update external video messages
and only broadcast it if the sender is presenter (unless it's system
messages).
2021-06-02 12:54:37 -03:00
Max Franke
7f926edfcc refactor(external videos): add own collection
Refactor the external videos collection, moving the logic and functionalities
outside of /imports/api/meetings to a new location in /external-videos/server/modifiers
in order to decrease the coupling between the functionalities, favoring
the maintenance.
2021-06-02 12:50:40 -03:00
Tainan Felipe
25bf0096c5 Add field to toggle the download of the public chat message 2021-06-02 11:50:26 -03:00
Ramon Souza
f4f01818f8 add localeChanged event to resize presentation area 2021-06-02 09:41:15 -03:00
KDSBrowne
ed50fa23bb update node-sass to latest version (6.0.0) 2021-06-02 12:03:04 +00:00
Ramon Souza
8d2474135a formatting 2021-06-01 14:46:29 -03:00
Ramon Souza
96edb582f7 different navbar height for large fonts 2021-06-01 14:45:16 -03:00
Anton Georgiev
8b8d3026f6
Merge pull request #12496 from antobinary/june1-locales
chore(locales): Pulled HTML5 locales June 1, 2021
2021-06-01 13:34:55 -04:00
Anton Georgiev
230d24b7b4 Removed fallback locale for removed locales 2021-06-01 17:33:58 +00:00
Anton Georgiev
f26073582a Pulled HTML5 locales June 1, 2021 2021-06-01 17:25:38 +00:00
Anton Georgiev
9395f50b99
Merge pull request #12474 from Tainan404/refactor-dropdown
refactor: Decrease amount of imports in dropdown
2021-06-01 09:32:14 -04:00
Anton Georgiev
9bbdec40df
Merge pull request #12492 from antobinary/may31-locales
chore(locales): Pulled HTML5 locales on May 31, 2021
2021-05-31 19:39:22 -04:00
Anton Georgiev
4957f0218b chore(locales): Pulled HTML5 locales on May 31, 2021 2021-05-31 23:26:14 +00:00
Ramon Souza
f526ab88fb actions bar in new layout manager 2021-05-31 17:28:57 -03:00
Anton Georgiev
ecfe77ffd4
Merge pull request #12484 from antobinary/may31-bbb-conf
fix(bbb-conf):Only show status for multi kurento if that is configured
2021-05-31 16:07:26 -04:00
Anton Georgiev
25e5084cd0 fix(bbb-conf):Only show status for multi kurento if that is configured 2021-05-31 20:01:42 +00:00
Anton Georgiev
aeda277de9
Merge pull request #12476 from ramonlsouza/fix-navbar-z-index-new-lm
fix: navbar z-index - new LM
2021-05-31 14:50:16 -04:00
Ramon Souza
a4849f109c fix navbar z-index - new LM 2021-05-31 15:37:14 -03:00
Tainan Felipe
baf7afc883 Decrease amount of imports in dropdown 2021-05-31 15:28:27 -03:00
Joao Siebel
eedf3a00f2 Remove stripHTMLTags method 2021-05-31 13:14:39 -03:00
Anton Georgiev
93c9aecab8
Merge pull request #12447 from gustavotrott/fix-user-inactive-while-in-breakoutroom
fix: Avoid users to be ejected due to inactivity while they are in a breakout room
2021-05-31 11:00:15 -04:00
Anton Georgiev
8868e84e9f
Merge pull request #12395 from gustavotrott/end-when-no-moderator
Implements endWhenNoModerator
2021-05-31 10:59:55 -04:00
Anton Georgiev
9d8dc8ecad
Merge pull request #12426 from gustavotrott/remove-configtoken-support
Removes support for configToken param
2021-05-31 10:52:49 -04:00
Anton Georgiev
9f84b993f7
Merge pull request #12467 from pedrobmarin/f-r-mow
fix!(recording): moderator only webcams
2021-05-31 10:49:17 -04:00
Anton Georgiev
ff24c5ae0d
Merge pull request #12466 from pedrobmarin/f-g-ns
feat(guests): notification settings
2021-05-31 10:48:15 -04:00
Anton Georgiev
2b4746fc85
Merge pull request #12465 from pedrobmarin/f-r-rrce
feat(recording): record role change event
2021-05-31 10:47:15 -04:00
Anton Georgiev
4cd3c5d29f
Merge pull request #12464 from pedrobmarin/f-r-ruc
refactor(recording): recording ready url callback
2021-05-31 10:46:42 -04:00
Anton Georgiev
9c44f2c919
Merge pull request #12470 from ramonlsouza/sidebar-z-index-new-lm
fix: use same z-index for all layouts - new LM
2021-05-31 10:31:00 -04:00