BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
29,739 Commits 13 Branches 260 Tags 1.1 GiB
3030fbc206
Commit Graph

29739 Commits

This Branch
This Branch
All Branches
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
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
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
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
KDSBrowne
ed50fa23bb update node-sass to latest version (6.0.0) 2021-06-02 12:03:04 +00: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
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
Ramon Souza
fdb07b8c37 use same z-index for all new layouts 2021-05-31 10:44:55 -03:00
Anton Georgiev
e40d376b33
Merge pull request #12462 from germanocaumo/poll-chat-export 
fix: export poll chat message
 2021-05-31 09:25:49 -04:00
germanocaumo
262195b4e4 Merge branch 'poll-question-refactor' of https://github.com/germanocaumo/bigbluebutton into poll-chat-export 2021-05-31 12:33:06 +00:00
germanocaumo
fe7af552fb Revert allowDragAndDropFiles default to false 2021-05-31 11:48:31 +00:00
Pedro Beschorner Marin
0e34d7239d fix!(recording): moderator only webcams 
BREAKING CHANGE: fix typo at moderator only webcams recorded event.
 2021-05-30 14:13:39 -03:00
Pedro Beschorner Marin
21a7324f70 feat(guests): notification settings 
Avoid showing the guest's notification toggles at client's settings if the guest
policy isn't `ASK_MODERATOR`.
 2021-05-30 12:09:33 -03:00
Pedro Beschorner Marin
ed64e330ee feat(recording): record role change event 
Reuse `ParticipantStatusChangeEvent` record event, already used by emojis and
webcam streams, to record `UserRoleChangedEvtMsg`.

Role change is stored at `events.xml` as:

- promotion
```
  <event timestamp="2068340" module="PARTICIPANT" eventname="ParticipantStatusChangeEvent">
    <timestampUTC>1622384175759</timestampUTC>
    <date>2021-05-30T14:16:15.759Z</date>
    <status>role</status>
    <userId>w_fowyht7g0tfi</userId>
    <value>MODERATOR</value>
  </event>
```

- demotion
```
  <event timestamp="2071437" module="PARTICIPANT" eventname="ParticipantStatusChangeEvent">
    <timestampUTC>1622384178855</timestampUTC>
    <date>2021-05-30T14:16:18.855Z</date>
    <status>role</status>
    <userId>w_fowyht7g0tfi</userId>
    <value>VIEWER</value>
  </event>
```
 2021-05-30 11:19:30 -03:00
Fred Dixon
8ade9d1f38
Update bbb-conf 
Minor update to test build
 2021-05-30 10:40:36 -03:00
Pedro Beschorner Marin
41daeca1a2 refactor(recording): callback url getter 2021-05-29 16:52:07 -03:00
Pedro Beschorner Marin
63dca7506e fix(recording): recording ready callback 
Fetch for server's security salt at etc's bbb-web properties file.
 2021-05-29 16:51:56 -03:00
germanocaumo
be8d7405a0 fix: missing line break of poll chat export 2021-05-29 00:56:25 +00:00
germanocaumo
5c7fa6ece5 fix: export poll chat message 
Include the new poll text in the chat export function.
Refactor some chat type constants.
Also fixes empty lines in the export chat file.
 2021-05-29 00:28:47 +00:00
Anton Georgiev
3bfa5979e4
Merge pull request #12461 from ramonlsouza/fix-captions-button-crash 
fix: captions button crash
 2021-05-28 16:26:31 -04:00
Ramon Souza
247601ad3d fix captions button crash 2021-05-28 17:16:35 -03:00
Anton Georgiev
409f10bd03
Merge pull request #12460 from ramonlsouza/fix-poll-panel-new-lm 
fix: poll panel styles - new LM
 2021-05-28 15:06:17 -04:00
Ramon Souza
7b2fd3b38e fix poll panel in new layout manager 2021-05-28 15:55:12 -03:00
Anton Georgiev
b04ff40200
Merge pull request #12459 from ramonlsouza/fix-panels-focus-video 
fix: Shared notes is hiding the presentation - new LM
 2021-05-28 14:51:26 -04:00
Anton Georgiev
b71b0ed618
Merge pull request #12450 from antobinary/split-bbb-web-4 
refactor: Isolate recording apis into RecordingController
 2021-05-28 14:49:20 -04:00
Ramon Souza
8cfc4aa5c4 fix panels height with focus on video - LM 2021-05-28 15:20:29 -03:00
Anton Georgiev
c16567ecf2
Merge pull request #12432 from antobinary/split-bbb-web 
refactor: Removed configXML from bbb-web
 2021-05-28 11:35:53 -04:00
Anton Georgiev
d8c02779d0
Merge pull request #12457 from ramonlsouza/modals-new-layout-manager 
Add modals to new layout manager
 2021-05-28 10:42:04 -04:00
Ramon Souza
e0b3de1d3c add modals to new layout manager 2021-05-28 10:30:35 -03:00
germanocaumo
ed6e895b67 refactor: rename inside question parameters 2021-05-27 21:11:50 +00:00
germanocaumo
4d347be53b refactor: use questionText instead of title for poll question 2021-05-27 21:04:15 +00:00