Commit Graph

4280 Commits

Author SHA1 Message Date
Richard Alam
e53ed90859 Merge pull request #2823 from ritzalam/fix-demo11-api-example
- convert all external ids in js api into internal user ids as using…
2015-10-06 15:00:33 -04:00
Richard Alam
a2cf908425 - convert all extarnal ids in js api into internal user ids as using external user ids breaks when
a user joins twice into the meeting
2015-10-06 17:57:39 +00:00
Chad Pilkey
6f69330b77 Added scrolling dots to the reconnect popup 2015-10-05 12:26:44 -07:00
Richard Alam
c3aa194e00 - update to latest locales (oct 5, 2015) 2015-10-05 15:59:07 +00:00
Richard Alam
f20b919ec2 Merge pull request #2818 from kepstin/ff-41-0-1-hang-workaround
Workaround Firefox 41.0.1 hang on Windows
2015-10-05 11:32:43 -04:00
Richard Alam
93ba04ce4c Merge pull request #2814 from capilkey/fix-2810
Fix 2810
2015-10-05 11:32:34 -04:00
Calvin Walton
dbd79cebb5 Workaround Firefox 41.0.1 hang on Windows
On this particular browser, switch the Flash embed window mode to "opaque"
instead of "window". This causes buttons and right-click to be somewhat
unresponsive, but is still better than a complete browser hang.

The browser versions that the workaround is applied to is extremely limited,
because of the sideeffects.
2015-10-05 11:26:31 -04:00
Chad Pilkey
81ced7193b Only show annotations for the current whiteboard 2015-10-02 15:03:40 -07:00
Chad Pilkey
04ce742fd7 Make sure whiteboard text is published to the correct whiteboardID 2015-10-02 15:02:13 -07:00
Richard Alam
5dd139f2f4 - do not user external user id to find user 2015-09-30 20:07:05 +00:00
Richard Alam
93dd5186b4 - user internal user id for user in the voice conf 2015-09-30 18:55:17 +00:00
Chad Pilkey
0627afa2e5 Add a default message length to avoid issues of missing property 2015-09-24 14:17:07 -07:00
Chad Pilkey
4c4d35a760 Merge pull request #2787 from riadvice/chat-message-limit
The use is able to write a multi-line chat message.
2015-09-24 17:15:43 -04:00
Anton Georgiev
4253faa426 remove extra condiction 2015-09-24 16:05:41 +00:00
Anton Georgiev
2bd601cc08 simplify html5 redirect #2801 2015-09-24 15:58:17 +00:00
Anton Georgiev
07dfd89dd7 Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton 2015-09-23 21:24:34 +00:00
Anton Georgiev
6cfc16cde5 offer redirect to HTML5 only if available 2015-09-23 21:24:19 +00:00
Richard Alam
ee7ef24397 - change fielname to be the same as on server 2015-09-23 20:04:39 +00:00
Chad Pilkey
e9c0eb23cd rename bbb-client in .project file for better importing 2015-09-21 14:13:32 -07:00
Chad Pilkey
15a2ade0aa Merge remote-tracking branch 'ritzalam/fix-lock-settings' into investigate-locking-more 2015-09-21 13:50:44 -07:00
Chad Pilkey
d0366b2fba Make sure PhoneOptions are initialized before using 2015-09-21 13:46:16 -07:00
Chad Pilkey
6377f86ca1 make sure the user item renderers update when locking changes 2015-09-21 13:45:18 -07:00
Chad Pilkey
a736008046 fix locking being reversed 2015-09-21 13:44:23 -07:00
Richard Alam
11fbefb5ef - make lock settings behave like in 0.9 2015-09-21 20:42:04 +00:00
Richard Alam
5a986f5bc6 - change logging format 2015-09-21 13:55:23 +00:00
Ghazi Triki
57d94bd5e4 The use is able to write a multi-line chat message. 2015-09-17 10:37:56 +01:00
Ghazi Triki
920fc97532 Merge branch 'master' into client-logging-to-server 2015-09-16 21:11:33 +01:00
Richard Alam
c13e17a7d4 Merge pull request #2770 from riadvice/chat-message-limit
Add a maximum allowed length to chat message
2015-09-16 15:04:26 -04:00
Ghazi Triki
07d7f389c1 Logging format can be configured in flex client application. 2015-09-16 18:55:09 +01:00
Richard Alam
cc5c26b0bc Merge pull request #2785 from ritzalam/log-flash-capabilities
Log flash capabilities
2015-09-16 10:39:52 -04:00
Richard Alam
899b98f81b Merge pull request #2780 from riadvice/puffin-browser
Enable video and audio sharing for Puffin browser 4.6 and above.
2015-09-15 16:12:25 -04:00
Richard Alam
2bea0c778c - clean-up by removing some debug logs 2015-09-15 20:04:06 +00:00
Richard Alam
99569d7a2b - log flash player capabilities to aid us in debugging issues 2015-09-15 19:20:36 +00:00
Richard Alam
8afb3b8edf - clean up by removing some logs 2015-09-15 19:20:09 +00:00
Richard Alam
e24b8c7cbe Merge pull request #2781 from riadvice/pepperflash-webcam-fix
Microphone name automatically set under Pepper flash before getting the browser permission.
2015-09-15 10:52:43 -04:00
Richard Alam
1eac9dc709 Merge pull request #2783 from ritzalam/capilkey-fix-lock-settings
fix lock settings
2015-09-15 10:40:03 -04:00
Richard Alam
643e7b7087 - cleanup 2015-09-15 14:38:41 +00:00
Richard Alam
bbfbdf20e9 - cleanup 2015-09-14 21:25:27 +00:00
Richard Alam
44763bf283 - try to fix lock settings 2015-09-14 20:18:27 +00:00
Richard Alam
247239caeb Merge branch 'figure-out-why-lock-settings-not-working' into capilkey-fix-lock-settings 2015-09-14 15:51:15 +00:00
Richard Alam
8514eec3ba Merge branch 'remove-java-warning-chrome' of https://github.com/capilkey/bigbluebutton into capilkey-fix-lock-settings 2015-09-14 14:21:20 +00:00
Ghazi Triki
405840edc4 Microphone name automatically set under Pepper flash before getting the browser permission. 2015-09-12 13:31:02 +01:00
Ghazi Triki
65f1b72294 Enable video and audio sharing for Puffin browser 4.6 and above. 2015-09-12 12:35:12 +01:00
Chad Pilkey
e364a8c130 correct the vote counts in the accessbile poll message 2015-09-11 15:00:14 -07:00
Chad Pilkey
5eba1622ac remove an unused variable in the poll graphics 2015-09-11 14:59:52 -07:00
Richard Alam
cfa6e30b23 Merge branch 'master' into client-to-server-logging 2015-09-10 17:52:58 +00:00
Richard Alam
977d4ba081 Merge pull request #2773 from ritzalam/update-locales
- pulling locales from transifex (sept 10, 2015)
2015-09-10 13:42:23 -04:00
Richard Alam
df19e44bc3 Merge pull request #2774 from kepstin/mixed-content
Use protocol-relative links to load the 'get flash' button image
2015-09-10 13:33:58 -04:00
Richard Alam
8a464a4f23 Merge pull request #2772 from capilkey/remove-java-warning-chrome
removed warning for Java not being installed with Chrome 42+
2015-09-10 13:27:08 -04:00
Calvin Walton
e7008957c9 Use protocol-relative links to load the 'get flash' button image
This fixes a mixed content warning when loading the client over https
2015-09-10 11:53:36 -04:00