BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
20,405 Commits 13 Branches 260 Tags 1.1 GiB
1a9374f19d
Commit Graph

20405 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tainan Felipe
10a90b4180 WIP 2018-05-08 13:30:00 -03:00
Chad Pilkey
69f8567c5e
Merge pull request #5485 from riadvice/private-chat-with-moderators 
Allow chat with moderators when private chat is locked
 2018-05-08 12:27:40 -04:00
Bobak Oftadeh
77622f6858 Removed unnecessary variable 2018-05-08 09:20:52 -07:00
Bobak Oftadeh
9071b8086d Added requested changes to fullscreen button fix 2018-05-08 09:04:15 -07:00
Ghazi Triki
138663dc77 Allow chat with moderators when private chat is locked. 2018-05-08 16:56:36 +01:00
Fred Dixon
70c31c1a50
Merge pull request #5475 from riadvice/choose-breakout-room 
Add new feature to breakout rooms that allows to freely join them
 2018-05-08 11:06:55 -04:00
Tainan Felipe
2f52c9fdc5 remove only metadata 2018-05-08 09:26:04 -03:00
Tainan Felipe Pauli de Almeida
1e378044f2 increase the arrows 2018-05-08 09:10:09 -03:00
Ghazi Triki
a75173fd90 Locale typo fix. 2018-05-08 08:56:28 +01:00
Fred Dixon
80b959f5b9
Merge pull request #5482 from capilkey/audio-callout 
Change style of the audio call out
 2018-05-07 22:00:47 -04:00
James Jung
ae9d92ea16 Update absolute paths to use baseName config 2018-05-07 19:15:50 -04:00
Chad Pilkey
aa2ed93e5b restyle the callout when user doesn't join audio 2018-05-07 16:12:11 -07:00
Anton Georgiev
5cee4c6e5a
Merge pull request #5481 from prlanzarin/ss-no-red5-transcode 
Allowing WebRTC-only screensharing
 2018-05-07 18:20:20 -04:00
prlanzarin
eb8e7a3844 Making WebRTC-only screensharing possible without transcode/red5/broadcast apps 2018-05-07 20:43:58 +00:00
Maxim Khlobystov
e55b208229
Merge pull request #5442 from KDSBrowne/xx-add-resizable-component 
Make userlist and chat width scalable
 2018-05-07 14:45:35 -04:00
Anton Georgiev
375e844890
Merge pull request #5426 from prlanzarin/ss-toast-fix 
Fixed screenshare extension toast and removed dock leftover code
 2018-05-07 14:44:20 -04:00
Lucas Fialho Zawacki
c7bbb847d8 Small html5 stop streams corrections 2018-05-07 17:52:44 +00:00
Lucas Fialho Zawacki
6fcdc61e69 Merge branch 'v2.0.x-release' of https://github.com/bigbluebutton/bigbluebutton into stop-streams 2018-05-07 17:12:44 +00:00
Fred Dixon
ef52348fb5
Merge pull request #5477 from ritzalam/update-locales-may-7-2018 
- update locales to latest
 2018-05-07 11:43:31 -04:00
Richard Alam
1be8ba7f98 - update locales to latest 2018-05-07 08:36:50 -07:00
Ghazi Triki
54ae79d533 Add new feature to breakout rooms that allows to freely join them. 2018-05-07 16:03:53 +01:00
Fred Dixon
2ceaa40b7c
Merge pull request #5464 from antobinary/enable-kurento-recording 
Enable kurento screenshare recording, disable red5 video-broadcast ss recording
 2018-05-06 08:43:17 -04:00
Fred Dixon
723b30dbd9
Merge pull request #5466 from capilkey/audio-callout 
Show a call out when a user doesn't join audio
 2018-05-06 08:42:53 -04:00
Fred Dixon
d488c3777b
Merge pull request #5468 from ffdixon/fix-bbb-conf-11 
Fix update of URL for thumbnails with bbb-conf --setip
 2018-05-05 11:14:35 -04:00
Fred Dixon
4f12774c08 Fix update of URL for thumbnails with bbb-conf --setip 2018-05-05 10:13:38 -05:00
Chad Pilkey
cb8878d078 show callout when user doesn't join audio 2018-05-04 16:25:31 -07:00
Fred Dixon
00efd4770a
Merge pull request #5449 from pedrobmarin/multiple-playbacks 
Grouping playbacks inside the same recording
 2018-05-04 17:52:56 -04:00
Richard Alam
225c877c5a
Merge pull request #5465 from ritzalam/improve-client-logging 
- missing logCode
 2018-05-04 17:39:14 -04:00
Richard Alam
59da111033 - missing logCode 2018-05-04 14:37:28 -07:00
Anton Georgiev
195b688676 enable kurento screenshare recording, disable red5 video-broadcast ss recording 2018-05-04 21:22:22 +00:00
Richard Alam
c348d29f07
Merge pull request #5460 from ritzalam/improve-client-logging 
Improve client logging
 2018-05-04 17:02:50 -04:00
Richard Alam
d468402a6d Merge branch 'v2.0.x-release' of github.com:bigbluebutton/bigbluebutton into improve-client-logging 2018-05-04 14:02:21 -07:00
Lucas Fialho Zawacki
aed6ffc3cb Pausing streams server side when client is not vieweing them 2018-05-04 20:58:35 +00:00
Tainan Felipe
44a5d6c600 add voice user icon for webcam status 2018-05-04 16:44:30 -03:00
Tainan Felipe
35e0fc9bbf Fix the audio status does not update on webcam video 2018-05-04 16:40:40 -03:00
Bobak Oftadeh
1c28ec9d9a Merge remote-tracking branch 'upstream/v2.0.x-release' into fullScreen-fix 2018-05-04 12:10:50 -07:00
Anton Georgiev
6802064b49
Merge pull request #5457 from prlanzarin/recording-stop-fix 
Fixed recording stop in SFU
 2018-05-04 14:32:35 -04:00
Bobak Oftadeh
d64b5a1197 Fixed fullscreen button 2018-05-04 11:07:41 -07:00
Richard Alam
49ce5f58f6 Merge branch 'v2.0.x-release' of github.com:bigbluebutton/bigbluebutton into improve-client-logging 2018-05-04 10:28:38 -07:00
KDSBrowne
91edc247a0 remove chatPad element 2018-05-04 10:00:29 -07:00
KDSBrowne
fc82311132 use $small-only breakpoint / remove $medium-down 2018-05-04 09:52:11 -07:00
Richard Alam
d0fe175220 - organize client logs better 2018-05-04 08:48:32 -07:00
KDSBrowne
2c639e7ab9 make chat not open at max size 2018-05-04 08:29:43 -07:00
Chad Pilkey
28e0627bde fallback to simple pencil line drawing if commands are missing 2018-05-03 15:04:28 -07:00
prlanzarin
b52b059086 Fixed recording stop in SFU 2018-05-03 21:56:03 +00:00
KDSBrowne
48c3adb8d9 clean up css / resolve lint issue 2018-05-03 08:44:59 -07:00
KDSBrowne
64c57a6050 add check for IE / simplify conditions in shortcut-help 2018-05-03 08:36:08 -07:00
Anton Georgiev
1ecc070226
Merge pull request #5450 from antobinary/temp-fix 
Partially revert #5447
 2018-05-03 11:23:14 -04:00
Anton Georgiev
f973fedf4d commenting out code that breaks client loading 2018-05-03 15:21:46 +00:00
Anton Georgiev
544c4ab474
Merge pull request #5447 from prlanzarin/sfu-ping-pong 
Added websocket ping pong to SFU clients
 2018-05-03 10:08:08 -04:00