Richard Alam
b591106aaa
- try to detect if the flash client and the jws app are still alive. If one of them
...
if dead, end screen sharing.
2016-08-18 19:49:32 +00:00
Richard Alam
34d8e2fbb3
Merge pull request #3294 from riadvice/breakout-room-logout-fix
...
Fix for breakout room logout issue
2016-08-18 11:55:58 -04:00
Ghazi Triki
6b93bd3130
Block user from joining any breakout room until all of them are created.
2016-08-18 15:12:57 +01:00
Richard Alam
76e7e6d568
Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into start-pause-stop-screen-sharing-with-webrtc
2016-08-17 18:44:49 +00:00
Richard Alam
6aab83589a
Merge branch 'screenshare-1.1' of https://github.com/antobinary/bigbluebutton into antobinary-screenshare-1.1
...
Conflicts:
bbb-screenshare/app/src/main/scala/org/bigbluebutton/app/screenshare/ScreenShareApplication.scala
bbb-screenshare/app/src/main/scala/org/bigbluebutton/app/screenshare/server/sessions/Screenshare.scala
bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/services/MessageReceiver.as
2016-08-17 18:40:28 +00:00
Anton Georgiev
9fb1c343f2
server side changes for switching recordType:String to record:Boolean
2016-08-11 21:30:06 +00:00
Anton Georgiev
f7cb97737d
ask akka-apps if allowed to start screenshare
2016-08-11 19:18:56 +00:00
Anton Georgiev
5eccf9297b
add send AllowUserToShareDesktopRequest; add bbb-common-messages
2016-08-10 16:10:01 +00:00
Ghazi Triki
7d2cef9b9f
Added recording options for breakout rooms.
2016-07-25 22:31:04 +01:00
Richard Alam
7882735076
Record breakout rooms
...
If the parent meeting is recorded, record also the breakout rooms.
2016-07-18 17:07:31 +00:00
Pedro Beschorner Marin
85e68a66ca
Merge remote-tracking branch 'origin/inactivity-timeout' into merging-to-1.0
...
Conflicts:
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/MeetingActor.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/api/InMessages.scala
bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/pubsub/MessagePublisher.java
bigbluebutton-client/locale/pt_BR/bbbResources.properties
bigbluebutton-client/src/org/bigbluebutton/main/events/BBBEvent.as
2016-06-27 19:57:48 +00:00
Pedro Beschorner Marin
78313fda46
Merge remote-tracking branch 'rafael/feature-1944' into rafafp-branches-merged-1.0
2016-06-22 14:23:59 +00:00
Pedro Beschorner Marin
4c432ee5bd
Merge branch 'feature-1931' into rafafp-branches-merged-1.0
...
Conflicts:
bigbluebutton-client/branding/default/style/css/BBBDefault.css
bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatBox.mxml
bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatToolbar.mxml
record-and-playback/presentation/scripts/publish/presentation.rb
2016-06-22 13:06:51 +00:00
Pedro Beschorner Marin
e12af55dc8
Merge remote-tracking branch 'rafael/fix-1969' into rafafp-branches-merged-1.0
2016-06-21 14:14:00 +00:00
Pedro Beschorner Marin
e47cd67903
Merge remote-tracking branch 'mconf/mconf-live0.7.5' into merging-to-1.0
...
Conflicts:
bbb-video/build.gradle
bbb-voice/build.gradle
bigbluebutton-apps/build.gradle
bigbluebutton-apps/src/main/scala/org/bigbluebutton/freeswitch/FreeswitchConferenceActor.scala
bigbluebutton-client/branding/default/style/css/BBBDefault.css
bigbluebutton-client/build.xml
bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatBox.mxml
bigbluebutton-client/src/org/bigbluebutton/modules/present/ui/views/PresentationWindow.mxml
bigbluebutton-web/src/groovy/org/bigbluebutton/api/RecordingServiceHelperImp.groovy
bigbluebutton-web/src/java/org/bigbluebutton/api/MeetingService.java
bigbluebutton-web/src/java/org/bigbluebutton/api/RecordingService.java
bigbluebutton-web/src/java/org/bigbluebutton/api/messaging/MessagingService.java
bigbluebutton-web/src/java/org/bigbluebutton/api/messaging/RedisMessagingService.java
deskshare/app/build.gradle
deskshare/build.gradle
2016-06-20 16:11:04 +00:00
Richard Alam
aafc420d53
Merge branch 'breakout-rooms-porto-algre-2015' of github.com:riadvice/bigbluebutton into merge-bbb-1.1-dev-java8-with-master
...
Conflicts:
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/LiveMeeting.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/MeetingModel.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/MessageSenderActor.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/BreakoutRoomApp.scala
bigbluebutton-client/src/org/bigbluebutton/main/views/MainApplicationShell.mxml
bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatView.mxml
bigbluebutton-client/src/org/bigbluebutton/modules/users/views/UsersWindow.mxml
bigbluebutton-web/grails-app/controllers/org/bigbluebutton/web/controllers/ApiController.groovy
bigbluebutton-web/src/java/org/bigbluebutton/api/MeetingService.java
2016-05-24 20:17:47 +00:00
Richard Alam
58c239bc43
Merge branch 'master' into merge-bbb-1.1-dev-java8-with-master
...
Conflicts:
akka-bbb-apps/build.sbt
akka-bbb-apps/src/main/java/org/bigbluebutton/core/api/IBigBlueButtonInGW.java
akka-bbb-apps/src/main/resources/application.conf
akka-bbb-apps/src/main/scala/org/bigbluebutton/Boot.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonActor.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonInGW.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/MeetingActor.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/MeetingModel.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/MessageSenderActor.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/RecorderActor.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/api/InMessages.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/api/OutMessages.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/api/ValueObjects.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/WhiteboardApp.scala
akka-bbb-fsesl/build.sbt
akka-bbb-fsesl/src/main/java/org/bigbluebutton/freeswitch/pubsub/receivers/RedisMessageReceiver.java
akka-bbb-fsesl/src/main/java/org/bigbluebutton/freeswitch/voice/freeswitch/ConnectionManager.java
akka-bbb-fsesl/src/main/java/org/bigbluebutton/freeswitch/voice/freeswitch/FreeswitchApplication.java
bbb-common-message/build.sbt
bbb-common-message/src/main/java/org/bigbluebutton/common/messages/Constants.java
bbb-common-message/src/main/java/org/bigbluebutton/common/messages/MessagingConstants.java
bbb-common-message/src/main/java/org/bigbluebutton/common/messages/Util.java
bigbluebutton-apps/build.gradle
bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/pubsub/redis/RedisPubSubMessageHandler.java
bigbluebutton-apps/src/main/webapp/WEB-INF/red5-web.xml
bigbluebutton-client/build.xml
bigbluebutton-client/resources/config.xml.template
bigbluebutton-client/resources/prod/BigBlueButton.html
bigbluebutton-client/src/org/bigbluebutton/common/Images.as
bigbluebutton-client/src/org/bigbluebutton/main/maps/ApplicationEventMap.mxml
bigbluebutton-client/src/org/bigbluebutton/main/model/users/Conference.as
bigbluebutton-client/src/org/bigbluebutton/modules/deskshare/utils/JavaCheck.as
bigbluebutton-client/src/org/bigbluebutton/modules/users/services/MessageReceiver.as
bigbluebutton-web/build.gradle
bigbluebutton-web/grails-app/conf/spring/resources.xml
bigbluebutton-web/grails-app/controllers/org/bigbluebutton/web/controllers/ApiController.groovy
bigbluebutton-web/src/java/org/bigbluebutton/api/MeetingService.java
bigbluebutton-web/src/java/org/bigbluebutton/api/domain/Meeting.java
bigbluebutton-web/src/java/org/bigbluebutton/api/messaging/MeetingMessageHandler.java
bigbluebutton-web/src/java/org/bigbluebutton/api/messaging/RedisMessagingService.java
record-and-playback/core/scripts/bigbluebutton.yml
2016-05-16 11:35:36 -04:00
Richard Alam
7ae9b7b204
Merge branch 'merge-webrtc-ds' of https://github.com/antobinary/bigbluebutton into antobinary-merge-webrtc-ds
...
Conflicts:
akka-bbb-apps/build.sbt
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/UsersApp.scala
akka-bbb-fsesl/build.sbt
akka-bbb-fsesl/src/main/java/org/bigbluebutton/freeswitch/voice/freeswitch/ESLEventListener.java
akka-bbb-fsesl/src/main/scala/org/bigbluebutton/freeswitch/VoiceConferenceService.scala
bbb-common-message/build.sbt
bbb-common-message/src/main/java/org/bigbluebutton/common/messages/Constants.java
bbb-common-message/src/main/java/org/bigbluebutton/common/messages/Util.java
bigbluebutton-apps/build.gradle
bigbluebutton-web/grails-app/conf/spring/resources.xml
bigbluebutton-web/src/java/org/bigbluebutton/api/MeetingService.java
2016-05-20 20:27:52 +00:00
Richard Alam
433f09f72d
Merge branch 'dfengBBB' of https://github.com/dfeng99/bigbluebutton into dfeng99-dfengBBB
...
Conflicts:
bbb-common-message/build.sbt
bigbluebutton-web/src/java/org/bigbluebutton/api/MeetingService.java
2016-05-20 15:40:50 +00:00
Richard Alam
9d6f0ff0bb
- publish bbb commons messages to local by default
2016-05-19 20:16:26 +00:00
Anton Georgiev
228dfb4061
Merge branch 'mod-verto-1' of github.com:antobinary/bigbluebutton into merge-webrtc-ds
...
Conflicts:
akka-bbb-apps/build.sbt
akka-bbb-apps/src/main/resources/application.conf
akka-bbb-apps/src/main/scala/org/bigbluebutton/SystemConfiguration.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/MessageSenderActor.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/UsersApp.scala
akka-bbb-fsesl/build.sbt
bbb-common-message/build.sbt
bbb-fsesl-client/build.sbt
bbb-fsesl-client/src/main/java/org/freeswitch/esl/client/inbound/Client.java
bigbluebutton-apps/build.gradle
bigbluebutton-client/build.xml
bigbluebutton-client/src/org/bigbluebutton/modules/deskshare/utils/BrowserCheck.as
bigbluebutton-client/src/org/bigbluebutton/modules/deskshare/utils/JavaCheck.as
bigbluebutton-client/src/org/bigbluebutton/modules/deskshare/view/components/DesktopPublishWindow.mxml
bigbluebutton-client/src/org/bigbluebutton/modules/users/services/MessageReceiver.as
bigbluebutton-html5/app/client/NotificationControl.coffee
bigbluebutton-html5/app/client/globals.coffee
bigbluebutton-html5/app/client/lib/bbb_api_bridge.coffee
bigbluebutton-html5/app/client/main.coffee
bigbluebutton-html5/app/client/main.html
bigbluebutton-html5/app/client/stylesheets/whiteboard.less
bigbluebutton-html5/app/client/views/chat/chat_bar.coffee
bigbluebutton-html5/app/client/views/modals/settings.coffee
bigbluebutton-html5/app/client/views/modals/settings.html
bigbluebutton-html5/app/client/views/users/user_item.coffee
bigbluebutton-html5/app/client/views/whiteboard/whiteboard.coffee
bigbluebutton-html5/app/client/views/whiteboard/whiteboard.html
bigbluebutton-html5/app/collections/collections.coffee
bigbluebutton-html5/app/config.coffee
bigbluebutton-html5/app/lib/router.coffee
bigbluebutton-html5/app/server/collection_methods/meetings.coffee
bigbluebutton-html5/app/server/collection_methods/users.coffee
bigbluebutton-html5/app/server/publish.coffee
bigbluebutton-html5/app/server/server.coffee
bigbluebutton-web/src/java/org/bigbluebutton/api/MeetingService.java
record-and-playback/presentation/scripts/process/presentation.rb
record-and-playback/presentation/scripts/publish/presentation.rb
2016-05-18 15:14:04 +00:00
Chad Pilkey
24c6d48dc2
removing files that should not have been committed
2016-05-02 12:45:25 -07:00
Richard Alam
b86f32b8c1
Sync with upstream repository
...
Merge branch 'master' of github.com:bigbluebutton/bigbluebutton
2016-04-26 20:01:20 -04:00
Ghaz Triki
11d86f6aa8
Merge 'branch air-ui' into 'mobile-client'
2016-04-26 09:19:17 +01:00
David Feng
67c14f9056
This enable avatar to be display in other participants video window
2016-04-20 14:08:13 +08:00
RafaFP
6a93432709
implemented a button to give moderators the option to end the meeting when they logout
...
refs #1944
2016-03-29 20:55:23 +00:00
Richard Alam
a684aa4dfc
Merge into bbb-1.1.dev
...
Merge master, breakout rooms, and closed captioning into bbb-1.1-dev branch.
Conflicts:
akka-bbb-apps/src/main/java/org/bigbluebutton/core/api/IBigBlueButtonInGW.java
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/api/MessageNames.scala
bigbluebutton-client/src/org/bigbluebutton/main/model/users/NetConnectionDelegate.as
2016-03-21 18:12:30 +00:00
Ghaz Triki
07d3028d10
Fetch all breakout rooms users and decorate BreakoutRoom class to display their the number of a breakout room users.
2016-03-16 19:12:10 +01:00
Pedro Beschorner Marin
6fd5e289eb
Fixed empty sharednotes when connecting problem. Now patches are identified and buffered when client is connecting.
2016-03-08 20:31:42 +00:00
RafaFP
89ac2fd60a
Improved the code to meet the peer review results.
...
refs #1931
2016-03-04 17:40:48 +00:00
Pedro Beschorner Marin
225fbbb483
Meeting's inactivity detection. Still needs some refactoring and cleanup.
2016-03-03 20:30:56 +00:00
RafaFP
932de9c07f
Updated class and method names to better correspond to the implemented function.
...
Improved the recording code.
refs #1931
2016-03-02 16:02:30 +00:00
Ghaz Triki
93140364f9
Display breakout room timer in the parent room.
2016-02-23 17:47:25 +01:00
RafaFP
65b181198c
Implemented a button to clear chat history.
...
New conversation joiners will not receive the history previous to the clearing.
Current conversation users will clear the local chat history and be notified that a moderator cleared the chat.
refs #1931
2016-02-22 22:10:04 +00:00
Anton Georgiev
7480243f4d
edits to stun/turn info
2016-02-18 19:39:53 +00:00
Anton Georgiev
cdf1ee0729
add a request/reply for stun/turn info
2016-02-17 18:36:17 +00:00
Ghazi Triki
da81a1bd72
Only display the number of users in breakout rooms list.
2016-02-08 21:03:35 +01:00
Ghazi Triki
2fb347bc25
Refactored the way that conference transfer between the parent room and breakout room is requested.
2016-02-03 22:30:08 +01:00
Ghazi Triki
6bcfd75a7c
Fixed EndBreakoutRoomRequest NAME static property value to be equal to the class name.
2016-02-03 22:24:48 +01:00
Ghazi Triki
9a4def1dde
Remove unused imports.
2016-02-02 17:15:59 +01:00
Ghazi Triki
edef66357c
Fixed TransferUserToVoiceConfRequestMessage properties names.
2016-01-28 19:11:43 +01:00
Anton Georgiev
08d6ee36f9
recover videoWidth, videoHeight params
2016-01-27 21:42:10 +00:00
Ghazi Triki
16bd601735
Use ListenInOnBreakout event from client instead of TransferUserToMeeting.
2016-01-27 22:25:15 +01:00
Ghazi Triki
62a721b310
Update gson library version to 2.5 for all server projects.
2016-01-27 16:44:22 +01:00
Ghazi Triki
0385d05001
Merge branch 'master' into breakout-rooms-porto-algre-2015
...
# Conflicts:
# akka-bbb-apps/build.sbt
# akka-bbb-apps/src/main/scala/org/bigbluebutton/SystemConfiguration.scala
# akka-bbb-fsesl/build.sbt
# bbb-common-message/build.sbt
# bigbluebutton-apps/build.gradle
# bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/client/UserClientMessageSender.java
# bigbluebutton-client/src/org/bigbluebutton/main/model/users/Conference.as
# bigbluebutton-client/src/org/bigbluebutton/modules/users/services/MessageReceiver.as
2016-01-27 14:16:05 +01:00
Ghazi Triki
9b66cf30f9
Added transfer user from the parent voice conference to a selected breakout voice conference.
2016-01-27 12:00:32 +01:00
Felipe Cecagno
2a3b95daf7
Merge remote-tracking branch 'bigbluebutton/master' into mconf
...
Conflicts:
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/UsersApp.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/UsersModel.scala
bbb-video/src/main/webapp/WEB-INF/bigbluebutton-video.properties
bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/client/messaging/ConnectionInvokerService.java
bigbluebutton-client/locale/en_US/bbbResources.properties
bigbluebutton-client/locale/pt_BR/bbbResources.properties
bigbluebutton-client/src/org/bigbluebutton/main/model/users/AutoReconnect.as
bigbluebutton-client/src/org/bigbluebutton/main/model/users/NetConnectionDelegate.as
bigbluebutton-client/src/org/bigbluebutton/main/model/users/events/ConnectionFailedEvent.as
bigbluebutton-client/src/org/bigbluebutton/modules/layout/views/LayoutsCombo.mxml
bigbluebutton-client/src/org/bigbluebutton/modules/phone/managers/WebRTCCallManager.as
bigbluebutton-client/src/org/bigbluebutton/modules/phone/maps/FlashCallEventMap.mxml
bigbluebutton-client/src/org/bigbluebutton/modules/users/services/MessageReceiver.as
bigbluebutton-config/bin/bbb-conf
2016-01-26 18:33:31 -02:00
Anton Georgiev
0d9c2d1472
remove dependency on vh, vw. remove obsolete code. clean up
2016-01-26 18:53:26 +00:00
Ghazi Triki
4f30127003
Ending a breakout room message goes to to bbb-web to be handled then send the response back to the client trgouh akka-apps and bbb-apps.
2016-01-23 18:44:50 +01:00
Ghazi Triki
1dd4ddd6cb
Created breakout rooms are now displayed in breakout rooms list.
2016-01-21 20:09:32 +01:00
Richard Alam
c66c180040
- make the flash client not attempt to reconnect when the user has been ejected from the meeting.
2016-01-19 16:16:12 +00:00
Ghazi Triki
058a2170ee
Added request breakout rooms list feature.
2016-01-15 22:13:53 +01:00
Anton Georgiev
39b7697a4d
prevent flooding of akka-fsesls log
2016-01-13 22:54:03 +00:00
Anton Georgiev
b5fafe25ca
Removing recording code used in the past for recording to file via FS. obsolete as we now record in red5
2016-01-08 21:58:10 +00:00
Anton Georgiev
23a83ab6e9
destoy deskshare on FS if presenter leaves
2016-01-08 19:07:57 +00:00
Richard Alam
838d6e0ad7
- merge Chad's closed caption work into Ghazi's breakout rooms work
...
Conflicts:
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/MeetingActor.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/MessageSenderActor.scala
bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/pubsub/MessagePublisher.java
2016-01-08 19:06:42 +00:00
Anton Georgiev
88d969cd45
fix string in common message
2015-12-22 22:50:34 +00:00
Anton Georgiev
8ee6356b5a
accommodate late joiners
2015-12-22 16:21:39 +00:00
Chad Pilkey
71f8ff085f
first try and adding caption ownership
2015-12-09 14:00:26 -08:00
Pedro Beschorner Marin
5ce45fdef2
Fixed responseToAllGuests
2015-12-04 16:56:28 +00:00
Pedro Beschorner Marin
438e5fc1e6
Fixed guest policy getting, setting an changed messages
2015-12-04 15:16:09 +00:00
Pedro Beschorner Marin
ee3864e5ce
Fixed sharednotes MAIN_WINDOW
2015-12-02 18:39:35 +00:00
Felipe Cecagno
555e037d79
fix merge and refactor a few pieces to fit better on BigBlueButton 1.0.0
2015-11-30 01:06:38 -02:00
Pedro Beschorner Marin
36bbcc06d6
Merge remote-tracking branch 'mconf/mconf-live0.7.3' into mconf-live0.7.3-merge
...
Conflicts:
akka-bbb-apps/src/main/java/org/bigbluebutton/core/api/IBigBlueButtonInGW.java
akka-bbb-apps/src/main/java/org/bigbluebutton/core/pubsub/receivers/ConversionUpdatesProcessor.java
akka-bbb-apps/src/main/java/org/bigbluebutton/core/pubsub/receivers/MeetingMessageReceiver.java
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/pubsub/senders/PesentationMessageToJsonConverter.scala
bbb-common-message/src/main/java/org/bigbluebutton/common/messages/Constants.java
bbb-video/.classpath
bbb-video/build.gradle
bbb-video/src/main/java/org/bigbluebutton/app/video/VideoApplication.java
bbb-video/src/main/webapp/WEB-INF/red5-web.xml
bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/meeting/messaging/red5/ConnectionInvokerService.java
bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/participants/ParticipantsApplication.java
bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/participants/ParticipantsListener.java
bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/presentation/PresentationMessageListener.java
bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/BigBlueButtonApplication.java
bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/service/ParticipantsService.java
bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/service/PresentationApplication.java
bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonInGW.scala
bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/CollectorActor.scala
bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/MeetingActor.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/MessageNames.scala
bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/api/OutMessages.scala
bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/api/ValueObjects.scala
bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/layout/LayoutApp.scala
bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/presentation/PresentationModel.scala
bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/presentation/red5/PresentationClientMessageSender.scala
bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/users/UsersApp.scala
bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/users/UsersModel.scala
bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/users/red5/UsersClientMessageSender.scala
bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/users/redis/UsersEventRedisPublisher.scala
bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/users/redis/UsersMessageToJsonConverter.scala
bigbluebutton-apps/src/main/webapp/WEB-INF/red5-web.xml
bigbluebutton-client/branding/default/style/css/BBBDefault.css
bigbluebutton-client/locale/en_US/bbbResources.properties
bigbluebutton-client/locale/es_LA/bbbResources.properties
bigbluebutton-client/resources/config.xml.template
bigbluebutton-client/resources/prod/MconfLive.html
bigbluebutton-client/resources/prod/bbb-deskshare-applet-0.9.0.jar
bigbluebutton-client/resources/prod/bbb-deskshare-applet-unsigned-0.9.0.jar
bigbluebutton-client/src/BigBlueButton.mxml
bigbluebutton-client/src/SharedNotesModule.mxml
bigbluebutton-client/src/org/bigbluebutton/common/Images.as
bigbluebutton-client/src/org/bigbluebutton/core/managers/ReconnectionManager.as
bigbluebutton-client/src/org/bigbluebutton/core/model/Config.as
bigbluebutton-client/src/org/bigbluebutton/core/services/BandwidthMonitor.as
bigbluebutton-client/src/org/bigbluebutton/core/services/StreamMonitor.as
bigbluebutton-client/src/org/bigbluebutton/main/api/ExternalApiCallbacks.as
bigbluebutton-client/src/org/bigbluebutton/main/model/NetworkStatsData.as
bigbluebutton-client/src/org/bigbluebutton/main/model/modules/ModulesDispatcher.as
bigbluebutton-client/src/org/bigbluebutton/main/model/users/BBBUser.as
bigbluebutton-client/src/org/bigbluebutton/main/model/users/Conference.as
bigbluebutton-client/src/org/bigbluebutton/main/model/users/NetConnectionDelegate.as
bigbluebutton-client/src/org/bigbluebutton/main/model/users/UserService.as
bigbluebutton-client/src/org/bigbluebutton/main/model/users/events/ChangeMyRole.as
bigbluebutton-client/src/org/bigbluebutton/main/model/users/events/ChangeRoleEvent.as
bigbluebutton-client/src/org/bigbluebutton/main/model/users/events/LowerHandEvent.as
bigbluebutton-client/src/org/bigbluebutton/main/model/users/events/StreamStoppedEvent.as
bigbluebutton-client/src/org/bigbluebutton/main/views/CameraDisplaySettings.mxml
bigbluebutton-client/src/org/bigbluebutton/main/views/LanguageSelector.mxml
bigbluebutton-client/src/org/bigbluebutton/main/views/LoggedOutWindow.mxml
bigbluebutton-client/src/org/bigbluebutton/main/views/MainApplicationShell.mxml
bigbluebutton-client/src/org/bigbluebutton/main/views/MainToolbar.mxml
bigbluebutton-client/src/org/bigbluebutton/main/views/MuteMeButton.mxml
bigbluebutton-client/src/org/bigbluebutton/main/views/NetworkStatsWindow.mxml
bigbluebutton-client/src/org/bigbluebutton/main/views/RecordButton.mxml
bigbluebutton-client/src/org/bigbluebutton/main/views/WebRTCEchoTest.mxml
bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/AddChatTabBox.mxml
bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatBox.mxml
bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatView.mxml
bigbluebutton-client/src/org/bigbluebutton/modules/deskshare/services/red5/Connection.as
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/layout/managers/LayoutManager.as
bigbluebutton-client/src/org/bigbluebutton/modules/layout/maps/LayoutEventMapDelegate.mxml
bigbluebutton-client/src/org/bigbluebutton/modules/layout/model/LayoutDefinition.as
bigbluebutton-client/src/org/bigbluebutton/modules/layout/model/WindowLayout.as
bigbluebutton-client/src/org/bigbluebutton/modules/layout/views/AddButton.mxml
bigbluebutton-client/src/org/bigbluebutton/modules/layout/views/LayoutsCombo.mxml
bigbluebutton-client/src/org/bigbluebutton/modules/layout/views/ToolbarComponent.mxml
bigbluebutton-client/src/org/bigbluebutton/modules/phone/managers/ConnectionManager.as
bigbluebutton-client/src/org/bigbluebutton/modules/phone/managers/FlashCallManager.as
bigbluebutton-client/src/org/bigbluebutton/modules/phone/managers/WebRTCCallManager.as
bigbluebutton-client/src/org/bigbluebutton/modules/phone/views/components/ToolbarButton.mxml
bigbluebutton-client/src/org/bigbluebutton/modules/present/managers/PresentManager.as
bigbluebutton-client/src/org/bigbluebutton/modules/present/ui/views/PresentationWindow.mxml
bigbluebutton-client/src/org/bigbluebutton/modules/present/ui/views/UploadedPresentationRenderer.mxml
bigbluebutton-client/src/org/bigbluebutton/modules/sharednotes/infrastructure/Client.as
bigbluebutton-client/src/org/bigbluebutton/modules/sharednotes/infrastructure/HTTPServerConnection.as
bigbluebutton-client/src/org/bigbluebutton/modules/sharednotes/infrastructure/ServerConnection.as
bigbluebutton-client/src/org/bigbluebutton/modules/sharednotes/infrastructure/XMLServerConnection.as
bigbluebutton-client/src/org/bigbluebutton/modules/users/maps/UsersMainEventMap.mxml
bigbluebutton-client/src/org/bigbluebutton/modules/users/services/MessageReceiver.as
bigbluebutton-client/src/org/bigbluebutton/modules/users/services/MessageSender.as
bigbluebutton-client/src/org/bigbluebutton/modules/users/views/StatusItemRenderer.mxml
bigbluebutton-client/src/org/bigbluebutton/modules/users/views/UsersWindow.mxml
bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/business/VideoProxy.as
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/GraphicsWrapper.as
bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/views/ToolbarPopupButton.mxml
bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/views/VideoDock.mxml
bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/views/WhiteboardToolbar.mxml
bigbluebutton-client/src/org/bigbluebutton/util/i18n/ResourceUtil.as
bigbluebutton-config/bigbluebutton-release
bigbluebutton-config/bin/bbb-conf
bigbluebutton-config/web/index.html
bigbluebutton-web/grails-app/controllers/org/bigbluebutton/web/controllers/ApiController.groovy
bigbluebutton-web/grails-app/controllers/org/bigbluebutton/web/controllers/PresentationController.groovy
bigbluebutton-web/src/groovy/org/bigbluebutton/api/RecordingServiceHelperImp.groovy
bigbluebutton-web/src/java/org/bigbluebutton/api/MeetingService.java
bigbluebutton-web/src/java/org/bigbluebutton/api/messaging/MeetingMessageHandler.java
bigbluebutton-web/src/java/org/bigbluebutton/api/messaging/MessagingService.java
bigbluebutton-web/src/java/org/bigbluebutton/api/messaging/RedisStorageService.java
bigbluebutton-web/src/java/org/bigbluebutton/presentation/imp/Pdf2SwfPageConverter.java
2015-11-25 15:58:36 +00:00
Chad Pilkey
3036a9740b
caption module now tracks TextArea updates
2015-11-23 12:56:52 -08:00
Ghazi Triki
6e9b95e347
BreakoutRoomStarted event finally arrives to the client.
2015-11-20 19:06:11 -02:00
Richard Alam
39d9c5dd15
Merge branch 'breakout-rooms-porto-algre-2015' of github.com:riadvice/bigbluebutton into breakout-rooms-porto-algre-2015
...
Conflicts:
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonInGW.scala
bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/pubsub/MessagePublisher.java
bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/service/BreakoutRoomService.java
bigbluebutton-client/src/org/bigbluebutton/modules/users/services/MessageSender.as
2015-11-17 02:19:48 -05:00
Ghazi Triki
16d521c338
Implemented RTMP methods for ListenInOnBreakout and RequestBreakoutJoinURL actions.
2015-11-17 17:39:49 -02:00
Richard Alam
bd8b38a22c
- use spray json to decode messages
2015-11-17 02:11:14 -05:00
Ghazi Triki
8b1f0d4bae
Added EndAllBreakoutRoomsRequest broadcast from client to bigbluebutton-apps.
2015-11-12 22:24:10 +01:00
Ghazi Triki
f910e95a45
Added more implementations for Breakout Room messages: BreakoutRoomJoinURL, BreakoutRoomStarted, TimeRemainingUpdate and UpdateBreakoutUsers.
2015-11-11 16:47:49 +01:00
Ghazi Triki
0de3e3dd43
Added BreakoutRoomService with createBreakoutRooms method.
2015-11-05 21:44:24 +01:00
Chad Pilkey
2d9d28f638
added a new caption message to push current line
2015-11-03 15:44:26 -08:00
Richard Alam
ea2dbd541a
- breakout room incoming message
2015-10-30 21:08:13 +00:00
Richard Alam
923d78719b
- send messages to redis
2015-10-30 19:14:35 +00:00
Anton Georgiev
8e407df405
Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into webrtc-desktop-temp-1
...
Conflicts:
akka-bbb-apps/build.sbt
akka-bbb-fsesl/build.sbt
bbb-common-message/build.sbt
bigbluebutton-apps/build.gradle
2015-10-22 20:46:30 +00:00
Richard Alam
b899eeebcf
- distinguish breakout rooms in create meeting request
2015-10-22 19:36:20 +00:00
Richard Alam
cecbc46d1d
- create breakout room in bbb-web
2015-10-22 17:13:53 +00:00
Richard Alam
c47272fd2c
- refactor how default presentation is downloaded
2015-10-21 20:51:58 +00:00
Richard Alam
9d04103225
- start implementing create breakout room
2015-10-21 15:47:49 +00:00
Richard Alam
6b1f727117
- add name to test
2015-10-16 14:44:31 +00:00
Richard Alam
3db1299059
- start implementing breakout room messages
...
- use class to serialize/deserialize JSON
- add test to message classes
2015-10-15 23:05:19 +00:00
Chad Pilkey
ad3ba6677c
first two initial caption module messages finished
2015-10-15 15:40:23 -07:00
Anton Georgiev
f08cd5262e
temp changes
2015-10-13 19:00:50 +00:00
Chad Pilkey
993ac4df1a
initial red5 caption message handlers and common messages
2015-09-29 13:15:13 -07:00
Richard Alam
2278ee01ec
- upgrade bbb-commons-message version
2015-09-14 21:45:55 +00:00
Richard Alam
44763bf283
- try to fix lock settings
2015-09-14 20:18:27 +00:00
Chad Pilkey
51650fb998
made the init audio and permissions message payloads actually contain something and corrected chatpermission message names
2015-09-11 15:02:28 -07:00
Ghazi Triki
2fb8296ff0
- Fixed emojiStatus not set correctly in server.
...
- Upgraded bbb-common-message version.
2015-08-26 18:51:05 +01:00
Ghazi Triki
988d8cf56c
Removed lower hand methods in server applications and replace raise hand by emoji status.
2015-08-25 09:46:00 +01:00
Anton Georgiev
eb57aa7da1
Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into webrtc-desktop-share-merging
2015-08-24 14:31:00 +00:00
Anton Georgiev
1939dac06c
Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into webrtc-desktop-share
...
Conflicts:
akka-bbb-apps/build.sbt
akka-bbb-apps/src/main/java/org/bigbluebutton/core/pubsub/receivers/RedisMessageReceiver.java
akka-bbb-apps/src/main/scala/org/bigbluebutton/Boot.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonInGW.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/MeetingActor.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/MeetingMessageHandler.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/MeetingModel.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/WhiteboardApp.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/recorders/WhiteboardEventRedisRecorder.scala
akka-bbb-fsesl/build.sbt
bbb-common-message/build.sbt
bbb-common-message/src/main/java/org/bigbluebutton/common/messages/WhiteboardKeyUtil.java
bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/pubsub/redis/RedisPubSubMessageHandler.java
bigbluebutton-client/src/org/bigbluebutton/modules/deskshare/managers/DeskshareManager.as
bigbluebutton-client/src/org/bigbluebutton/modules/deskshare/managers/PublishWindowManager.as
bigbluebutton-client/src/org/bigbluebutton/modules/deskshare/managers/ViewerWindowManager.as
bigbluebutton-client/src/org/bigbluebutton/modules/deskshare/services/DeskshareService.as
bigbluebutton-client/src/org/bigbluebutton/modules/deskshare/view/components/DesktopViewWindow.mxml
bigbluebutton-client/src/org/bigbluebutton/modules/deskshare/view/components/ToolbarButton.mxml
bigbluebutton-client/src/org/bigbluebutton/modules/users/services/MessageReceiver.as
2015-08-21 20:15:37 +00:00
Richard Alam
46ba98f737
- add ping/pong message between different components to verfiy that we have working path
2015-08-20 20:44:40 +00:00
Anton Georgiev
bcfbb7c33a
Revert "attempt to accommodate late joiners for ds on flash"
...
This reverts commit 8cf051a262
.
2015-08-20 18:06:53 +00:00
Anton Georgiev
8cf051a262
attempt to accommodate late joiners for ds on flash
2015-08-20 16:13:11 +00:00
Richard Alam
282fecf351
- ping/pong message between red5 and bbb-apps
2015-08-19 18:32:07 +00:00
Richard Alam
8be746b4ac
- start implementing round-trip pubsub monitoring
2015-08-18 21:51:48 +00:00
Richard Alam
5472548118
- allow custom polling through chat message
2015-08-17 22:40:31 +00:00
Richard Alam
9302532be5
- start implementing custom poll
2015-08-13 22:33:51 +00:00
Richard Alam
4e4270912b
- fix issue where deleting presentation doesn't remove the presentation from file upload window
2015-08-11 17:21:09 +00:00
Richard Alam
bc7aadcd22
- create new bbb-commons jar
2015-08-07 19:46:52 +00:00
Maxim Khlobystov
5c0cb9c3d8
Merge branch 'meteor-client-pdf-conversion' of https://github.com/gthacoder/bigbluebutton into development
...
Conflicts:
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/pubsub/senders/PesentationMessageToJsonConverter.scala
bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonInGW.scala
bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/presentation/PresentationModel.scala
bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/presentation/red5/PresentationClientMessageSender.scala
bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/presentation/redis/PresentationEventRedisRecorder.scala
2015-08-06 16:21:31 -04:00
Richard Alam
822b319440
- add number of responders on poll result
2015-07-13 19:18:37 +00:00
Anton Georgiev
15a9e670b8
forward videoWidth, videoHeight to flash client(rtmp)
2015-07-08 16:05:04 +00:00
Richard Alam
a55711af2c
- add whiteboardId into shape to be able to determine which page this poll result is related to
2015-07-07 21:36:35 +00:00
Richard Alam
3ed524a34c
- upgrade bbb-commons-message version
2015-07-07 21:36:01 +00:00
Richard Alam
5060726035
- format poll result data correctly
2015-07-06 22:12:15 +00:00
Richard Alam
72659e62ac
- try displaying poll result as whiteboard shape
2015-07-02 22:16:11 +00:00
Richard Alam
b3c9e2394b
- fix webcam stream data into correct format (array)
2015-07-02 18:04:58 +00:00
Anton Georgiev
766fea281d
send rtmp broadcast notification to viewers(flash has to handle)
2015-07-02 16:24:53 +00:00
Anton Georgiev
7192079977
send to BBB-Apps vh, vw, samplerate, fps, channels
2015-06-30 18:50:29 +00:00
Anton Georgiev
c926ee0858
set meetingModel flags when FS confirms
2015-06-29 21:13:01 +00:00
Anton Georgiev
0e362e9762
FS deskshare serverside cont'd
2015-06-23 19:45:36 +00:00
Richard Alam
b8128945f4
- add new polling messages
2015-06-22 21:13:11 +00:00
Richard Alam
8b84fd92b4
- implement redis messages for polling
2015-06-19 21:10:25 +00:00
Anton Georgiev
8b161e8217
record command; record messages
2015-06-19 20:38:54 +00:00
Anton Georgiev
bdb56d4884
FS video share/view messages from fs to bbb-apps
2015-06-18 22:07:15 +00:00
Anton Georgiev
a96524a31a
move WhiteboardKeyUtil;remove VoiceKeyUtil
2015-06-17 18:24:21 +00:00
Richard Alam
468217200f
- fix welcome message bug
...
- fix private chat bug
- start implementing polling
2015-06-16 19:18:23 +00:00
Richard Alam
e6e7c796ff
- add channel to bbb-fsesl
2015-06-10 18:56:10 +00:00
Richard Alam
bc214f3a32
- fix message name
2015-06-10 18:30:05 +00:00
Richard Alam
a585f12a54
- add presentation messages
2015-06-10 17:59:33 +00:00
Richard Alam
198d45489f
- remove messages from bbb-apps red5
2015-06-10 17:11:36 +00:00
Richard Alam
17a39a674f
- create a common message project
2015-06-10 15:53:07 +00:00
Richard Alam
b89d3b2857
- use bbb-common-message lib
2015-06-10 15:50:06 +00:00
Ghazi Triki
bb09eb6d75
After checking we bumped projects version and Flex locales to 0.9.0 with some fixes
2014-08-13 12:20:10 +01:00
Ghazi Triki
9a794f854a
Bumped projects version and Flex locales to 0.9
2014-08-13 10:28:08 +01:00
Ghazi Triki
ac7af7dfea
Manually bumped all application version to the correct actual version 0.9.0-dev
2014-07-31 17:42:38 +01:00
Richard Alam
272e46e38d
- upgrade version of bbb-commons to 0.8
2011-01-12 09:50:36 -05:00
Richard Alam
f90a03fb8c
- add license headers to bbb-common
2010-11-06 10:24:21 -04:00
Marco Calderon
6c84e2c561
Changes: bbb-apps from groovy to java, add recording module and updated events-recorder and bbb-commons
2010-08-02 10:33:36 +00:00
Richard Alam
ec256e7cb7
- upgrading versions from 0.64 to 0.7
2010-07-13 09:42:13 -04:00
Richard Alam
4703f6c5bf
- Removing IDE specific files
2010-06-30 11:23:14 -04:00
BigBlueButton
e4fd72681a
- adding .gitignore
2010-05-30 03:55:46 +00:00
Richard Alam
84807d1946
- test to see if cron job picks up changes and propagate to google code
2010-05-25 16:58:32 -04:00
Richard Alam
de073873dc
- describe bbb-commons
2010-05-25 16:42:22 -04:00
Richard Alam
71442a086e
- add README file to test svn sync
2010-05-25 16:18:38 -04:00
Richard Alam
d426fbb06a
- add externUserID to participant
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@4326 af16638f-c34d-0410-8cfa-b39d5352b314
2010-05-14 19:25:48 +00:00
Jeremy Thomerson
c737c7e7f8
add a script to each module that allows me to build / run in dev mode on my vm without having to remember which method I have to build this module in
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@4272 af16638f-c34d-0410-8cfa-b39d5352b314
2010-05-07 21:53:52 +00:00
Richard Alam
cecbac5f98
- change repo dir to /home/firstuser/dev/repo
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@4076 af16638f-c34d-0410-8cfa-b39d5352b314
2010-03-31 14:38:43 +00:00
Jeremy Thomerson
55589f9ca0
end meeting API call now kicks everyone from the conference
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3867 af16638f-c34d-0410-8cfa-b39d5352b314
2010-03-09 23:33:25 +00:00
Jeremy Thomerson
cef2d9fc2d
complete getMeetingInfo API call
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3797 af16638f-c34d-0410-8cfa-b39d5352b314
2010-03-05 00:24:15 +00:00
Jeremy Thomerson
500604eb55
getMeetingInfo API call working
...
now just need to add more information to it
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3796 af16638f-c34d-0410-8cfa-b39d5352b314
2010-03-04 23:59:02 +00:00
Jeremy Thomerson
bdb9832e54
work on getMeetingInfo API call
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3795 af16638f-c34d-0410-8cfa-b39d5352b314
2010-03-04 22:41:46 +00:00
Jeremy Thomerson
827a65b647
move some common classes to bbb-common-message for spring integration changes
...
This commit simply moves a few of the classes to bbb-common-message and makes all of the related build changes to support this change.
No functionality was changed (at least intentionally).
Next step is to change the current Spring Integration messages (conference started / stopped) to send the whole conference in the message and confirm that this is working as intended. Then it's easy to add other API calls
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3791 af16638f-c34d-0410-8cfa-b39d5352b314
2010-03-04 20:51:29 +00:00
Richard Alam
75da58ef1a
- modify local repo to /opt/bigbluebutton/repo so it's more generic and match with Hudson
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3781 af16638f-c34d-0410-8cfa-b39d5352b314
2010-03-04 17:16:07 +00:00
Richard Alam
88e2c2febc
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3756 af16638f-c34d-0410-8cfa-b39d5352b314
2010-02-25 20:05:10 +00:00