Commit Graph

16272 Commits

Author SHA1 Message Date
Anton Georgiev
746ef9478c Merge pull request #3939 from KDSBrowne/userlist-accessibility
[HTML5] - Userlist accessibility improvement
2017-05-17 11:52:52 -04:00
Anton Georgiev
e9eef8119b recover meeting propery needed for lock settings 2017-05-17 11:51:25 -04:00
Anton Georgiev
b4f3c41993 Merge pull request #3951 from KDSBrowne/x0-change-locale-string-format
[HTML5] - Change the format of locale strings
2017-05-17 11:42:39 -04:00
KDSBrowne
a2520dbbbc change format for other locales 2017-05-17 08:35:24 -07:00
Anton Georgiev
a89c70a04c Merge branch 'userlist-accessibility' of github.com:KDSBrowne/bigbluebutton into userlist-accessibility 2017-05-17 11:27:17 -04:00
Anton Georgiev
fc831440c3 Merge pull request #3932 from antobinary/address-error-500-and-stuck-users
HTML5: Auto allow benign actions (logoutSelf); Disallow meteor calls if credentials are null
2017-05-17 11:25:16 -04:00
Anton Georgiev
49a1f09536 minor improve syntax based on review comment 2017-05-17 11:24:12 -04:00
Anton Georgiev
0579506e2e Merge pull request #3944 from Klauswk/FixUnselectableOption
Fix unselectable 'Choose Language' and fallback lang error.
2017-05-17 11:17:38 -04:00
KDSBrowne
985cf43a93 change message descriptions 2017-05-17 07:32:35 -07:00
Ghazi Triki
43d05ffa0b Remove presenterShareOnly option and all its implementation. 2017-05-17 14:30:54 +01:00
Ghazi Triki
f0d2a5dec2 Map presenterShareOnly options to lock settings. (reverted from commit 450c5d28f3) 2017-05-17 10:16:44 +01:00
KDSBrowne
97514dc5c5 remove default messages 2017-05-16 17:30:42 -07:00
KDSBrowne
2f79f3ff20 change locale stringformat 2017-05-16 17:02:27 -07:00
alexandre
81b2242055 Improving playback performance and video sync
- Popcorn "onFrame" method runs around 6 times per second. That was unnecessary , causing the CPU work to significantly increase, and preventing the two videos (deskshare and webcam) to run together smoothly

- We only synchronize the medias if one of them fires a "waiting" event. If the user pauses the playback, we synchronize them as well.
2017-05-16 18:34:10 -03:00
alexandrekreis
6a497c27f8 Merge pull request #4 from pedrobmarin/shapes-drawing
Refactored shapes drawing
2017-05-16 17:31:05 -03:00
Felipe Cecagno
654fd8c553 fix issue introduced by last commit, in which the full path of the deskshare video file was not provided in order to check if it was a valid video or not 2017-05-16 13:55:48 -03:00
KDSBrowne
f9fae74d08 fix merge conflicts 2017-05-16 09:33:26 -07:00
Anton Georgiev
f1a58eac24 Merge pull request #3941 from OZhurbenko/fix-issue-3938
[HTML5] Text Shape 2.0
2017-05-16 11:14:31 -04:00
Anton Georgiev
4e3282b3ea Merge pull request #3945 from Klauswk/FixLockUserIcon
Fix the lock user icon status
2017-05-16 10:14:24 -04:00
Klauswk
2c1507567d Update app.yaml 2017-05-16 11:10:44 -03:00
Klaus Klein
8d4b69b578 Remove unnecessary fields 2017-05-16 08:26:19 -03:00
JaeeunCho
87b013fd5b HTML5 - fixed fixed closed-caption display 2017-05-15 14:45:44 -07:00
Pedro Beschorner Marin
8ec81f84d4 Refactored shapes drawing 2017-05-15 21:07:42 +00:00
Ghazi Triki
450c5d28f3 Map presenterShareOnly options to lock settings. 2017-05-15 22:05:00 +01:00
JaeeunCho
3caebca201 Merge remote-tracking branch 'upstream/master' into hidden_closedCaption 2017-05-15 13:08:47 -07:00
Klaus Klein
2b53dd19e5 Code refactored 2017-05-15 16:45:00 -03:00
Klaus Klein
82f638384b Fix the lock user icon to work as flash, HTML5 2017-05-15 16:26:03 -03:00
Fred Dixon
2ccdb5cbcf Merge pull request #3943 from perroned/remove-plugin-popup
Hide Temasys Popup Fixes #3942
2017-05-15 13:36:00 -04:00
Klaus Klein
95b47fd54a Fix lang fallback error 2017-05-15 13:32:41 -03:00
perroned
a7c2542c0a Overwrites popup function 2017-05-15 12:16:30 -04:00
KDSBrowne
fc2a36f14b remove element refs not being used 2017-05-15 09:01:46 -07:00
Klaus Klein
81ab785daa Made 'Choose options' unselectable, HTML5 close #3935 2017-05-15 10:58:26 -03:00
Oleksandr Zhurbenko
371419c41c Text shape preserves white space now and handles new lines 2017-05-12 12:46:10 -07:00
JaeeunCho
92bc296bc0 HTML5 - fixed closed-caption display 2017-05-12 12:17:08 -07:00
KDSBrowne
9e672c2c88 remove commented code 2017-05-12 11:23:55 -07:00
KDSBrowne
a824ca2a79 fix lint issues 2017-05-12 11:11:42 -07:00
KDSBrowne
dd1e830dc2 fix merge conflicts 2017-05-12 10:52:12 -07:00
KDSBrowne
1940d49c4b fix aria labeling 2017-05-12 10:45:41 -07:00
Anton Georgiev
b9f75f88ae Merge pull request #3928 from JaeeunCho/locked_status
HTML5 - added locked status for users
2017-05-12 12:56:53 -04:00
Anton Georgiev
66852961d4 Merge pull request #3920 from JaeeunCho/hidden_title
Tested, seems fine
2017-05-12 11:53:42 -04:00
Anton Georgiev
932209bf06 Merge pull request #3898 from mmarangoni/audio-locale-fix
Tested, seems to work fine
2017-05-12 11:31:52 -04:00
Anton Georgiev
2e688e2a82 Merge pull request #3934 from antobinary/user-leaving-fix
HTML5: Fix issue with userLeave on breakout end
2017-05-12 09:47:34 -04:00
Anton Georgiev
b5601ecabc fix issue with userLeave on breakout end 2017-05-12 09:14:26 -04:00
Anton Georgiev
2e9c519e1a switch console logs for logClient 2017-05-12 08:24:06 -04:00
Anton Georgiev
82859dfc19 Merge pull request #3933 from antobinary/html5-demo
Demos: Allow username only logins (for demo purposes)
2017-05-11 17:36:59 -04:00
Anton Georgiev
2f56719ec6 handle the case of loging in only passing username 2017-05-11 16:29:23 -04:00
Anton Georgiev
25f752d63a Merge pull request #3931 from antobinary/increase-timeout-value
HTML5: Increase the connectionTimeout value for production
2017-05-11 15:28:58 -04:00
Anton Georgiev
3dc21e2cae increase the connectionTimeout value for production 2017-05-11 15:20:59 -04:00
Anton Georgiev
a4dcf72975 do not allow meteor calls if credentials are null 2017-05-11 15:18:34 -04:00
Anton Georgiev
5191168492 auto allow benign actions 2017-05-11 15:15:12 -04:00