BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
9,884 Commits 13 Branches 260 Tags 1.1 GiB
673d4d3316
Commit Graph

9884 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Felipe Cecagno
673d4d3316 changed the way layouts are applied to windows, attempting to fix the application of the remote layout when the user first joins 2015-05-24 19:12:10 -03:00
Felipe Cecagno
1f0ecdfa0e Merge branch 'fix-context-menu' into mconf-live0.6.2 
Conflicts:
	bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatView.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/deskshare/view/components/DesktopPublishWindow.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/deskshare/view/components/DesktopViewWindow.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/sharednotes/SharedNotesWindow.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/business/VideoWindowItf.as
	bigbluebutton-client/src/org/bigbluebutton/modules/videodock/views/VideoDock.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/views/WhiteboardToolbar.mxml
 2015-04-09 18:08:33 -03:00
Felipe Cecagno
0b15b59cae fixed localization for context menu items on presentation window, using the same text as the buttons tooltip 2015-04-09 18:04:04 -03:00
Felipe Cecagno
8dd9ee08e0 created a new class CustomMdiWindow to proper handle the context menu 2015-04-09 17:21:37 -03:00
Felipe Cecagno
c9185e9ba0 Merge branch '090-encrypted-recording' into mconf-live0.6.2 2015-04-06 17:06:41 -03:00
Felipe Cecagno
795c4c0af5 do not check anymore for archived.done file before processing the encrypted recording, because the archived flag is removed after the recording is published 2015-04-06 17:06:08 -03:00
Felipe Cecagno
b7eca98c92 force the browser to update the branding file using ?v=VERSION 2015-04-06 14:23:22 -03:00
Felipe Cecagno
ee792b2e52 modified the mconf demo so mobile devices launch the mobile app 2015-04-04 17:56:21 -03:00
Felipe Cecagno
13d15d0761 Merge branch 'issue1534' into mconf-live0.6.2 
Conflicts:
	bigbluebutton-client/src/org/bigbluebutton/main/views/LoggedOutWindow.mxml
 2015-04-01 10:19:17 -03:00
Felipe Cecagno
335a9a77a3 better message when the connection to the server has been rejected 2015-04-01 10:16:48 -03:00
Felipe Cecagno
bbd951c6eb cleanup localization files 2015-04-01 10:10:33 -03:00
Mateus Dalepiane
179129750a Include multiple tab warning in connection rejected message 
Included a message to inform the user that a connection rejected is
probably caused by multiple browser tabs joining the same conference.
 2015-04-01 09:53:14 -03:00
Mateus Dalepiane
ade75cc877 Improve logout dialog window 
Now the window ajusts itself to fit the message and the message is centered.
Also, removed reconnect button if the connection is rejected.

Conflicts:
	bigbluebutton-client/src/org/bigbluebutton/main/views/LoggedOutWindow.mxml
 2015-04-01 09:53:10 -03:00
Mateus Dalepiane
645d54933b Reject duplicate connections from same session 
bbb-apps now rejects duplicate connection attempts from the same session.
This fixes the problems that happened when a user connected to the same
conference in two different browser tabs, and ended up with two clients
in the same session.
 2015-04-01 09:50:46 -03:00
Felipe Cecagno
77bd320887 Merge branch 'audio-hints-flag' into mconf-live0.6.2 
Conflicts:
	bigbluebutton-client/src/org/bigbluebutton/main/views/MainApplicationShell.mxml
 2015-04-01 09:48:00 -03:00
Felipe Cecagno
99b0033dc4 cleanup 2015-04-01 09:42:28 -03:00
Felipe Cecagno
b5b038d912 logout url now is called using target=_parent 
Conflicts:
	bigbluebutton-client/src/org/bigbluebutton/main/views/LoggedOutWindow.mxml
 2015-03-29 21:44:24 -03:00
Felipe Cecagno
05fef6e5e5 Merge branch '090-multinotes' into mconf-live0.6.2 
Conflicts:
	bigbluebutton-client/src/org/bigbluebutton/modules/sharednotes/views/SharedNotesWindow.mxml
 2015-03-29 13:55:34 -03:00
