BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
10,682 Commits 13 Branches 260 Tags 1.1 GiB
d906e6599e
Commit Graph

3284 Commits

Author SHA1 Message Date
Felipe Cecagno
9a68afd4ee dispatch successfully reconnected so modules can clean up before receive the latest updates; fixed updates on presentation and whiteboard when reconnected 2015-05-08 19:11:25 -03:00
Felipe Cecagno
19e54bfe66 refactored the autoreconnect capability 
- multiple disconnections are reestablished in order, first the main bigbluebutton connection, then the other connections
- if the user was sharing video, and the video connection drops, the video views close and it reconnect in a consistent state
- if the user is connected to webrtc and the main connection drops, the webrtc connection will still be active, then the server will send a UserLeft message to everyone and will reconnect the user as a phone user, so the UI continues consistent; when the user reconnects, it will reuse the voice information

IMPORTANT: modify external.xml in order to disable media timeout
/opt/freeswitch/conf/sip_profiles/external.xml:    <param name="rtp-timeout-sec" value="0"/>
 2015-05-08 12:43:25 -03:00
Felipe Cecagno
94a85470a0 cleanup 2015-05-08 12:38:19 -03:00
Felipe Cecagno
f8d5198177 implement time and multiple occurrences in the client warning window 2015-05-08 12:37:26 -03:00
Felipe Cecagno
884ae22d97 renamed a few functions on apps and client 2015-05-08 12:36:51 -03:00
Richard Alam
537786044c Merge pull request #637 from maxdoumit/Deskshare-TLS 
Deskshare tls
 2015-05-08 10:07:03 -04:00
maxdoumit
cd90de09f8 Changed names and removed unused function 2015-05-07 09:47:15 -07:00
maxdoumit
640c3dd4a0 Fixed bug, and added PORT support on the applet side 2015-05-07 08:40:57 -07:00
maxdoumit
d9e88b7620 Added TLS option for the screenshare applet 2015-05-06 12:18:28 -07:00
Felipe Cecagno
5fab4ae1c5 cleanup 2015-05-06 15:49:42 -03:00
Felipe Cecagno
f6c3b85744 Merge branch 'auto-reconnect' into HEAD 
Conflicts:
	bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/business/VideoProxy.as
	bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/maps/VideoEventMapDelegate.as
	bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/views/VideoWindow.mxml
 2015-05-06 15:22:29 -03:00
Felipe Cecagno
0d26ca639f new attempt to fix the line endings 
this particular file has windows line endings
 2015-05-06 15:12:42 -03:00
Felipe Cecagno
c0813c11dd fixing line ending (again) on VideoProxy 2015-05-06 14:54:33 -03:00
Felipe Cecagno
c23fcaef0d Merge branch 'auto-reconnect' into HEAD 2015-05-06 13:23:23 -03:00
Mateus Dalepiane
bdf9d7f68a Update video window talking status on creation 2015-04-29 15:43:24 -03:00
Mateus Dalepiane
0662a242aa Merge branch 'bigbluebutton/master' into 090-new-videodock 
Conflicts:
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/users/UsersApp.scala
	bigbluebutton-client/src/org/bigbluebutton/main/views/CameraDisplaySettings.mxml
	bigbluebutton-client/src/org/bigbluebutton/main/views/VideoHolder.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/business/VideoWindowItf.as
	bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/views/ToolbarButton.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/videodock/views/VideoDock.mxml
 2015-04-29 12:10:41 -03:00
Mateus Dalepiane
1d2f980f85 Reset line endings to original 2015-04-29 11:12:50 -03:00
Anton Georgiev
4fd25ca8fd fixed the tooltip for Apply for the lock settings window 2015-04-22 18:46:50 +00:00
Chad Pilkey
4cf9251610 Chrome can manually allow NPAPI until version 45, modified publish window to match 2015-04-20 11:56:50 -07:00
Chad Pilkey
3265e647b3 removed the layout sync code 2015-04-13 09:27:21 -07:00
Chad Pilkey
1e732c5b98 fix for issue 1635, some of the values needed to be reset 2015-04-09 15:23:28 -07:00
Felipe Cecagno
aa4ec0c1a8 fixed localization for context menu items on presentation window, using the same text as the buttons tooltip 2015-04-09 17:57:08 -03:00
Felipe Cecagno
bdb2ad585f keep custom context menu items in the users window when the window is minimized or maximized; translate the context menu items when the localization is changed 2015-04-09 17:45:19 -03:00
Felipe Cecagno
46ae3c606c Merge branch 'fix-context-menu' into fix-context-menu-on-master 
Conflicts:
	bigbluebutton-client/src/org/bigbluebutton/modules/deskshare/view/components/DesktopPublishWindow.mxml
 2015-04-09 17:26:19 -03:00
