Commit Graph

16404 Commits

Author SHA1 Message Date
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
Richard Alam
7e257f1536 - load conf file 2017-05-15 14:32:49 -07:00
Ghazi Triki
450c5d28f3 Map presenterShareOnly options to lock settings. 2017-05-15 22:05:00 +01:00
Richard Alam
ddde1b8a9f - do not use jedis for pubsub 2017-05-15 14:04:47 -07:00
Richard Alam
a88d33a930 - cleanup 2017-05-15 14:03:01 -07:00
Klaus Klein
2b53dd19e5 Code refactored 2017-05-15 16:45:00 -03:00
Richard Alam
477897ef4d - cleanup 2017-05-15 12:26:06 -07:00
Klaus Klein
82f638384b Fix the lock user icon to work as flash, HTML5 2017-05-15 16:26:03 -03:00
Richard Alam
a1071ce7ba - try to wire spring for bbb-apps 2017-05-15 12:23:54 -07: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
Richard Alam
a5654804cc - handle bbb-apps messages 2017-05-14 16:03:50 -07:00
Richard Alam
f610e4e2ce Merge branch 'move-java-classes-from-bbb-web-to-bbb-common-web' of github.com:ritzalam/bigbluebutton into move-java-classes-from-bbb-web-to-bbb-common-web 2017-05-12 15:34:54 -07:00
Richard Alam
c0e4a4d681 - handle json message in akka apps 2017-05-12 15:33:46 -07:00
Richard Alam
a6016c8bc3 - handle cleint message 2017-05-12 14:08:58 -07:00
Richard Alam
a077748c57 - start setup akka system for bbb-apps 2017-05-12 13:11:28 -07: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
Richard Alam
d88da415c6 - split bbb-apps into bbb-apps-common 2017-05-12 10:31:18 -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
Richard Alam
9a628da93d - remove bbb-commons-message dependency 2017-05-10 17:21:55 -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
Richard Alam
b55beeb8fa - wire up redis publisher 2017-05-10 14:37:14 -07:00
Richard Alam
0d53d2bf93 - fix compile issues 2017-05-10 14:24:36 -07:00
JaeeunCho
fc5856a4ce HTML5 - linted code 2017-05-10 14:05:18 -07:00