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

18303 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
KDSBrowne
bc0647ad50 fix merge conflicts 2017-09-29 12:04:27 -07:00
KDSBrowne
3b6aed34ae check for voice user and remove if exists 2017-09-29 11:58:24 -07:00
Anton Georgiev
7c5683c866 Merge pull request #4291 from Klauswk/html5-refactor-userlist 
[HTML5 2.0] Refactor UserList Components
 2017-09-29 14:08:12 -04:00
Fred Dixon
67aec4e814 Testing builds after the switch to v2.0.x-release 2017-09-29 13:10:05 -04:00
Richard Alam
ffb58bf086 Merge pull request #4443 from ritzalam/merge-2x-mconf-to-master 
Merge 2x-mconf branch into master
 2017-09-29 12:55:22 -04:00
Richard Alam
a2d403e9fd Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into merge-2x-mconf-to-master 2017-09-29 08:41:30 -07:00
Anton Georgiev
35ed73c9ae Merge pull request #4442 from bigbluebutton/revert-4371-presentation-uploader-2x 
Revert "[HTML5 2.0] Presentation Manager"
 2017-09-29 11:38:20 -04:00
Anton Georgiev
dbd00f3445 Revert "[HTML5 2.0] Presentation Manager" 2017-09-29 11:35:05 -04:00
Fred Dixon
45c972cb2f Merge pull request #4441 from kepstin/bbb-20-rec-fixes 
Don't crash playback if text is not available for a slide.
 2017-09-28 15:01:49 -04:00
Calvin Walton
3307fab99c Don't crash playback if text is not available for a slide. 
This happens when the slide is a plain image, for example.
Fixes #4425
 2017-09-28 14:34:19 -04:00
Klaus
b947e27086 Fix makeCall from component, and user.isLocked from mapUser 2017-09-28 15:19:57 -03:00
KDSBrowne
a60b7e26a6 add kickUser method 2017-09-28 10:41:02 -07:00
Richard Alam
5546b6b2ea Merge pull request #4440 from ritzalam/pool-office-manager 
- manage a pool of libre office instances so we can process multiple…
 2017-09-28 13:05:54 -04:00
Richard Alam
c1a98bd3a5 - manage a pool of libre office instances so we can process multiple docs at the same time 2017-09-28 10:00:47 -07:00
Anton Georgiev
543ef3830a Merge pull request #4439 from antobinary/present-fail-log 
[Flash Client 2.0] Add log for invalid or failed presentation conversion
 2017-09-28 11:21:20 -04:00
Anton Georgiev
b4b183ce7f add log for inavlid or failed presentation conversion 2017-09-28 10:52:10 -04:00
KDSBrowne
10c75afe99 switch handler, modifier and collection prop to ejected 2017-09-27 14:20:22 -07:00
Richard Alam
9f880655a6 Merge pull request #4437 from ritzalam/use-pres-checker 
- point to jar dependencies
 2017-09-26 17:34:04 -04:00
Richard Alam
02e2989ba2 - point to jar dependencies 2017-09-26 14:32:42 -07:00
Richard Alam
6d4201bac4 Merge pull request #4436 from ritzalam/use-pres-checker 
- lower timeout timer for validation
 2017-09-26 17:09:26 -04:00
Richard Alam
9d9df0eee0 - lower timeout timer for validation 
- change location of preschecker
 2017-09-26 14:07:51 -07:00
Anton Georgiev
0b6a7082ff Merge pull request #4431 from OZhurbenko/slide-change-fix 
HTML5 - fix for the bug with the current Slide being unset
 2017-09-26 16:39:05 -04:00
Oleksandr Zhurbenko
b02cbb3208 Removed redundand brackets 2017-09-26 13:36:47 -07:00
Anton Georgiev
e37bf63285 Merge pull request #4434 from perroned/fix-demopage-typo 
Fixes typo on api demo page
 2017-09-26 16:30:54 -04:00
Anton Georgiev
fe7130473d Merge pull request #4418 from KDSBrowne/xx-02-mute-show-bug 
[HTML5] - Mute button fix
 2017-09-26 16:30:38 -04:00
Richard Alam
94a1c95643 Merge pull request #4435 from ritzalam/use-pres-checker 
Use pres checker
 2017-09-26 16:18:13 -04:00
Richard Alam
67eb305552 - log pres checker command so we can try running on cmd line if it fails 2017-09-26 13:13:10 -07:00
Richard Alam
a124b2d0e8 - call presentation checker from bbb-web 2017-09-26 12:23:39 -07:00
perroned
f094e6b283 Fixes typo on api demo page 2017-09-26 14:02:49 -04:00
Richard Alam
1ff0ce9a1a Merge pull request #4433 from ritzalam/pres-checker 
- add standalone presentation checker
 2017-09-26 13:30:10 -04:00
Richard Alam
0a7a90a67a - add standalone presentation checker 2017-09-26 10:29:06 -07:00
Fred Dixon
ead8f766e7 Fixed spelling mistake 2017-09-25 22:25:19 -04:00
KDSBrowne
32187d446a rename service import and remove constants 2017-09-25 18:18:08 -07:00
Oleksandr Zhurbenko
76808b3e7d Fixed a bug with the current slide being unset 2017-09-25 17:00:08 -07:00
Fred Dixon
02e8d40cc5 Merge pull request #4430 from riadvice/2x-client-theme 
Replace AdvancedLabel base class by MX Text instead of Sparl Label.
 2017-09-25 18:23:59 -04:00
Ghazi Triki
a124ba64af Replace AdvancedLabel base class by MX Text instead of Sparl Label. 2017-09-25 21:28:55 +01:00
Anton Georgiev
91f912ce4b Merge pull request #4416 from OZhurbenko/mongo-indexing 
Added indexes for the html5 Mongo collections
 2017-09-25 15:57:07 -04:00
Richard Alam
ba2b9b0bc5 Merge branch 'riadvice-2x-client-theme' into bbb-2x-mconf 2017-09-25 11:46:31 -07:00
Richard Alam
fb0a9568cd Merge branch '2x-client-theme' of https://github.com/riadvice/bigbluebutton into riadvice-2x-client-theme 2017-09-25 11:40:41 -07:00
Ghazi Triki
e3fd1b4019 Updated file upload hint message. 2017-09-25 19:38:57 +01:00
KDSBrowne
cad085a495 add kicked prop 2017-09-25 11:38:36 -07:00
KDSBrowne
9a145c64a8 fix set properties and client kicked condition 2017-09-25 11:32:09 -07:00
Ghazi Triki
d57b3f42d9 Revert to the initial tunelling error for desktop sharing. 2017-09-25 19:16:13 +01:00
Ghazi Triki
507d8662ee Check screen share tunelling and update error message. 2017-09-25 19:08:28 +01:00
Anton Georgiev
2f2114c590 Merge pull request #4428 from antobinary/screenshare-logs 
[Flash Client 2.0] Log unnatural end of screenshare
 2017-09-25 13:24:12 -04:00
Anton Georgiev
89938dd1d4 log unnatural end of screenshare 2017-09-25 13:16:35 -04:00
KDSBrowne
31223e86ec remove nested user and voiceUser keys 2017-09-25 08:57:39 -07:00
KDSBrowne
00ac3b1a54 move functions to service and rename callback 2017-09-25 08:39:56 -07:00
Ghazi Triki
0728ba8ae3 Minor text updates for LoadingBar and QuotesView. 2017-09-25 15:29:48 +01:00
KDSBrowne
baa1f0955e change function signature line length 2017-09-25 07:13:14 -07:00