BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
22,839 Commits 13 Branches 260 Tags 1.1 GiB
04421e631b
Commit Graph

22839 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Richard Alam
bdbd423e7f
Merge pull request #6074 from ritzalam/update-akka-transcode-build 
- fix akka-transcode build failing on scalariform
 2018-09-13 17:46:42 -04:00
Richard Alam
d1553df373 - fix akka-transcode build failing on scalariform 2018-09-13 14:44:40 -07:00
Calvin Walton
c6674833c7 RaP: Have <p> in presentation format inherit font size 
This fixes font scaling in the presentation area, since that relied on
the <p> element inheriting the font size from the svg <g> that it was
inside of.

This was broken with the switch to the Foundation stylesheet base, which
set a fixed font size on the <p> element.
 2018-09-13 17:22:25 -04:00
Fred Dixon
5cb222c7de
Update bigbluebutton-release 2018-09-13 16:48:04 -04:00
Chad Pilkey
c2de25065f
Merge pull request #6073 from capilkey/ipv4-rtmp-fallback 
Fix WebRTC screenshare RTMP URL regular expression
 2018-09-13 16:33:57 -04:00
Chad Pilkey
284eb91b91 fix WebRTC screenshare RTMP url regular expression 2018-09-13 13:32:22 -07:00
Richard Alam
499d56975f Merge branch 'master' of github.com:bigbluebutton/bigbluebutton 2018-09-13 13:11:25 -07:00
Richard Alam
f39f812a0d Merge branch 'riadvice-jvm-quality-improve' 2018-09-13 13:10:55 -07:00
Richard Alam
cc6f88d020 - my IntelliJ IDE seems to format differently with Ghazi's 
- fix screenshare redis connection error
 - fix bbb-web create meeting exception when second user joins
 2018-09-13 13:08:49 -07:00
Anton Georgiev
f2092114e0
Merge pull request #6061 from BobakOftadeh/Userlist-spacing 
Fixed locked user to have the same height as a default user
 2018-09-13 15:25:06 -04:00
Anton Georgiev
2e2208ef6f
Merge pull request #6060 from oswaldoacauan/upload-token 
Adjust the presentation upload to use the security token introduced in 2.1
 2018-09-13 15:18:27 -04:00
Chad Pilkey
74151a4dff
Merge pull request #6070 from riadvice/fix-lock-for-late-joiners 
Fix lock settings
 2018-09-13 14:12:59 -04:00
João Francisco Siebel
4c35608c2b Add users-settings collection and handle dynamic configuration 2018-09-13 15:09:30 -03:00
Chad Pilkey
f2b06e7df6
Merge pull request #6071 from capilkey/ipv4-rtmp-fallback 
Add a specific log message when falling back to rtmp ipv4
 2018-09-13 11:54:17 -04:00
Chad Pilkey
1f6833b1f0 add a specific log message when falling back to rtmp ipv4 2018-09-13 08:52:51 -07:00
Ghazi Triki
845ffc8343 Merge remote-tracking branch 'bigbluebutton/master' into mobile-no-force-debug 
# Conflicts:
#	clients/flash/air-client/src/org/bigbluebutton/air/main/views/LoadingScreenMediator.as
 2018-09-13 09:25:40 +01:00
Chad Pilkey
4bddf6890e
Merge pull request #6069 from capilkey/ipv4-rtmp-fallback 
Add RTMP fallback for IPv4-only hostname to the client
 2018-09-12 18:13:49 -04:00
Chad Pilkey
911e99733c add rtmp fallback for ipv4-only hostname to the client 2018-09-12 13:49:27 -07:00
Anton Georgiev
10ae980fd4
Merge pull request #6058 from prlanzarin/screenshare-fix-presenter-switch 
Fix screenshare edge case with presenter switch
 2018-09-12 14:57:35 -04:00
Ghazi Triki
83025a9d5e Merge remote-tracking branch 'bigbluebutton/master' into jvm-quality-improve 
# Conflicts:
#	bbb-common-web/src/main/java/org/bigbluebutton/presentation/imp/ImageToSwfSlidesGenerationService.java
 2018-09-12 18:49:25 +01:00
Richard Alam
cdaf447758
Merge pull request #5975 from riadvice/user-typing-feature 
Implementation of user typing feature to chat
 2018-09-12 13:43:43 -04:00
Ghazi Triki
0873fe7a96 Request lock settings after all modules were loaded. 2018-09-12 18:21:02 +01:00
Tainan Felipe
43c45c71db Merge branch 'master' into zoom-implementation 2018-09-12 13:47:39 -03:00
Richard Alam
408a780cb3
Merge pull request #5965 from riadvice/rtl-minor-improve 
Update help button icon for RLT layout
 2018-09-12 12:19:38 -04:00
