Commit Graph

24698 Commits

Author SHA1 Message Date
Anton Georgiev
22f90b37fc Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into test-7293 2019-05-01 20:14:53 +00:00
Anton Georgiev
83ecc5575f trim whitespace at end of youtube url 2019-05-01 20:09:49 +00:00
Anton Georgiev
f8e790abfc Merge branch 'issue-7282' of github.com:Tainan404/bigbluebutton into test-7293 2019-05-01 19:33:22 +00:00
Chad Pilkey
d4d72f8376
Merge pull request #7329 from KDSBrowne/2.2-small-fixes
Fix typo in regular expression detecting iOS version
2019-05-01 14:25:38 -04:00
Chad Pilkey
7095bae71d minor video preview tweaks 2019-05-01 10:36:25 -07:00
Richard Alam
47ea1bed67
Merge pull request #7270 from pedrobmarin/unmute-users
Unmute users
2019-05-01 10:52:12 -04:00
Chad Pilkey
4f59580f6b video preview spacing and localized strings 2019-04-30 15:29:30 -07:00
KDSBrowne
40619f1f4c add missing condition to render line separator 2019-04-30 21:41:15 +00:00
KDSBrowne
450b6156a5 remove extra black space in regular expression 2019-04-30 21:35:44 +00:00
Richard Alam
e3a68f9a97 - cleanup 2019-04-30 13:10:51 -07:00
Diego Benetti
dfdc98543e Merge remote-tracking branch upstream/master into base-rerender-tests 2019-04-30 17:01:01 -03:00
Chad Pilkey
2aeed72c8d refactor video preview media selection 2019-04-30 12:54:56 -07:00
Richard Alam
bf7898225b - minor cleanup 2019-04-30 12:30:59 -07:00
Tainan Felipe
10c4e8ee88 Fix create breakout room missing some users 2019-04-30 16:24:04 -03:00
Anton Georgiev
202af13c61
Merge pull request #7315 from BobakOftadeh/update-record-label
Update record button label
2019-04-30 09:42:01 -04:00
Richard Alam
bf0189230e - add redis password to akka-transcode 2019-04-29 13:54:48 -07:00
Richard Alam
56ffb3d708 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into add-redis-password-on-master 2019-04-29 13:00:59 -07:00
Richard Alam
f2165c1783 - cleanup 2019-04-29 12:59:45 -07:00
Anton Georgiev
7a389ade65
Merge pull request #7303 from capilkey/legacy-browser-support-2
Legacy browser support take 2
2019-04-29 15:54:42 -04:00
Anton Georgiev
f225bf4f45
Merge pull request #7313 from antobinary/logcodes-2
Mitigate flickering error screen on user eject/meeting ended
2019-04-29 12:20:55 -04:00
Richard Alam
0bd6b214d8 - add redis password to red5 apps 2019-04-29 09:04:16 -07:00
Anton Georgiev
f11576dbea increase delay before dropping Meetings to 10s 2019-04-29 14:22:33 +00:00
Fred Dixon
557dabb520
Revert to beta6 (previous release was beta5) 2019-04-28 10:04:16 -04:00
Bobak Oftadeh
7b8b459c05 update record button label 2019-04-26 20:56:12 +00:00
Anton Georgiev
e22b153e76 add missing meetingIsBrealout() 2019-04-26 20:45:08 +00:00
Anton Georgiev
63b8d04b04 remove capitalization of error message 2019-04-26 17:59:04 +00:00
Anton Georgiev
5681d44ca4 add error code missing titles 2019-04-26 17:52:18 +00:00
Anton Georgiev
3ce8006209 add 403 text to error screen 2019-04-26 17:14:37 +00:00
Anton Georgiev
70f41c9cca patch: clear collections within Fiber 2019-04-26 17:13:45 +00:00
Anton Georgiev
a0c9a1d3b7 Revert "Fix error sreen being shown when meeting is ended"
This reverts commit 285d27b16f.
2019-04-26 16:05:23 +00:00
Anton Georgiev
850add36af Revert "Remove server exception when user with expired session tries to join"
This reverts commit 8cffe046ef.
2019-04-26 16:01:58 +00:00
Fred Dixon
c45b743273
Bump to beta-7 2019-04-25 21:12:29 -04:00
Chad Pilkey
ded503e93d change eslint ignore to new compatibility dir 2019-04-25 12:30:59 -07:00
Diego Benetti
0ae817a951 Merge remote-tracking branch 'upstream/master' into base-rerender-tests 2019-04-25 14:57:59 -03:00
Diego Benetti
d673cab8ba Removes comented variables 2019-04-25 10:22:15 -03:00
Diego Benetti
0b29e1d4ae Unused variables removed 2019-04-25 10:04:44 -03:00
Anton Georgiev
785c1b1d0b
Merge pull request #7016 from KDSBrowne/2.2-Edge-audio-settings-modal-overflow
Fix Edge audio settings modal overflow / toast issues
2019-04-24 18:23:16 -04:00
Chad Pilkey
5173ab3b50 move plain js libs into the public dir 2019-04-24 15:13:50 -07:00
Chad Pilkey
098c8ce255 add alternate legacy browser content 2019-04-24 15:12:27 -07:00
Diego Benetti
2e71ed3c40 Base subscriptions moved to new component 2019-04-24 17:48:16 -03:00
Anton Georgiev
f1fda2f136
Merge pull request #7301 from bigbluebutton/revert-7295-legacy-browser-support
Revert "Add alternate legacy browser content"
2019-04-24 16:23:44 -04:00
Anton Georgiev
c268bed1ab
Revert "Add alternate legacy browser content" 2019-04-24 16:22:19 -04:00
Anton Georgiev
e516472899
Merge pull request #7295 from capilkey/legacy-browser-support
Add alternate legacy browser content
2019-04-24 15:14:15 -04:00
Anton Georgiev
2292e71f9c
Merge pull request #7285 from Tainan404/issue-7136
Remove server exception when user with expired session tries to join
2019-04-24 14:16:13 -04:00
Anton Georgiev
e24cfc1618
Merge pull request #7298 from Tainan404/issue-7026
Fix user count in breakout panel using users collection
2019-04-24 13:48:15 -04:00
Tainan Felipe
ae73142d93 Add breakout ended 2019-04-24 14:41:35 -03:00
Tainan Felipe
25047f57a9 Remove stop video button of video modal 2019-04-24 14:19:35 -03:00
KDSBrowne
5105a3bc09 make all fullscreen buttons use the same toggle function 2019-04-24 14:20:53 +00:00
Anton Georgiev
e253884d22
Merge pull request #7299 from antobinary/locales-4
HTML5 locales Apr 24, 2019
2019-04-24 09:10:56 -04:00
Anton Georgiev
291cb1ec36 html5 locales Apr 24, 2019 2019-04-24 13:08:11 +00:00