Felipe Cecagno
8dd9ee08e0 created a new class CustomMdiWindow to proper handle the context menu 2015-04-09 17:21:37 -03:00
Fred Dixon
d355312715 Fixed typo in check for Chrome42OrHigher 2015-04-08 19:15:34 -04:00
Chad Pilkey
d6bd54825f fixed the footer link 2015-04-08 15:14:47 -07:00
Chad Pilkey
b8bfedcded added a desktop sharing warning for Chrome 42 2015-04-08 14:31:55 -07:00
Chad Pilkey
b9427c391a made a bunch of layout changes, still doesn't work 100% correct 2015-04-08 13:15:29 -07:00
Chad Pilkey
daf23751f8 removed the layout reset on presenter switch 2015-04-06 12:06:55 -07:00
Chad Pilkey
397b9e1389 increased the height of a TextArea in the echo tests 2015-04-06 12:06:22 -07:00
Chad Pilkey
475cbb4756 removed some unused layout options 2015-04-06 12:05:46 -07:00
Chad Pilkey
28b55f7df3 reset the TextToolbar position when it is made visible and avoid unnecessary redraws 2015-03-31 14:27:09 -07:00
Chad Pilkey
467538953d updated the webcam url regex to match the new userid format 2015-03-31 14:24:59 -07:00
Chad Pilkey
7d23a3adb1 reset the client layout even if the already selected item is clicked 2015-03-31 14:24:17 -07:00
Chad Pilkey
a082f8ede2 hopefully fix the flash mic list so that it repopulates 2015-03-31 14:22:10 -07:00
Chad Pilkey
6c6e092402 increase height of text in audio windows so it doesn't get cut off 2015-03-27 14:33:49 -07:00
Chad Pilkey
3245934d15 prevent enter from going into the input box 2015-03-27 14:33:15 -07:00
Chad Pilkey
3b5ab7cbbe improved the chat url regex 2015-03-27 14:32:27 -07:00
Richard Alam
2a0786d19c Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into fix-issue-1909 2015-03-25 21:15:20 +00:00
Richard Alam
315ac0688c - fix issue https://code.google.com/p/bigbluebutton/issues/detail?id=1909 2015-03-25 21:14:48 +00:00
Chad Pilkey
4814fe65a2 annotations now follow the mouse if it leaves the WhiteboardCanvas 2015-03-25 14:08:51 -07:00
Chad Pilkey
056f880a53 add URL parsing to private chat messages 2015-03-25 14:06:03 -07:00
Richard Alam
3f4bec3333 Merge pull request #585 from capilkey/fix-three-whiteboard-bugs 
Fix some whiteboard annoyances
 2015-03-25 10:11:01 -04:00
Chad Pilkey
7431f5186f reworked the pan and zoom so it breaks way less 2015-03-24 16:58:18 -07:00
Richard Alam
afa579b43e - comment out trace logs to minimize noise 2015-03-23 22:38:50 +00:00
Richard Alam
bd4b95b0af - fix https://code.google.com/p/bigbluebutton/issues/detail?id=1849 2015-03-23 22:28:28 +00:00
Chad Pilkey
80f44e5f21 switch from custom pop-up menu to modified combo box 2015-03-23 15:11:49 -07:00
Chad Pilkey
7a7619c311 avoid drawing the text tool input area outside the presentation bounds 2015-03-23 15:09:33 -07:00
Chad Pilkey
981d7c4d39 disable mouse input on the text annotations 2015-03-23 15:08:14 -07:00
Chad Pilkey
2423d934df remove unused TextDrawObject class, the real one is TextObject 2015-03-23 14:34:21 -07:00
Chad Pilkey
d8a3325337 moved 'Ready' text to locales 2015-03-23 14:33:16 -07:00
Richard Alam
1bc477e297 - pass external meeting id in client logs 2015-03-23 19:41:45 +00:00
Mateus Dalepiane
0a350a4ceb Client auto reconnection with bbb-voice 
The client reconnects automatically with bbb-voice if the connection
drops. Also, implemented mechanisms for auto reconnection of listen
only audio, but these are disabled because currently there is no way
to ensure that bbb-apps connection is already re-established.
 2015-03-20 17:21:50 -03:00
