Maxim Khlobystov
4067f5f808
Merge branch 'v2.0.x-release' of https://github.com/bigbluebutton/bigbluebutton into whiteboard-bulk-upsert
2018-04-25 14:39:48 +00:00
Lucas Fialho Zawacki
8f1a128e24
Send webrtc screenshare event for recordings
2018-04-25 14:36:37 +00:00
João Francisco Siebel
9e2d517052
add user verification and narrow down search
2018-04-25 11:29:55 -03:00
Maxim Khlobystov
8d1e80fbf0
Put the bulk lifespan value into configs.
2018-04-25 14:27:53 +00:00
Oswaldo Acauan
fb6aeb90f9
Fix autosharewebcam option not working on first join
2018-04-25 11:23:44 -03:00
Anton Georgiev
e930372a74
add client type as parameter in bbb api
2018-04-24 22:53:49 +00:00
Lucas Fialho Zawacki
1fa4b958bf
Merge branch 'v2.0.x-release' of https://github.com/bigbluebutton/bigbluebutton into html5-video-recording
2018-04-24 22:49:50 +00:00
Lucas Fialho Zawacki
5c40eb1651
Yet another step in adding html5 recording messages into redis
2018-04-24 22:49:16 +00:00
Richard Alam
bfd7738831
Merge branch 'v2.0.x-release' of github.com:bigbluebutton/bigbluebutton into v2.0.x-release
2018-04-24 15:06:33 -07:00
Richard Alam
e8208281ad
Merge branch 'riadvice-change-user-role-bbb-web' into v2.0.x-release
2018-04-24 15:06:02 -07:00
Richard Alam
a3d1e18a77
- format
2018-04-24 15:04:52 -07:00
Richard Alam
87a8a03067
Merge branch 'change-user-role-bbb-web' of https://github.com/riadvice/bigbluebutton into riadvice-change-user-role-bbb-web
2018-04-24 14:47:53 -07:00
Fred Dixon
7f0d8db451
Merge pull request #5392 from kepstin/recording-webcam-fix
...
Fix handling webcam videos that end early in recording processing
2018-04-24 17:01:47 -04:00
Calvin Walton
8e0a79014f
Fix handling webcam videos that end early in recording processing
...
In some cases (due to network issues), the webcam video can be shorter
than the time between the start/stop events. Pad the input video with a
blank video to make sure that there's input to the video tiling filters,
to fix a problem where the video won't render correctly with ffmpeg v3.4
and later.
2018-04-24 16:58:14 -04:00
Richard Alam
de446d379e
Merge pull request #5131 from riadvice/2.0-ui-fixes
...
Show lock image if webcamsOnlyForModerator is enabled
2018-04-24 16:57:37 -04:00
Fred Dixon
7cf9ae659f
Merge pull request #5388 from kepstin/webrtc-webcams
...
Include WebRTC webcams in processed recordings
2018-04-24 16:55:34 -04:00
Chad Pilkey
54e82f5acd
Merge pull request #5391 from riadvice/v2.0.x-screenshare-size
...
Fix centering screenshare video
2018-04-24 16:44:00 -04:00
Ghazi Triki
2700995876
Fix centering screenshare video.
2018-04-24 21:41:28 +01:00
KDSBrowne
72ed12aa18
remove unneeded aria label
2018-04-24 13:29:33 -07:00
Chad Pilkey
7570839211
Merge pull request #5389 from riadvice/v2.0.x-screenshare-size
...
Delete centering videoHolder in all cases from ScreenshareViewWindow
2018-04-24 16:08:36 -04:00
KDSBrowne
7a3c7e0c9c
remove test label
2018-04-24 13:02:10 -07:00
Ghazi Triki
310759b7b3
Delete centering videoHolder in all cases from ScreenshareViewWindow.mxml
2018-04-24 20:52:53 +01:00
KDSBrowne
c1a5f99291
fix SR virtual cursor interaction with audio-modal mic/listenOnly btns
2018-04-24 12:48:36 -07:00
Lucas Fialho Zawacki
eea06888ef
Merge branch 'webrtc-webcams' of https://github.com/kepstin/bigbluebutton into html5-video-recording
2018-04-24 19:38:53 +00:00
Lucas Fialho Zawacki
2d6143fb04
Record html5 screenshare in a different path
2018-04-24 19:30:18 +00:00
Lucas Fialho Zawacki
a4ddf580df
Correct typo in BaseManager.js error log
2018-04-24 19:28:44 +00:00
Calvin Walton
ce84c5517b
Include webrtc webcams in recording processing
2018-04-24 15:20:35 -04:00
Calvin Walton
c45fa74da0
Archive the webcam files from kurento webcam sharing
2018-04-24 15:18:02 -04:00
Chad Pilkey
80b0f084bb
Merge pull request #5384 from riadvice/v2.0.x-screenshare-size
...
Fix full-size screen-sharing issue
2018-04-24 15:08:45 -04:00
KDSBrowne
91055066d5
add role=alert on AudioModal connecting view
2018-04-24 12:03:29 -07:00
João Francisco Siebel
742303015d
handle only HTML5 direct messages ignoring flash messages
2018-04-24 15:42:59 -03:00
Lucas Fialho Zawacki
ac59277e2d
Merge branch 'v2.0.x-release' of https://github.com/bigbluebutton/bigbluebutton into html5-video-recording
2018-04-24 18:20:06 +00:00
Maxim Khlobystov
9e4da16e8f
Brought text shapes back.
2018-04-24 18:17:55 +00:00
Lucas Fialho Zawacki
7cdb3f495d
Write the recording events for webrtc cameras properly in redis
2018-04-24 18:11:14 +00:00
Ghazi Triki
f26490a4e3
Fix full-size screen-sharing issue.
2018-04-24 18:39:17 +01:00
Anton Georgiev
82f272fb12
Merge branch 'meta-params-video-conf' of github.com:oswaldoacauan/bigbluebutton into meta-params
2018-04-24 17:12:13 +00:00
Anton Georgiev
2f35cb6f0c
add jsp page for html5 login with meta -- init
2018-04-24 17:11:46 +00:00
KDSBrowne
068d3a38aa
add aria-expanded to user dropdown menu trigger
2018-04-24 10:06:28 -07:00
Oswaldo Acauan
ad57657b18
Add metatag html5hidepresentation
2018-04-24 13:18:12 -03:00
KDSBrowne
01cbce8a0b
change userlist toggle aria-label to match headings inside userlist
2018-04-24 09:11:22 -07:00
KDSBrowne
68fcf73227
add aria-expanded to dropdown triggers
2018-04-24 09:07:54 -07:00
Oswaldo Acauan
46559833e2
Add metatag html5autosharewebcam
2018-04-24 12:51:41 -03:00
KDSBrowne
534b8ea746
move aria-label above select in DOM
2018-04-24 08:39:15 -07:00
Oswaldo Acauan
6beada63eb
Add metatag html5autoswaplayout
2018-04-24 12:23:54 -03:00
Maxim Khlobystov
f321011a6f
Cleaned up some console logs.
2018-04-24 15:10:02 +00:00
KDSBrowne
ccff25ded6
prevent SR from announcing duplicate user name
2018-04-24 08:07:04 -07:00
João Francisco Siebel
3f797b9602
Add friendly interation on audio settings retry
2018-04-24 11:52:37 -03:00
KDSBrowne
520e2e19a0
remove unused comments
2018-04-24 07:45:11 -07:00
Chad Pilkey
3e4a310418
Merge pull request #5372 from riadvice/2.0-screenshare-fix
...
Remove remnant verto screensharing and use kurento instead
2018-04-24 10:43:43 -04:00
KDSBrowne
2a217866fb
improve mobile SR views
2018-04-24 07:43:11 -07:00