Richard Alam
c3494ee55d
Merge pull request #5849 from riadvice/v2.0.x-code-cleanup 
Clean unused parameters in ApiController.groovy
 2018-09-12 12:13:29 -04:00
Richard Alam
dca7364d77
Merge pull request #5681 from riadvice/ios-h264 
Display h264 video webcam stream for the iOS mobile client
 2018-09-12 12:05:11 -04:00
Richard Alam
5b03e0ef6c
Merge pull request #5581 from riadvice/recording-timer 
Add a new message RecordStatusResetSysMsg to be handled and saved in events.xml
 2018-09-12 12:03:09 -04:00
Tainan Felipe
0372f736fc Add Double tap zoom and pan navigation 2018-09-12 11:36:04 -03:00
Ghazi Triki
0733a608d5 More delay for updating layout lock the first time. 2018-09-12 13:43:53 +01:00
Ghazi Triki
d95f834dfc FIx layout lock for late joiners. 2018-09-12 13:18:41 +01:00
Bobak Oftadeh
5c3f6202b3 Fixed locked user to have the same height as a default user 2018-09-11 13:42:36 -07:00
prlanzarin
dedffa9de2 Fixed exceptions on screenshare early exit 2018-09-11 20:08:15 +00:00
prlanzarin
e327625b64 Avoid calling screenshare viewer exit twice and handle any possible exception 2018-09-11 19:40:13 +00:00
Oswaldo Acauan
88f7d6d7dd Merge remote-tracking branch 'upstream/master' into upload-token 2018-09-11 16:17:38 -03:00
Oswaldo Acauan
5c9518bd27 Adjust the presentation upload to use the security token introduced in 2.1. Closes #4948 2018-09-11 16:00:49 -03:00
prlanzarin
3fa8c1c7b6 Fix inconsistent screenshare state on presenter switch during ongoing negotiation 2018-09-11 18:11:52 +00:00
Anton Georgiev
885539bb2a
Merge pull request #6057 from prlanzarin/listen-only-fallback 
Add SIP.js listen only as fallback when SFU is enabled
 2018-09-11 13:50:10 -04:00
prlanzarin
fe9835b5f7 Add SIP.js listen only as fallback when SFU is enabled 2018-09-11 17:09:29 +00:00
Ghazi Triki
c44e5aebb8 Merge remote-tracking branch 'bigbluebutton/master' into v2.0.x-code-cleanup 
# Conflicts:
#	bigbluebutton-web/grails-app/controllers/org/bigbluebutton/web/controllers/ApiController.groovy
 2018-09-11 18:07:07 +01:00
Richard Alam
45cd830f96
Merge pull request #6056 from riadvice/big-image-conversion 
Down-scale image sized over 2MB
 2018-09-11 11:24:49 -04:00
Ghazi Triki
b6055c70d8 More logging for document conversion error. 2018-09-11 15:55:46 +01:00
Ghazi Triki
dbf85bb597 Remove dev debug. 2018-09-11 12:54:37 +01:00
Ghazi Triki
b6a5e75459 Down-scale image sized over 2MB. 2018-09-11 12:51:03 +01:00
Anton Georgiev
35c0a12373
Merge pull request #6055 from bigbluebutton/v2.0.x-release 
Pull V2.0.x release into 2.2 (master) to propagate 2.0 fixes
 2018-09-10 15:09:55 -04:00
Anton Georgiev
cae1cc2190
Merge pull request #6052 from BobakOftadeh/publish-fix 
Only propagate necessary information to client
 2018-09-10 15:00:54 -04:00
Anton Georgiev
358fdd57bf
Merge pull request #6054 from antobinary/locales-2018-09-10 
HTML5 client -- pulled latest language files 2018-09-10
 2018-09-10 14:52:36 -04:00
Anton Georgiev
7e4f4d9eaa html5-locales-2018-09-10 2018-09-10 18:49:54 +00:00
Bobak Oftadeh
053e0f93fc Fixed issue where unnecessary information was being published to the client. 2018-09-10 08:34:25 -07:00
Anton Georgiev
7508f1d4f8
Merge pull request #6034 from KDSBrowne/02-iphone-polling-fix 
Fix poll answers not being displayed on mobile safari
 2018-09-10 10:08:51 -04:00
KDSBrowne
5f31deee11 use mq() instead of @media 2018-09-09 05:23:33 +00:00