Commit Graph

9428 Commits

Author SHA1 Message Date
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
Maxim Khlobystov
c30ed0e046 Fixed the leak in one of the tests that was creating abandoned users in a meeting. 2015-01-26 16:24:55 -08:00
Maxim Khlobystov
93a1cb90e0 Added the specs to test the top of the page behaviour while scaling the page horizontally on desktop. 2015-01-26 16:17:56 -08: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
Maxim Khlobystov
ee06ff10f6 Added the spec to verify the whiteboard presentation successfully loads. 2015-01-25 11:11:56 -08:00
Maxim Khlobystov
a3eff36394 Beginning work on the acceptance tests for the log in/out process. 2015-01-24 18:14:46 -08:00
Maxim Khlobystov
44e851a2c4 Added some acceptance tests to verify that public chat messages work correctly. 2015-01-24 18:13:29 -08:00
Maxim Khlobystov
669fd71b79 Merge branch 'testing-version-11' of https://github.com/antobinary/bigbluebutton into meteor-client-nightwatch 2015-01-24 17:46:02 -08:00
Maxim Khlobystov
543b002165 Added Selenium and Nightwatch.js support. 2015-01-24 17:44:29 -08:00
Oleksandr Zhurbenko
53f00f6028 Merge branch 'testing-version-11' of https://github.com/antobinary/bigbluebutton into testing-version 2015-01-23 13:40:42 -08: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
Anton Georgiev
e6301b2cef Merge branch 'testing-version' of https://github.com/OZhurbenko/bigbluebutton into testing-version-12 2015-01-23 18:42:07 +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
Oleksandr Zhurbenko
dd5a341f1a Fixed whiteboard text positioning 2015-01-23 09:41:28 -08:00
Anton Georgiev
03c5d46473 Merge branch 'new-branch' of https://github.com/perroned/bigbluebutton into testing-version-11 2015-01-22 14:30:06 +00: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
perroned
a0aefb845d Fix text overflow for chat button 2015-01-21 13:07:17 -08:00
perroned
580d84c9fa add slide spacing on startup 2015-01-21 12:30:57 -08:00
perroned
06c4c71d18 add bottom border for whiteboard slide when resizing 2015-01-21 12:02:50 -08:00
perroned
77ee0a14f7 removed resizing from chatbar file 2015-01-21 12:02:04 -08:00
perroned
189ef5f7a9 spacing for whiteboard slide 2015-01-21 12:01:24 -08:00
perroned
486a25fcf4 Moved resizing windows to globals 2015-01-21 12:00:43 -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
perroned
8c36a145f5 Solved sorting of users list 2015-01-21 10:28:45 -08:00
Maxim Khlobystov
c89f4d64c5 Merge branch 'new-branch' of https://github.com/perroned/bigbluebutton into meteor-client-jasmine 2015-01-20 11:55:01 -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
perroned
8e4c27c13b Clear session. Prevent left over data allowing re-entry 2015-01-20 08:01:17 -08:00
perroned
45458c3f0c Fixing title name 2015-01-20 06:55:03 -08: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