Mateus Dalepiane
cfbf739c01 Improve connection events handling in client voice 
NetConnection events Failed and Disconnected now trigger a
FlashLeftVoiceConferenceEvent and reset the module to the
initial state.
 2015-03-20 14:29:36 -03:00
Chad Pilkey
6bd3c4d1f4 Merge pull request #570 from BBBManager/bbb-lock-settings 
Bbb lock settings
 2015-03-20 13:09:17 -04:00
Mateus Dalepiane
d5e79788a6 Clean client users list when it connects to bbb-apps 
The list must be cleaned in case of re-connection, so the client
will have the most recent information about users.
 2015-03-20 14:04:28 -03:00
Mateus Dalepiane
246db98916 Fix indentation at AutoReconnect.as 2015-03-19 12:47:19 -03:00
Mateus Dalepiane
9ea7b3a7cb Move video NetStream creation to publish method 
The NetStream is not used until the client start publishing video,
therefore the NetStream creation may be delayed.

Also, removed redundant code on NetConnection closed handler. The
StopBroadcastEvent triggers the execution of stopBroadcasting(),
that does exactly the same thing.
 2015-03-19 12:30:20 -03:00
Felipe Cecagno
a06efd5490 setting back VideoProxy and VideoWindow to use Windows line ending (¬¬) 2015-03-19 12:02:57 -03:00
Felipe Cecagno
867e9b9b36 first attempt to use an auto-reconnection handler, still not working properly 2015-03-19 11:54:08 -03:00
Chad Pilkey
c5e0436204 added a 'ready' notification when the client starts up for screen readers 2015-03-18 14:21:01 -07:00
Tiago Daniel Jacobs
8b429dcaa6 Process lock event for all users to make the UI consistent. 2015-03-16 20:44:27 +00:00
Tiago Daniel Jacobs
64e72e9934 Fixed visibility of viewers locked label for a empty room with lockOnJoin false. 2015-03-16 20:03:56 +00:00
Tiago Daniel Jacobs
71d1d70a4e Hide label and checkbox of lockOnJoin configuration 2015-03-12 21:14:42 +00:00
Tiago Daniel Jacobs
e52262cf15 Added lockOnJoinConfigurable property to lock config (missed some files) 2015-03-12 20:52:52 +00:00
Tiago Daniel Jacobs
4fff479e03 Added lockOnJoinConfigurable property to lock config. 2015-03-12 20:52:38 +00:00
Richard Alam
778df2da9d Update ChatBox.mxml 2015-03-12 14:37:20 -04:00
Fred Dixon
c2d97d9cb6 Merge pull request #556 from matnunes/bugfix-1892 
Bugfix issue 1892 (ChatBox)
 2015-03-12 13:52:33 -04:00
Tiago Daniel Jacobs
3c6601a5df Fixing infinite loop in the presenter change event. 2015-03-10 05:36:13 +00:00
Tiago Daniel Jacobs
f4087ab270 Fixing infinite loop in the presenter change event. 2015-03-10 05:34:22 +00:00
Fred Dixon
cf5ab25ca0 Revert "Revert "Bbb lock settings fix"" 2015-03-04 16:47:35 -05:00
Chad Pilkey
34fdfb9f83 Revert "Bbb lock settings fix" 2015-03-04 11:49:13 -05:00
Felipe Cecagno
2d00bda3ea removed an ObjectUtil.toString that was causing the entire UI to freeze when there was an async error on UserVideo 2015-03-04 11:57:34 -03:00
Tiago Daniel Jacobs
9d53c765fa Redoing the changes to PhoneButton due to conflict on merge 2015-03-03 07:04:47 +00:00
Tiago Daniel Jacobs
34e2e48be2 Merging 2015-03-03 06:52:56 +00:00
Tiago Daniel Jacobs
cc9fdc1a9e Fixed layouts combo state when presenter mode is turned on/off 2015-03-03 06:34:56 +00:00
Tiago Daniel Jacobs
0033e36384 Fixed state of webcam button when leaving presenter state 2015-03-03 06:34:10 +00:00
Tiago Daniel Jacobs
3060b2ea7d Implemented method to check if lock is in use or not, refactored to use it in entire code. 2015-03-03 05:01:58 +00:00
Tiago Daniel Jacobs
647c0a83bc Code clean up and fixes to lock settings 2015-03-03 04:49:56 +00:00
Tiago Daniel Jacobs
95cf0167f2 Restored ability to lock/unlock individual users 2015-03-03 00:44:34 +00:00
Tiago Daniel Jacobs
7cd5fff1d6 Fixed display of the lock on join flag 2015-03-02 19:25:26 +00:00
Tiago Daniel Jacobs
bf62dd66a2 Fixed mute on start, added lock on join option 2015-03-02 18:06:09 +00:00
Richard Alam
e8c61c5356 - lower log level on some logs so we can filter 
- add a detection when a meeting actor has hung resulting in users not being able to do anything
 2015-02-26 16:02:21 +00:00
