Commit Graph

24092 Commits

Author SHA1 Message Date
Tainan Felipe
1137f17be1 Add indicator number of users added for each breakout room 2019-03-06 17:25:23 -03:00
Tainan Felipe
57afed26a1 Fix starting breakout room with null duration value 2019-03-06 17:22:20 -03:00
Tainan Felipe
3d8501042a Fix main meeting by viewing all server breakout rooms 2019-03-06 17:01:39 -03:00
Vitor Mateus
c26fa1e69b Merge remote-tracking branch 'upstream/master' into issue-5191 2019-03-06 16:21:32 -03:00
Ghazi Triki
094ecd0e9f Generate text files in all cases. 2019-03-06 19:21:49 +01:00
Ghazi Triki
5482fa07f9 Added a new flag to switch SWF files conversion on and off. 2019-03-06 19:07:28 +01:00
Anton Georgiev
ea904c9111
Set default breakout duration to 15 mins 2019-03-06 12:04:37 -05:00
Anton Georgiev
25a2d0a707
Merge pull request #6902 from MaximKhlobystov/fix-client-log-feedback
Since Chad Pilkey (@capilkey ) approved, we should merge...
2019-03-06 11:28:07 -05:00
Fred Dixon
51c2270f04
Merge pull request #6915 from riadvice/svg-conversion-fix
Fix document conversion having names with special characters
2019-03-06 10:22:19 -05:00
Vitor Mateus
7323183a84 Merge remote-tracking branch 'upstream/master' into issue-5191 2019-03-06 11:30:23 -03:00
Ghazi Triki
2412c94a9c Generate temporary files names using UUID instead of relying on the original file name. 2019-03-06 15:16:18 +01:00
Chad Pilkey
85ba6ae092
Merge pull request #6912 from capilkey/fix-ejections
Add missing bracket to UsersWindow
2019-03-05 18:56:01 -05:00
Chad Pilkey
bb38e800c6 add missing bracket to UsersWindow 2019-03-05 15:55:08 -08:00
Chad Pilkey
52dfa71f91
Merge pull request #6910 from capilkey/fix-ejections
Fix ejections in Flash
2019-03-05 17:26:58 -05:00
Anton Georgiev
37322fab26
Merge pull request #6870 from jfsiebel/implement-user-inactivity-check
Implement user inactivity check
2019-03-05 16:53:10 -05:00
Anton Georgiev
c7647a7254
Merge pull request #6862 from capilkey/2.2-fix-inactivity
Fixed mapping of inactivity values
2019-03-05 16:43:26 -05:00
Chad Pilkey
54036cb0bf update Flash mute shortcut language 2019-03-05 13:26:11 -08:00
Chad Pilkey
73ed89d817 make breakout room renderer update with role change 2019-03-05 13:25:46 -08:00
Chad Pilkey
b5bcfadbea harden some priveledged functionality in the Flash client 2019-03-05 13:23:33 -08:00
Anton Georgiev
3cb49eda91
Merge pull request #6909 from antobinary/presentation-upload
Pulled latest html5 locales; added Hebrew
2019-03-05 14:33:35 -05:00
Anton Georgiev
24e0808ac2 pulled latest html5 locales; added Hebrew 2019-03-05 19:31:28 +00:00
Tainan Felipe
f983bbc3d6 Change transition control to a selector 2019-03-05 15:42:09 -03:00
Anton Georgiev
e52f76252b
Merge pull request #6908 from gustavotrott/webcam-control-not-released
Stop tracks when close preview modal
2019-03-05 13:27:29 -05:00
Anton Georgiev
67a787fc13
Merge pull request #6865 from BobakOftadeh/fix-chat-export
Fix save chat with URL
2019-03-05 13:26:46 -05:00
bobakoftadeh
8613e7c1e9 Improve htmlDecode function 2019-03-05 18:21:33 +00:00
Gustavo Trott
15f394355a Stop tracks when close modal preview 2019-03-05 15:13:50 -03:00
Joao Siebel
c93e21f2d8 Merge remote-tracking branch 'upstream/master' into implement-user-inactivity-check 2019-03-05 15:06:54 -03:00
bobakoftadeh
81868f970f Improve styles for welcome message 2019-03-05 17:57:43 +00:00
KDSBrowne
761c11581b Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into 2.2-Edge-support-01 2019-03-05 02:52:49 +00:00
KDSBrowne
de660a0abe make remaining animations work with Edge 2019-03-05 02:46:37 +00:00
Maxim Khlobystov
2f8e9801da Sending the feedback log before going to logout URL 2019-03-04 17:41:04 -05:00
Anton Georgiev
7d6f3eeb95
Merge pull request #6850 from capilkey/2.2-allow-pc-with-mod
Fix private chat for viewers and allow private chat with moderators
2019-03-04 16:24:07 -05:00
Anton Georgiev
16c5852174
Merge pull request #6875 from Tainan404/issue-6861
Mute shared video when echo test is open.
2019-03-04 16:04:43 -05:00
Anton Georgiev
012a25e893
Merge pull request #6832 from KDSBrowne/2.2-Edge-talking-anim
Improve talking indicators in edge
2019-03-04 15:58:22 -05:00
Chad Pilkey
ba301513c5 fix user-list menu private chat lock check 2019-03-04 12:10:08 -08:00
bobakoftadeh
7b72ae0f36 Improve welcome message 2019-03-04 17:42:18 +00:00
Fred Dixon
c33245c811
Fix logic error in bbb-conf --check 2019-03-04 12:06:53 -05:00
Anton Georgiev
42850aa008
Merge pull request #6877 from MaximKhlobystov/video-overlaps-whiteboard
Fix the issue with videos overlapping whiteboard
2019-03-04 11:43:13 -05:00
Fred Dixon
82ac198478
Merge pull request #6893 from ffdixon/prep-2.2
Prep 2.2
2019-03-04 09:58:56 -05:00
Fred Dixon
44330fea49 Make Kurento enableListenOnly true and update help URL 2019-03-04 08:57:51 -06:00
Fred Dixon
78ee39f606 Increase timeout for waiting for bbb-web to startup 2019-03-04 08:57:26 -06:00
Anton Georgiev
e19fd13af1
Merge pull request #6809 from BobakOftadeh/fix-welcome-message
Fix links in welcome message
2019-03-04 09:15:20 -05:00
Anton Georgiev
8c896d3892
Merge pull request #6882 from MaximKhlobystov/fullscreen-on-edge
Fullscreen in Edge
2019-03-04 09:13:54 -05:00
Anton Georgiev
aac229b833
Merge pull request #6838 from gustavotrott/quick-poll-implement
Quick poll implement
2019-03-04 08:53:18 -05:00
Anton Georgiev
998d2d1e33
Merge pull request #6834 from KDSBrowne/2.2-imprv-notes-accessibility
Improve shared notes accessibility
2019-03-04 08:52:52 -05:00
Anton Georgiev
1dae954126
Merge pull request #6890 from KDSBrowne/2.2-remove-phone-users-from-poll
Exclude dial in users from polls
2019-03-01 15:19:19 -05:00
Anton Georgiev
586d5889a0
Merge pull request #6891 from prlanzarin/patch-1
[HTML5] Change default resolution for webcams to 320x240
2019-03-01 14:46:49 -05:00
Paulo Lanzarin
fdb8d889c7
[HTML5] Change default resolution for webcams to 320x240
- This was done to mitigate packet loss and flickering and better abide to our default configured bitrate (300kbps).
This goes alongside updates to bbb-webrtc-sfu and kurento-media-server to increase reliablity and diminish stream artifacts.
I'll probably revisit this resolution change once I can correctly identify the source of corrupted frames, but I really think we should
maintain this as 320x240 for the time being. 640x480 would only be feasible if we increased our default bitrate config to 500kbps.
2019-03-01 16:20:08 -03:00
Anton Georgiev
7901772c2b
Merge pull request #6876 from Tainan404/issue-6852
Fix text overflow in error screen button.
2019-03-01 11:44:26 -05:00
Anton Georgiev
cee925f5f6
Merge pull request #6878 from Tainan404/issue-6808
Preserve original capitalization of username in fullscreen button.
2019-03-01 11:11:15 -05:00