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

9845 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Mateus Dalepiane
8ae1ab7698 Improving H263 logs 2015-03-18 17:40:12 -03:00
Mateus Dalepiane
f282180683 Launch FFmpeg when convertion is necessary 
Launch FFmpeg when a client plays a stream with stream name beginning
with "h263/". Also keep track of how many clients are listening to a
converted stream, and closes it when no longer used.
 2015-03-18 17:29:07 -03:00
Pedro Beschorner Marin
7372d12e51 Added a timeout cancel button in WebRTC audio connection 2015-03-18 16:59:26 -03:00
Mateus Dalepiane
cd2f91d8e9 Check if video convertion is necessary 
Check whether client is trying to play a stream starting with "h263/",
this indicates that the video must be converted.
 2015-03-18 14:37:30 -03:00
Mateus Dalepiane
64cf2abdc5 Check bbb video connection parameters 
This is necessary because ffmpeg do not pass these paraemters, but
should connect anyway.
 2015-03-18 11:53:59 -03:00
Felipe Cecagno
9780df5b13 Merge branch '090-deskshare-window' into mconf-live0.6.2 2015-03-04 12:34:48 -03:00
Felipe Cecagno
8bac97b10c adding the missing pt_BR strings 2015-03-04 12:34:34 -03:00
Felipe Cecagno
43d78b656b Merge branch '090-new-videodock' into mconf-live0.6.2 2015-03-04 11:57:52 -03: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
Felipe Cecagno
bb330cf0a2 Merge branch '090-deskshare-window' into mconf-live0.6.2 
Conflicts:
	bigbluebutton-client/resources/prod/layout.xml
	bigbluebutton-client/resources/prod/lib/deployJava.js
	bigbluebutton-client/src/org/bigbluebutton/main/views/MainApplicationShell.mxml
 2015-03-02 00:25:02 -03:00
Felipe Cecagno
7fee4ac0d0 improved the desktop sharing publish window preview 2015-03-02 00:23:18 -03:00
Chad Pilkey
815be28d0b Revert "Revert "Added Java check to the configuration notifications"" 
This reverts commit 82545a03f3.
 2015-03-02 00:53:10 +00:00
Felipe Cecagno
87151b5513 cleanup; deskshare view window toolbar appears on top of the deskshare video, no matter the way the window is scrolled 2015-03-01 20:27:17 -03:00
Felipe Cecagno
b88f652bf6 cleanup 2015-03-01 12:34:13 -03:00
Mateus Dalepiane
dfceb138b0 Implemented an auto hiding toolbar to toggle deskshare options 2015-03-01 12:27:20 -03:00
Mateus Dalepiane
9e9bbfc72e All resize operations work as expected 
The toggle button is still missplaced.
 2015-03-01 12:27:20 -03:00
Mateus Dalepiane
114fad22e6 Deskshare fit window/actual size button partially working 2015-03-01 12:27:20 -03:00
Mateus Dalepiane
f3ba92c087 Partially working 2015-03-01 12:27:20 -03:00
Felipe Cecagno
d6f587db7b Merge branch '090-force-listen-only' into mconf-live0.6.2 2015-02-17 21:08:01 -02:00
Felipe Cecagno
6cb8ca807e fixed some edge cases when using forceListenOnly and other problems due to the ability to use webrtc after using flash audio 2015-02-17 21:06:03 -02:00
Felipe Cecagno
538961c2f6 Merge branch '090-listen-only-by-default' into HEAD 2015-02-13 18:26:09 -02:00
Felipe Cecagno
fe69560cb1 Merge branch '090-java-detection' into mconf-live0.6.2 2015-02-12 15:51:54 -02:00
Felipe Cecagno
614dcdf31b purging completely the java detection branch 2015-02-12 15:51:43 -02:00
Felipe Cecagno
80e5c00510 Merge pull request #7 from mdalepiane/090-java-detection 
Reverting our Java detection changes
 2015-02-12 15:48:29 -02:00
Felipe Cecagno
6d52b3eeea Merge branch '090-guest-role' into mconf-live0.6.2 2015-02-12 15:47:40 -02:00
Felipe Cecagno
721663ab60 Merge pull request #8 from mdalepiane/090-guest-role 
Fix NPE in the register_user_request [Bug #1462]
 2015-02-12 15:47:15 -02:00
Mateus Dalepiane
5de1af44e0 Fix NPE in the register_user_request [Bug #1462] 2015-02-12 15:37:15 -02:00
Mateus Dalepiane
899a98d3c5 Reverting our Java detection changes 
Since BBB team also improved Java detection, we decided to revert our changes
and use theirs.
 2015-02-05 16:25:40 -02:00
Felipe Cecagno
9edb77fff1 Merge branch '090-encrypted-recording' into mconf-live0.6.2 2015-02-05 14:33:21 -02:00
Felipe Cecagno
91067c5172 handling the case when the getRecordings url for the mconf-decrypter is not set 2015-02-05 14:32:48 -02:00
Felipe Cecagno
64df664a52 Merge branch '090-download-chat' into mconf-live0.6.2 2015-02-05 14:22:22 -02:00
Felipe Cecagno
d74f28de7c Merge pull request #6 from mdalepiane/090-download-chat 
Fix chat toolbar resize bug
 2015-02-05 13:02:32 -02:00
Mateus Dalepiane
1b606dd95b Fix chat toolbar resize bug 
The ChatToolbar width depends on the ChatCanvas width. If the ChatBox is not
validated before the evaluation of the ChatToolbar width, the ChatCanvas might
have an old value. This results in a wrong ChatToolbar width.
 2015-02-04 17:57:50 -02:00
Felipe Cecagno
4b683e9bd1 Merge branch '090-java-detection' into mconf-live0.6.2 2015-02-03 17:08:59 -02:00
Felipe Cecagno
0bd0a8b30b reverted deployJava to the original, and changed a bit bbb_deskshare so the java detection works on Windows as well 2015-02-03 17:08:44 -02:00
Felipe Cecagno
e8f4e55d5f updating the mconf logo on presentation_export 2015-02-02 20:50:12 -02:00
Felipe Cecagno
c6c3122afa Merge branch '090-presentation-export' into mconf-live0.6.2 2015-02-02 20:36:15 -02:00
Felipe Cecagno
4f46e37727 changing permissions of the presentation export zipped file 2015-02-02 20:36:06 -02:00
Felipe Cecagno
cb50a8a304 Merge branch '090-presentation-export' into mconf-live0.6.2 2015-02-02 14:06:40 -02:00