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
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
Felipe Cecagno
ad25125b19
reverted back the previous implementation of presentation_export as process/publish scripts instead of just one publish script; now rap-worker cleans the workspace when the presentation format is published, so presentation dependet formats can execute in the next run
2015-02-02 14:06:20 -02:00
Felipe Cecagno
d1bcfe9189
do not run the publish script if the process script failed
2015-02-02 13:59:29 -02:00
Felipe Cecagno
1de10b2339
protect rap-worker to write the processing_time file when the directory isn't there yet
2015-02-02 13:58:57 -02:00
Felipe Cecagno
6e11cbf602
Merge branch '090-new-videodock' into mconf-live0.6.2
2015-01-28 22:54:04 -02:00
Felipe Cecagno
d728b730ab
simplified the default profiles
2015-01-28 22:53:56 -02:00
Felipe Cecagno
14f112cf42
Merge branch '090-new-videodock' into mconf-live0.6.2
...
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/ControlButtons.mxml
bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/views/PublishWindow.mxml
record-and-playback/deploy.sh
2015-01-28 22:50:55 -02: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
Felipe Cecagno
fe348e0065
fixed the deploy scripts for record and playback
2015-01-28 19:20:11 -02:00