Richard Alam
27bb493473 Merge pull request #530 from capilkey/improve-webrtc-logging 
Improvements to WebRTC
 2015-02-24 16:26:33 -05:00
Chad Pilkey
c9939b1c7c fixed webrtc call failed callback 2015-02-24 12:14:25 -08:00
Chad Pilkey
0ebfec21f7 fixed an error with the webrtc warnings 2015-02-24 11:35:27 -08:00
Richard Alam
c1671f7a5d - remote stun related code 
- get meeting and user info so we can log more info when user fails to connect to Red5
 2015-02-20 19:54:24 +00:00
Richard Alam
7d7b29620d - change log level to warn 2015-02-18 15:48:23 +00:00
Richard Alam
65c35e1137 Merge pull request #520 from bigbluebutton/add-more-info-js-log 
- add more info into JS log
 2015-02-17 19:26:22 -05:00
Chad Pilkey
e6d3cd551d fixed a race condition in the webrtc javascript code, and added cause for error 1004 2015-02-17 16:11:42 -08:00
Richard Alam
931d1624d7 - add more info into JS log 2015-02-18 00:09:10 +00:00
Richard Alam
797be9ce10 Merge pull request #515 from capilkey/fix-blurriness 
fix blurriness in the client caused by Flex SDK 4.14
 2015-02-13 14:11:14 -05:00
Chad Pilkey
941b044cd7 fix blurriness in the client caused by Flex SDK 4.14 2015-02-13 10:49:23 -08:00
Fred Dixon
aa518d6ef0 Merge pull request #513 from capilkey/cut-call-time 
Cut WebRTC call time
 2015-02-12 18:13:09 -05:00
Chad Pilkey
229f446914 remove help button from the layout correctly 2015-02-12 14:27:54 -08:00
Chad Pilkey
d6ef5168c0 add support for webrtc call transferring, cuts join time in half 2015-02-12 14:25:41 -08:00
Richard Alam
aa0e92137b - remove querying of stun from flash. We will be doing this outside in JS instead. 2015-02-12 18:29:39 +00:00
Chad Pilkey
81b567aebc Merge remote-tracking branch 'upstream/master' into fix-issue-1866 2015-02-09 11:52:43 -08:00
Chad Pilkey
5326b9cca2 fixed issue 1865 - fit-to-width zoom issues 2015-02-09 11:51:45 -08:00
Chad Pilkey
ab4dfdf4f3 fixed two issues with the text toolbar sticking around when it shouldn't 2015-02-09 11:51:00 -08:00
Richard Alam
24b9c5c525 - store stun and turn servers in client 2015-02-06 21:05:12 +00:00
Richard Alam
cdc6daced8 - add support for configuring stun and turn servers 
- add new /stuns api to be called by the Flash client
 2015-02-06 19:46:56 +00:00
Chad Pilkey
ac220162dd add a context menu item to UserGrid to export user names 2015-02-04 12:33:08 -08:00
Chad Pilkey
ac373429b2 fix arrow keys in textboxes and slide change keybinds 2015-02-03 12:29:26 -08:00
Chad Pilkey
8eb7bc9ed8 Merge remote-tracking branch 'upstream/master' into fix-issue-1866 
Conflicts:
	bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/business/VideoWindowItf.as
 2015-02-03 12:27:16 -08:00
