Commit Graph

16279 Commits

Author SHA1 Message Date
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
Chad Pilkey
372b154e35 properly clip whiteboard annotations so they don't overflow 2017-05-12 15:17:46 -04: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
Chad Pilkey
2bcfc2217e zoom value no longer required for drawing annotations 2017-05-11 22:22:07 -04:00
Chad Pilkey
9f9f5aea94 improve PollObject scaling again 2017-05-11 20:51:25 -04:00
Chad Pilkey
a7366d611a normalize annotation thickness to preserve size 2017-05-11 20:32:51 -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
KDSBrowne
296f024d45 use the ref callback attribute 2017-05-11 07:11:17 -07:00
Chad Pilkey
ce81cbae86 fix TextObject fontsize scaling 2017-05-10 18:25:09 -04:00
Chad Pilkey
ce22063e42 remove outdated whiteboard ctrlkey code, try hard annotation edges 2017-05-10 18:24:42 -04:00
JaeeunCho
fc5856a4ce HTML5 - linted code 2017-05-10 14:05:18 -07:00
JaeeunCho
ca808195f2 HTML5 - added locked status for users 2017-05-10 14:02:50 -07:00
JaeeunCho
bd923e0f39 HTML5 - added locked status for users 2017-05-10 14:00:03 -07:00
KDSBrowne
73819c9d1d fix switch statment 2017-05-10 11:39:03 -07:00
KDSBrowne
7e0ff7bf76 clean up code more 2017-05-10 11:24:09 -07:00
KDSBrowne
f0bce326b9 clean up code 2017-05-10 11:10:27 -07:00
KDSBrowne
bd3c8fb405 add aria tags 2017-05-10 08:12:24 -07:00
Anton Georgiev
e8b01dcdcc Merge pull request #3909 from antobinary/fix-cc
HTML5: Changes to the closed captions settings menu
2017-05-10 07:48:58 -04:00
Fred Dixon
23d5de3d2a Merge pull request #3926 from riadvice/fix-arabic-locales
Use the correct Arabic locale for the flash client.
2017-05-10 06:59:06 -04:00
Ghazi Triki
a7f6d8483c Use the correct Arabic locale for the flash client. 2017-05-10 11:04:33 +01:00
Anton Georgiev
acb7ff80f8 Merge pull request #3924 from antobinary/address-error-500-and-stuck-users
HTML5: Add logic to trigger logout if user timed out on auth step
2017-05-09 16:18:35 -04:00
Anton Georgiev
e8fb481722 add logic to trigger logout if user timed out on auth step 2017-05-09 16:04:30 -04:00
Fred Dixon
10bd63e35d Merge pull request #3921 from hostbbb/load_flash_white
flash blue to white screen
2017-05-09 10:17:46 -04:00
KDSBrowne
9462221af6 remove unneeded ref and id's 2017-05-09 07:13:55 -07:00
KDSBrowne
735bdb4a87 fix query selector console error 2017-05-09 07:07:55 -07:00
Chad Pilkey
4519c6752a improve PollResult scaling 2017-05-08 19:17:16 -04:00
Chad Pilkey
76d21023e3 change DrawObject base class to Shape which is lighter than Sprite 2017-05-08 18:19:19 -04:00
Chad Pilkey
249f15c799 update PollResultObject to work with whiteboard 2.0 2017-05-08 18:18:55 -04:00
Stephen Dame
6fff8c0a8a flash blue to white screen 2017-05-08 14:09:47 -07:00
JaeeunCho
4012a0d077 HTML5 - fixed navbar to be displayed 2017-05-08 14:03:22 -07:00