Anton Georgiev
|
1f7b751ee6
|
user join was not triggering for html5 client users. using the token instead of userID to find the user
|
2015-01-30 22:12:31 +00:00 |
|
Anton Georgiev
|
f8675a72f4
|
Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into chat-quotes
Conflicts:
bigbluebutton-web/src/java/org/bigbluebutton/api/MeetingService.java
|
2015-01-30 17:37:54 +00:00 |
|
Anton Georgiev
|
3f867f205f
|
Merge branch 'testing-version' of https://github.com/OZhurbenko/bigbluebutton into chat-quotes
|
2015-01-30 17:35:10 +00:00 |
|
Anton Georgiev
|
d83935c08e
|
Merge branch 'new-branch' of github.com:perroned/bigbluebutton into chat-quotes
|
2015-01-30 17:33:21 +00:00 |
|
Anton Georgiev
|
c36e71c9cc
|
fix some log strings
|
2015-01-30 17:31:08 +00:00 |
|
Richard Alam
|
63d586bf77
|
Merge pull request #502 from capilkey/090-accessibility-fixes
First pass of accessibility fixes for 0.9.0
|
2015-01-30 11:11:10 -05:00 |
|
Chad Pilkey
|
672348eafe
|
labelling and tab order fixes for accessiblity
|
2015-01-30 08:03:36 -08:00 |
|
Richard Alam
|
555d6436e9
|
Merge pull request #501 from kepstin/ser-repair
bbb-record: also delete the sanity '.fail' file on --rebuild
|
2015-01-30 10:24:34 -05:00 |
|
Calvin Walton
|
e30ccd0983
|
bbb-record: also delete the sanity '.fail' file on rebuild
This allows a rebuild to redo the sanity check if needed.
|
2015-01-30 10:21:09 -05:00 |
|
Richard Alam
|
86a7dada71
|
Merge pull request #500 from kepstin/ser-repair
Skip the 'ser' repair if there are no webcam videos
|
2015-01-30 10:19:13 -05:00 |
|
Calvin Walton
|
c90e5f8990
|
Skip the 'ser' repair if there are no webcam videos
This was causing the sanity check to fail.
|
2015-01-30 10:11:44 -05:00 |
|
perroned
|
fe6ae739c2
|
Prevent close tab button from being hidden
|
2015-01-30 07:06:24 -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 |
|
perroned
|
919321d793
|
Prevent row from dropping by a few pixels when hovering a private tab
|
2015-01-29 09:53:31 -08:00 |
|
Oleksandr Zhurbenko
|
78bf4818ba
|
Added text wrapping to whiteboard
|
2015-01-29 09:52:04 -08:00 |
|
perroned
|
c969d75730
|
Move notification class to parent tab element
|
2015-01-29 09:24:59 -08:00 |
|
perroned
|
46efa8cfa0
|
Fixing chat tabs dropping to a new line.
|
2015-01-29 08:59:32 -08:00 |
|
Chad Pilkey
|
a03a1736e3
|
Merge pull request #499 from bigbluebutton/fix-presentation-text-file-url
- fix the presentation text file url
|
2015-01-28 16:53:56 -05:00 |
|
Richard Alam
|
332c252b92
|
- fix the presentation text file url
|
2015-01-28 21:52:17 +00: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 |
|
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 |
|
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 |
|