Felipe Cecagno
ac1bd6d7ce fixed once again the issue where the notes updates do not get sent to the server (ref #1531) 2015-03-29 13:53:49 -03:00
Felipe Cecagno
f23ece0e37 Merge branch 'webrtc-timeout' into mconf-live0.6.2 2015-03-26 15:54:34 -03:00
Felipe Cecagno
3e333dd8fe Merge branch 'bbb-check-localization' into mconf-live0.6.2 2015-03-26 15:54:25 -03:00
Felipe Cecagno
2bf8afc11f Merge branch 'bbb-check-localization' of github.com:pedrobmarin/bigbluebutton into bbb-check-localization 2015-03-26 15:51:42 -03:00
Felipe Cecagno
cef741937b improved the way we calculate the dimension of the cancel button in the audio test dialog 2015-03-26 15:50:51 -03:00
Pedro Beschorner Marin
8dac9240bd English as locale fallback 2015-03-26 14:45:21 -03:00
Pedro Beschorner Marin
a2d7f43130 Added a config option to enable/disable WebRTC audio connection browser's hints 2015-03-26 12:38:43 -03:00
Felipe Cecagno
1d7f1604dd replace BigBlueButton in the localization files by Mconf-Live 2015-03-26 12:12:54 -03:00
Felipe Cecagno
69adf85522 Merge branch 'bbb-check-localization' into mconf-live0.6.2 2015-03-26 12:10:04 -03:00
Felipe Cecagno
c6bed30d9e a little better pt_BR translations 2015-03-26 12:09:44 -03:00
Richard Alam
c63c371e7b - fix issue https://code.google.com/p/bigbluebutton/issues/detail?id=1909 2015-03-25 21:58:09 -03:00
Pedro Beschorner Marin
6431d6f4d1 Basic portuguese localization 2015-03-25 18:58:44 -03:00
Mateus Dalepiane
7a0e75ace3 Merge branch 'mdalepiane/reconnect-webrtc' into mconf-live0.6.2 2015-03-25 12:10:04 -03:00
Calvin Walton
e1e2d78e50 Skip the 'ser' repair if there are no webcam videos 
This was causing the sanity check to fail.
 2015-03-24 21:15:49 -03:00
Calvin Walton
34b13eb807 Attempt to repair red5 'ser' files in sanity script 2015-03-24 21:15:49 -03:00
Felipe Cecagno
d8174e3d78 Merge branch '090-encrypted-recording' into mconf-live0.6.2 2015-03-24 21:15:44 -03:00
Felipe Cecagno
d4f0c2c229 fixed the start and end time on the encrypted format metadata, which is now based on epoch 2015-03-24 21:15:25 -03:00
Mateus Dalepiane
6b33495158 Auto re-connection for WebRTC calls on client 
The client tries to reconnect 3 times before failing and asking if
the user wants to use flash audio or cancel.
 2015-03-24 15:37:43 -03:00
Mateus Dalepiane
2d14eaf531 Fix WebRTC user agent callbacks 
This applies to connect and disconnect websocket events.
 2015-03-24 12:51:31 -03:00
Felipe Cecagno
2df21ae7e2 Merge branch 'webrtc-timeout' into mconf-live0.6.2 2015-03-21 12:38:39 -03:00
Felipe Cecagno
3c307490ef fixed the cancel button visibility when it take a while to enable webrtc but eventually it worked, so the next time the connecting window is presented, the cancel button should be hidden again instead of remain visible 
to test it, apply this patch:

diff --git a/bigbluebutton-client/resources/prod/lib/bbb_webrtc_bridge_sip.js b/bigbluebutton-client/resources/prod/lib/bbb_webrtc_bridge_sip.js
index b9b35bb..f497afa 100755
--- a/bigbluebutton-client/resources/prod/lib/bbb_webrtc_bridge_sip.js
+++ b/bigbluebutton-client/resources/prod/lib/bbb_webrtc_bridge_sip.js
@@ -33,7 +33,7 @@ function joinWebRTCVoiceConference() {
                                BBB.webRTCConferenceCallEnded();
                                break;
                        case 'started':
-                               BBB.webRTCConferenceCallStarted();
+                               setTimeout(function() { BBB.webRTCConferenceCallStarted(); }, 15000);
                                break;
                        case 'connecting':
                                BBB.webRTCConferenceCallConnecting();
@@ -79,7 +79,7 @@ function startWebRTCAudioTest(){
                                BBB.webRTCEchoTestEnded();
                                break;
                        case 'started':
-                               BBB.webRTCEchoTestStarted();
+                               setTimeout(function() { BBB.webRTCEchoTestStarted(); }, 15000);
                                break;
                        case 'connecting':
                                BBB.webRTCEchoTestConnecting();
 2015-03-21 12:38:08 -03:00
Calvin Walton
5a2c7bae69 Fix beta recording update script 
It had some leftover debug code that caused it to only convert the
first 10 recordings instead of all of them.

The name of the '.done' file is changed so the update will be re-run
automatically.
 2015-03-20 17:48:05 -03:00
Felipe Cecagno
bba8dfd553 Merge branch 'webrtc-timeout' into mconf-live0.6.2 2015-03-20 17:18:46 -03:00
Felipe Cecagno
2de9adafb8 change webrtc timeout to 60 seconds, and show the cancel button after 5 seconds trying to connect 2015-03-20 17:18:29 -03:00
Mateus Dalepiane
dcb7e19651 Set pdf2swf target Flash version to 7 to support Adobe AIR 
When generating swf files for later versions of Flash pdf2swf will insert an
unsupported command "allowDomain" into the generated swf files.
 2015-03-20 13:06:16 -03:00
Felipe Cecagno
6bab3adf61 Merge branch 'meeting-created-params' into mconf-live0.6.2 
Conflicts:
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/messaging/Constants.java
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/CollectorActor.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/api/Constants.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/api/InMessages.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/api/OutMessages.scala
	bigbluebutton-web/src/java/org/bigbluebutton/api/messaging/Constants.java
 2015-03-20 12:37:58 -03:00
Mateus Dalepiane
85497ea6c3 Adding information to the event "meeting_created_message" 
The following information was added:
+ moderator_pass (Moderator password)
+ viewer_pass (Viewer password)
+ create_time (Create time)
+ create_date (Create date)
 2015-03-20 12:32:43 -03:00
Mateus Dalepiane
514f2b928d Adding information to create_meeting_request event [Bug #1429] 
This information is necessary so bbb-apps can send with the
meeting_created_message event
 2015-03-20 12:32:43 -03:00
Mateus Dalepiane
85d5cb786b Merge pull request #9 from mdalepiane/ios-video-support 
iOS video support
 2015-03-18 19:10:46 -03:00
Mateus Dalepiane
d65b92fad2 Fix log level of FFmpeg and location of some logs 2015-03-18 19:07:00 -03:00
Mateus Dalepiane
122f065c05 Clean up after merge 2015-03-18 19:01:42 -03:00
Mateus Dalepiane
dabd9b2ae8 Merge branch 'ios-video-support' into mconf-live0.6.2 
Conflicts:
	bbb-video/src/main/java/org/bigbluebutton/app/video/VideoApplication.java
 2015-03-18 18:52:01 -03:00