Commit Graph

9272 Commits

Author SHA1 Message Date
Chad Pilkey
672348eafe labelling and tab order fixes for accessiblity 2015-01-30 08:03:36 -08:00
Chad Pilkey
364178857e reapplied the global shortcut keys 2015-01-29 10:03:13 -08:00
Chad Pilkey
69b250bea6 fixed the loading of the slide text 2015-01-29 10:02:12 -08:00
Fred Dixon
29f237db3d Merge pull request #498 from capilkey/fix-issue-1871
Fix issue 1871
2015-01-27 18:43:33 -05:00
Chad Pilkey
9580a9c350 removed forceListenOnly option from the PhoneModule, use presenterShareOnly instead 2015-01-27 15:27:41 -08:00
Chad Pilkey
ef21d9a22e changed the java help delay from 3 to 7 seconds 2015-01-27 15:26:37 -08:00
Fred Dixon
aec62628f5 Merge pull request #497 from SenecaCDOT-BigBlueButton/fix-java-revert
Revert "Revert "Added Java check to the configuration notifications""
2015-01-27 17:35:12 -05:00
Chad Pilkey
19fb9b9671 Revert "Revert "Added Java check to the configuration notifications""
This reverts commit 82545a03f3.
2015-01-27 14:19:02 -08:00
Fred Dixon
e3124e5b1f Merge pull request #496 from bigbluebutton/revert-490-client-pre-check
Revert "Added Java check to the configuration notifications"
2015-01-27 17:12:16 -05:00
Fred Dixon
82545a03f3 Revert "Added Java check to the configuration notifications" 2015-01-27 17:11:54 -05:00
Fred Dixon
57d82e3eb9 Merge pull request #490 from SenecaCDOT-BigBlueButton/client-pre-check
Added Java check to the configuration notifications
2015-01-27 17:11:36 -05:00
Chad Pilkey
84d6c5e132 added deskshare help information for Chrome users 2015-01-27 13:54:24 -08:00
Fred Dixon
bd2bb0e393 Merge pull request #495 from kepstin/ser-repair
Attempt to repair red5 'ser' files in sanity script
2015-01-27 14:04:18 -05:00
Calvin Walton
c6f976db4b Attempt to repair red5 'ser' files in sanity script 2015-01-27 14:01:29 -05:00
Fred Dixon
144d895237 Merge pull request #494 from bigbluebutton/add-connection-id-to-user-info
This is intended to fix both https://code.google.com/p/bigbluebutton/issues/detail?id=1570 and https://code.google.com/p/bigbluebutton/issues/detail?id=1869
2015-01-26 11:22:42 -05:00
Richard Alam
05ea33b261 - append connection number to userid. This allows us to track the connection for a user and clean
up properly the users list when the user gets disconnected. Also, it allows us to track how many
   times a user gets disconnected in the meeting.