Mateus Bisotto
1fffd18153 Fixed issue in chatbox related described in: https://code.google.com/p/bigbluebutton/issues/detail?id=1892 2015-02-03 10:12:47 -02:00
Chad Pilkey
d4b4950aaf fixed an exception in VideoWindowItf 2015-02-02 16:36:43 -08:00
Richard Alam
e2eea34830 - fix exception that broke sharing of webcam 2015-02-02 19:34:26 +00:00
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
Felipe Cecagno
4cebd2cd27 fixed the issue of duplicating video streams on a just joined user 2015-01-28 21:32:58 -02:00
Felipe Cecagno
5938984886 removed the videodock code which is not used anymore 2015-01-28 21:32:01 -02:00
Felipe Cecagno
9a7bae79a8 Merge branch '090-new-videodock' into HEAD 
Conflicts:
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/users/UsersApp.scala
	bigbluebutton-client/src/org/bigbluebutton/main/views/CameraDisplaySettings.mxml
	bigbluebutton-client/src/org/bigbluebutton/main/views/MainApplicationShell.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/maps/VideoEventMap.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/maps/VideoEventMapDelegate.as
	bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/views/PublishWindow.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/views/ToolbarButton.mxml
	record-and-playback/deploy.sh
 2015-01-28 20:33:28 -02: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
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
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
Richard Alam
7f2caf852f - use the passed in authToken from bbb-web to validate in bbb-apps 2015-01-23 20:01:44 +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
Chad Pilkey
742bd1a423 added extra webcam warning for Chrome users 2015-01-21 14:21:26 -08:00
Chad Pilkey
8a3fca5d3b fix for issue 1868 2015-01-21 13:22:40 -08:00
Chad Pilkey
80e58d1ee3 added java check to the configuration notifications 2015-01-21 11:40:55 -08:00
Chad Pilkey
5a9a2a0a6c minor tweaks to the configuration warnings 2015-01-16 13:39:44 -08:00
Chad Pilkey
9be9cca051 added a configuration warning system to the flash client 2015-01-15 16:14:49 -08: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
644ad523c5 removed the old Settings module 2015-01-15 15:12:24 -08:00
Richard Alam
3579ad2122 - prevent dispatching of join event twice whihc triggers loading of modules twice 2015-01-14 21:04:43 +00: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
Chad Pilkey
8b7d0ddb24 font size in config, and two bugs with private chat squashed 2014-12-11 13:16:38 -08:00
Chad Pilkey
716d1f974b taking another shot at fixing the chat list stack overflow 2014-12-10 16:40:38 -08:00
Chad Pilkey
2b78ed2c09 reworked the layout pushing so that viewers don't get new rows 2014-12-10 11:17:33 -08:00
Chad Pilkey
0a1c74ce07 Merge remote-tracking branch 'upstream/master' into add-chat-fontsize-config 
Conflicts:
	bigbluebutton-client/src/org/bigbluebutton/modules/chat/services/ChatMessageService.as
 2014-12-08 13:11:34 -08:00
Chad Pilkey
c96e78d829 chat scrolling should be more robust and not rely on events firing 2014-12-08 13:07:40 -08:00
Richard Alam
3e4f2d930a Merge pull request #457 from SenecaCDOT-BigBlueButton/fix-chat-scrolling 
Rewrote chat scrolling so that it always scrolls as far down as possible
 2014-12-04 17:46:28 -05:00
Chad Pilkey
f12ac62a47 rewrote chat scrolling so that it always scrolls as far down as possible 2014-12-04 14:39:21 -08:00
Felipe Cecagno
afdf4d5f4f few tweaks to handle the warnings during the compilation of bigbluebutton-client 2014-12-03 16:57:39 -02:00
Richard Alam
d300b52fba Merge pull request #454 from SenecaCDOT-BigBlueButton/fix-presentation-mouseup 
Moved the whiteboard mouseup listener to the stage
 2014-12-01 18:25:18 -05:00
Chad Pilkey
5cdedb19b1 moved the whiteboard mouseup listener to the stage 2014-12-01 12:48:17 -08:00
Richard Alam
862bf0df0c Merge pull request #452 from SenecaCDOT-BigBlueButton/preload-slides 
Add the ability to preload slides
 2014-12-01 15:07:30 -05:00
Chad Pilkey
7774ac049d added a feature to pre-download the next 3 slides 2014-12-01 11:00:49 -08:00
Chad Pilkey
2bc0901ad9 added a missing variable type declaration 2014-12-01 10:59:09 -08:00
Richard Alam
630541abe2 Merge pull request #450 from mconf/fix1835 
Fix #1835
 2014-12-01 12:08:31 -05:00
Richard Alam
681c4a045e - disallow desktop sharing on Macs when using Chrome 38 and earlier 2014-11-27 14:45:30 -08:00
Richard Alam
73172a8336 - allow desktop sharing on Mac when using at least Chrome 38 2014-11-27 14:34:03 -08:00