2015-01-26 15:31:12 +00:00
Richard Alam
71a2ca9443 - add connection number to userid so we are able to match the user with connection attempts 2015-01-23 20:02:40 +00:00
Richard Alam
7f2caf852f - use the passed in authToken from bbb-web to validate in bbb-apps 2015-01-23 20:01:44 +00:00
Richard Alam
5798f727c5 - add sessionId in user info so we know if user is connected using Red5 or NodeJS 2015-01-23 20:00:13 +00:00
Richard Alam
ee7731626b - try to format logging 2015-01-23 19:59:26 +00:00
Richard Alam
192a2ccd0d - remove unused code 2015-01-23 19:54:15 +00:00
Chad Pilkey
8cb29e1ccc Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into client-pre-check 2015-01-23 10:36:24 -08:00
Fred Dixon
b6652925ad Merge pull request #492 from SenecaCDOT-BigBlueButton/extra-webcam-warning
Added extra webcam warning for Chrome users
2015-01-21 17:26:35 -05:00
Chad Pilkey
742bd1a423 added extra webcam warning for Chrome users 2015-01-21 14:21:26 -08:00
Fred Dixon
02bc78c9a0 Merge pull request #491 from SenecaCDOT-BigBlueButton/webrtc-audio-fixes
Three fixes for audio in the Flash client
2015-01-21 16:30:53 -05:00
Chad Pilkey
8a3fca5d3b fix for issue 1868 2015-01-21 13:22:40 -08:00
Chad Pilkey
9032afdb38 Merge remote-tracking branch 'upstream/master' into client-pre-check 2015-01-21 11:41:24 -08:00
Chad Pilkey
80e58d1ee3 added java check to the configuration notifications 2015-01-21 11:40:55 -08:00
Fred Dixon
ab9753344a Merge pull request #489 from bigbluebutton/update-spanish-locales
- update locales from transifex
2015-01-20 13:52:51 -05:00
Richard Alam
26c6ca0fd1 - update locales from transifex 2015-01-20 18:47:19 +00:00
Fred Dixon
39e9ccf1e5 Merge pull request #488 from bigbluebutton/update-locales-jan-20-2015
- updating locales
2015-01-19 17:17:04 -05:00
Richard Alam
95776a62bd - updating locales 2015-01-19 18:38:00 +00:00
Chad Pilkey
794cbf9e97 Merge pull request #487 from SenecaCDOT-BigBlueButton/client-pre-check
change warnings to notifications
2015-01-19 13:25:06 -05:00
Chad Pilkey
12d3a34ff5 change warnings to notifications 2015-01-19 10:22:15 -08:00
Chad Pilkey
b89a587c0b Merge pull request #486 from SenecaCDOT-BigBlueButton/client-pre-check
minor tweaks to the configuration warnings
2015-01-16 17:58:17 -05:00
Chad Pilkey
5a9a2a0a6c minor tweaks to the configuration warnings 2015-01-16 13:39:44 -08:00
Fred Dixon
74d54ace4a Merge pull request #485 from SenecaCDOT-BigBlueButton/client-pre-check
Client pre check
2015-01-15 19:23:18 -05:00
Chad Pilkey
9be9cca051 added a configuration warning system to the flash client 2015-01-15 16:14:49 -08:00
Fred Dixon
c5f0273075 Merge pull request #484 from ffdixon/fix-copyright
Updated copyright date on home page demo
2015-01-15 18:28:20 -05:00
Fred Dixon
1150572f3f Updated copyright date on home page demo 2015-01-15 18:25:30 -05:00
Chad Pilkey
fa7fa71f41 updated ChatOptions default fontSize to match config.xml.template 2015-01-15 15:19:00 -08:00
Chad Pilkey
f67c68e728 made the chat message spacing a little tighter 2015-01-15 15:16:38 -08:00
Chad Pilkey
985f08895a removed the unused jssip library 2015-01-15 15:15:30 -08:00
Chad Pilkey
94377d5da9 removed old js files from html experiment 2015-01-15 15:13:44 -08:00
Chad Pilkey
644ad523c5 removed the old Settings module 2015-01-15 15:12:24 -08:00
Fred Dixon
745c89a7b2 Merge pull request #483 from bigbluebutton/prevent-dispatching-of-join-event-twice
- prevent dispatching of join event twice whihc triggers loading of mod...
2015-01-14 18:29:25 -05:00
Richard Alam
3579ad2122 - prevent dispatching of join event twice whihc triggers loading of modules twice 2015-01-14 21:04:43 +00:00
Fred Dixon
5249c02ca6 Merge pull request #482 from bigbluebutton/fix-number-of-modules-display-when-loading
Fix number of modules display when loading
2015-01-14 15:47:00 -05:00
Richard Alam
083d85687c - fix formatting 2015-01-14 19:44:34 +00:00
Richard Alam
eca5c391bf - display the correct number of modules when loading. 2015-01-14 19:40:35 +00:00