Ghazi Triki
83025a9d5e
Merge remote-tracking branch 'bigbluebutton/master' into jvm-quality-improve
...
# Conflicts:
# bbb-common-web/src/main/java/org/bigbluebutton/presentation/imp/ImageToSwfSlidesGenerationService.java
2018-09-12 18:49:25 +01:00
Richard Alam
cdaf447758
Merge pull request #5975 from riadvice/user-typing-feature
...
Implementation of user typing feature to chat
2018-09-12 13:43:43 -04:00
Richard Alam
5b03e0ef6c
Merge pull request #5581 from riadvice/recording-timer
...
Add a new message RecordStatusResetSysMsg to be handled and saved in events.xml
2018-09-12 12:03:09 -04:00
Anton Georgiev
1462810b96
Merge branch 'v2.0.x-release' of github.com:bigbluebutton/bigbluebutton into merge-2.0
2018-09-06 22:06:40 +00:00
Felipe Cecagno
62311387b8
more changes to configure redis using environment variables
2018-08-24 17:15:47 -03:00
Joao Siebel
11a139a2b8
add new SyncGetVoiceUsersRespMsg message in akka
2018-08-14 09:41:21 -03:00
Ghazi Triki
7d64eb69f9
Added user typing feature to chat.
2018-08-13 17:48:48 +01:00
Ghazi Triki
cb152bf864
Improved java classes code quality.
2018-08-05 22:41:15 +01:00
Ghazi Triki
2820178b83
Updated JVM projects dependencies and configuration.
2018-08-05 22:37:11 +01:00
Ghazi Triki
dffeeb8daf
Update user last activity time when he sends a message.
2018-07-30 11:43:19 +01:00
Ghazi Triki
c21f5aabad
Add new parameter userInactivityThresholdInMinutes to bigbluebutton.properties and improve inactive user warning and eject from server.
2018-07-27 15:02:04 +01:00
Ghazi Triki
5472456e90
Refactor user inactivity messages naming to have two distinct names: UserInactivityInspectMsg and UserActivitySignResponseMsg.
2018-07-25 21:14:38 +01:00
Ghazi Triki
5b34f93daa
Move user inactivity configuration parameters to bigbluebutton-web application and rename them to userInactivityLogoutTimerInMinutes and userInactivityResponseDelayInMinutes.
2018-07-25 10:56:55 +01:00
Chad Pilkey
d1e649189e
add option to user gear menu to look up their directory data
2018-07-11 10:33:38 -07:00
Anton Georgiev
c1a739a883
Merge pull request #5298 from OZhurbenko/akka-create-default-pods-groupchats
...
Added missing messages for presentation pods and group chats
2018-07-04 14:28:16 -04:00
Richard Alam
d891a4e85f
Merge branch 'v2.0.x-release' of github.com:bigbluebutton/bigbluebutton into merge-latest-20-branch
2018-06-28 08:30:17 -07:00
Anton Georgiev
e2e83e08df
plug clientType in UserJoin* messages, not separate ones
2018-06-26 19:27:42 +00:00
Anton Georgiev
a6c693c93d
add clientType in User and show it in api getMeeting*
2018-06-22 19:19:46 +00:00
Richard Alam
dc62b89691
Merge branch 'v2.0.x-release' of github.com:bigbluebutton/bigbluebutton into 21-and-20-merge-working-branch
2018-06-08 17:49:13 -07:00
Richard Alam
83ac942452
Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into 21-and-20-merge-working-branch
2018-06-08 17:23:49 -07:00
Richard Alam
5df4bef903
- toggle presentation downloads
2018-06-07 12:13:00 -07:00
Anton Georgiev
eb7a49f142
renamed noRedirect* to redirectToHtml5*
2018-06-07 15:59:06 +00:00
Richard Alam
a2eaa9babd
Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into 21-and-20-merge-working-branch
...
- some conflicts have been fixed.
The following needs working on:
both modified: ../bigbluebutton-client/src/org/bigbluebutton/modules/chat/services/ChatCopy.as
both modified: ../bigbluebutton-client/src/org/bigbluebutton/modules/chat/services/ChatSaver.as
both modified: ../bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatTab.mxml
both modified: ../bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatWindowEventHandler.as
both modified: ../bigbluebutton-client/src/org/bigbluebutton/modules/users/services/MessageReceiver.as
both modified: ../bigbluebutton-client/src/org/bigbluebutton/modules/users/services/MessageSender.as
both modified: ../bigbluebutton-client/src/org/bigbluebutton/modules/users/views/MediaItemRenderer.mxml
Parking as need to work on something else.
2018-06-06 08:23:13 -07:00
Chad Pilkey
f7a5f675b6
add a table showing individual votes in the PollResultsModal
2018-06-01 16:06:49 -07:00
Anton Georgiev
658b9d81b3
Merge pull request #5512 from lfzawacki/use-get-recording-status
...
Use GetRecordingStatus message to start recordings from the bbb-webrtc-sfu side
2018-05-28 13:55:30 -04:00
Ghazi Triki
8b85628549
Add a new message RecordStatusResetSysMsg to be handled and saved in events.xml
2018-05-23 21:14:34 +01:00
Ghazi Triki
4eebdf00fa
Add a new message RecordAndClearPreviousMarkersCmd.
2018-05-23 16:09:15 +01:00
Ghazi Triki
634635c8cd
Update recording confirmation window and add recording timer (Work In Progress)
2018-05-18 15:58:08 +01:00
Lucas Fialho Zawacki
2d222b7b2e
Merge branch 'v2.0.x-release' of https://github.com/bigbluebutton/bigbluebutton into use-get-recording-status
2018-05-09 19:02:31 +00:00
Lucas Fialho Zawacki
9149d0c597
Add recorded parameter to GetRecordingStatusRespMsg
2018-05-09 17:53:45 +00:00
Ghazi Triki
54ae79d533
Add new feature to breakout rooms that allows to freely join them.
2018-05-07 16:03:53 +01:00
Richard Alam
48de7625c9
- user inactivity audit message sending and receiving
2018-04-09 12:22:00 -07:00
Richard Alam
39284f1d18
- start implementing user inactivity timer
2018-04-06 14:52:21 -07:00
Oleksandr Zhurbenko
eef2d65d93
Sync message for the group chats and group chat messages
2018-04-01 20:10:28 -07:00
Anton Georgiev
3fec097faa
send presentation pods through redis on html5 server start
2018-02-16 15:00:53 -05:00
Richard Alam
1354b065be
Merge branch 'require-auth-token-on-red5-connect' of github.com:ritzalam/bigbluebutton into merge-20-with-master
2018-01-29 12:36:41 -08:00
Ghazi Triki
a2feb9bf5b
Merge remote-tracking branch 'bigbluebutton/v2.0.x-release' into master-merge-2.0
...
# Conflicts:
# akka-bbb-apps/src/main/scala/org/bigbluebutton/core/domain/MeetingStatus.scala
# akka-bbb-apps/src/main/scala/org/bigbluebutton/core/running/MeetingActor.scala
# bbb-common-web/src/main/scala/org/bigbluebutton/api2/BbbWebApiGWApp.scala
# bigbluebutton-client/branding/default/style/css/V2Theme.css
# bigbluebutton-client/branding/default/style/css/assets/swf/v2_skin.fla
# bigbluebutton-client/branding/default/style/css/assets/swf/v2_skin.swf
# bigbluebutton-client/locale/en_US/bbbResources.properties
# bigbluebutton-client/src/org/bigbluebutton/main/model/users/JoinService.as
# bigbluebutton-client/src/org/bigbluebutton/main/model/users/UserService.as
# bigbluebutton-client/src/org/bigbluebutton/main/views/LoggedOutWindow.mxml
# bigbluebutton-client/src/org/bigbluebutton/main/views/MainToolbar.mxml
# bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/AddChatTabBox.mxml
# bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatMessageRenderer.mxml
# bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatWindowEventHandler.as
# bigbluebutton-client/src/org/bigbluebutton/modules/users/services/MessageReceiver.as
# bigbluebutton-client/src/org/bigbluebutton/modules/users/views/MediaItemRenderer.mxml
# bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/maps/VideoEventMap.mxml
# bigbluebutton-html5/private/config/development/server/log.yaml
2018-01-23 12:27:42 +01:00
Richard Alam
672d3b5ef7
- try to prevent connecting to bbb-video with authz
2018-01-22 11:54:57 -08:00
Chad Pilkey
2717ef39da
removed unneeded properties from chat messages
2018-01-10 15:06:43 -05:00
Ghazi Triki
d1c765e614
Merge remote-tracking branch 'bigbluebutton/v2.0.x-release' into webcams-only-for-moderator-on-off
2018-01-08 19:33:23 +01:00
Richard Alam
b93a95ca8e
Merge pull request #4896 from prlanzarin/flash-webcam-fix
...
Ghost flash webcams fix
2018-01-08 10:18:52 -08:00
Ghazi Triki
36f02e8528
Request webcamsOnlyForModerator value at user enter success.
2018-01-07 22:24:54 +01:00
Ghazi Triki
38ab186b53
Change webcamsOnlyForModerator property and handle saving it in server and client.
2018-01-07 16:45:24 +01:00
prlanzarin
dfb5170e5d
Finished filtering out HTML5 and Flash webcams using stream name patterns
2018-01-04 16:24:50 +00:00
prlanzarin
3f8e7c308c
Revert "Added checking for HTML5 webcams"
...
This reverts commit 51b62ed30d
2017-12-22 18:30:40 +00:00
Anton Georgiev
61c12298e2
Merge pull request #4661 from prlanzarin/bbb-webrtc-sfu
...
Add support for WebRTC screensharing into Flash/HTML5 and WebRTC video into HTML5
2017-12-22 14:43:38 -02:00
Richard Alam
7637cedd4b
Merge branch 'v2.0.x-release' of github.com:bigbluebutton/bigbluebutton into synch-with-v2.0
2017-12-21 12:48:20 -08:00
Richard Alam
78afb91562
- implement muteOnstart by passing on create API or using bigbluebutton.properties in bbb-web instead of setting it in config.xml
2017-12-21 10:40:44 -08:00
prlanzarin
51b62ed30d
Added checking for HTML5 webcams
...
This should prevent blank webcams on the flash client
2017-12-21 17:38:39 +00:00
prlanzarin
3a72afa350
Merge remote-tracking branch 'upstream/v2.0.x-release' into video-reconnection
2017-12-21 17:37:07 +00:00
Chad Pilkey
911c2b84fe
Merge pull request #4845 from capilkey/fix-presentationpod-reconnect
...
Change presentation pod reconnect to get all pods
2017-12-18 20:30:54 -05:00
Chad Pilkey
5bb13dedbf
change presentation pod reconnect to get all pods
2017-12-18 17:07:08 -05:00
Richard Alam
72fd493c23
- add reason on why client is disconnected
2017-12-15 19:16:37 -08:00
Ghazi Triki
89814bd613
Implement new feature: set presentation downloadable on and off. Work in progress.
2017-12-15 16:08:56 +01:00
Richard Alam
e0d0971070
Merge branch '2.1-whiteboard-improvements' of https://github.com/capilkey/bigbluebutton into capilkey-2.1-whiteboard-improvements
2017-12-13 10:16:43 -08:00
Chad Pilkey
777fe53c39
rearrange WhiteboardMsgs so they are divided by direction
2017-12-13 12:14:39 -05:00
Chad Pilkey
4881fbbc0b
clean up spacing for WhiteboardMsgs so they're easier to read
2017-12-13 02:17:36 -05:00
Chad Pilkey
1551dcae15
move multiuser to be per-whiteboard
2017-12-13 02:14:43 -05:00
Richard Alam
7f51071f9e
- display specific eject reason to user
2017-12-11 14:03:14 -08:00
Richard Alam
9923704012
- eject user with duplicate external userid
2017-12-11 12:51:00 -08:00
Richard Alam
dda21b4a5e
Merge pull request #4793 from capilkey/disabled-moderator-unmute
...
Fix meeting mute and disable unmute of others
2017-12-11 11:00:41 -05:00
Chad Pilkey
860fd2a5df
fix meeting mute and disable unmute of others
2017-12-11 00:00:32 -05:00
Richard Alam
2574a18e7f
Merge branch 'synch-with-v2.0' into guest-and-authenticated-guest
2017-12-08 12:04:56 -08:00
Richard Alam
715a0177fd
Merge branch 'v2.0.x-release' of github.com:bigbluebutton/bigbluebutton into synch-with-v2.0
2017-12-08 11:26:09 -08:00
Richard Alam
68e452df6c
- add guest and authenticated info in client so we can display them separately
2017-12-07 10:47:07 -08:00
Chad Pilkey
4ce4204536
added poll record events, removed unused HidePoll message
2017-12-07 07:58:42 -08:00
Chad Pilkey
158fb6c7b2
cleanup of old java messages and other unused code
2017-12-04 12:31:16 -05:00
Richard Alam
e13a68377c
Merge branch 'v2.0.x-release' of github.com:bigbluebutton/bigbluebutton into synch-with-v2.0
2017-11-20 08:42:46 -08:00
Richard Alam
1466636d17
Merge branch '2.1-presentation-cleanup' of https://github.com/capilkey/bigbluebutton into capilkey-2.1-presentation-cleanup
2017-11-20 07:24:21 -08:00
Chad Pilkey
3235f8423c
clean up of akka-app presentpod code (removed ownerId and other redundant date)
2017-11-19 14:34:19 -05:00
Richard Alam
6ff5d0db42
- pass mute param on message so we don't rely on toggling mute/unmute state for users
2017-11-17 08:46:18 -08:00
Richard Alam
9329e9316b
- determine guest status properly for moderators
2017-11-15 12:39:06 -08:00
Anton Georgiev
2276522c2e
Merge branch 'master' into remove-user-when-user-leaves
2017-11-14 14:57:19 -02:00
Richard Alam
420b6a9a14
- provide a way to skip whitelist filter in bbb-apps
...
- tell akka-apps to eject user for client that violates whitelist
- when validate token fails, disconnect client.
2017-11-13 14:25:31 -08:00
Richard Alam
b2aae3ab3c
- clear public chat (incomplete)
...
TODO: client doesn't clear yet
2017-11-13 05:56:14 -08:00
prlanzarin
f43b77c19f
Merge branch 'node-bbb-apps-packaging' into bbb-webrtc-sfu
...
Conflicts:
bigbluebutton-html5/imports/startup/client/base.jsx
bigbluebutton-html5/imports/ui/components/actions-bar/actions-dropdown/component.jsx
bigbluebutton-html5/imports/ui/components/actions-bar/component.jsx
bigbluebutton-html5/imports/ui/components/app/container.jsx
bigbluebutton-html5/imports/ui/components/screenshare/service.js
bigbluebutton-html5/imports/ui/components/video-dock/component.jsx
bigbluebutton-html5/imports/ui/components/video-dock/container.jsx
bigbluebutton-html5/private/locales/en.json bigbluebutton-html5/server/main.js
2017-11-11 03:41:37 +00:00
Anton Georgiev
411307af3f
handle zoom and move event in presentation pods
2017-11-03 15:35:59 -04:00
Richard Alam
4e8f2abbb3
- pass token on video connect
2017-11-01 14:55:48 -07:00
Anton Georgiev
28f1809a70
independent control of presenter for modules Present and Whiteboard
2017-10-31 18:49:25 -04:00
Anton Georgiev
8450921362
separate cursor events depending on whiteboardId (pod)
2017-10-31 15:55:59 -04:00
Richard Alam
b128ba3fea
Merge pull request #4593 from antobinary/pods_vol4
...
Improvements to Presentation Pods
2017-10-29 16:11:00 -04:00
Anton Georgiev
ebdaedd3ae
work on remove presentation from pod. WIP
2017-10-29 13:12:27 -04:00
Richard Alam
5be0dec165
Merge branch 'pods_vol4' of https://github.com/antobinary/bigbluebutton into antobinary-pods_vol4
2017-10-28 17:32:29 -07:00
Anton Georgiev
8dddd206c3
send presenter group to late joiner
2017-10-28 20:08:54 -04:00
Richard Alam
c14a946041
- generate recording path in akka-apps for audio
2017-10-26 14:07:22 -07:00
Richard Alam
8497b9049d
Merge branch 'master' into implement-multi-chat
2017-10-25 07:33:26 -07:00
Anton Georgiev
8e06408a33
set current presenter in pod
2017-10-24 15:49:57 -04:00
Richard Alam
066ceea0f4
- generate record chapter break event
2017-10-23 12:16:26 -07:00
Anton Georgiev
6f8abff77c
Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into pods_vol4
2017-10-21 08:50:25 -04:00
Anton Georgiev
030567368a
add/remove user from presenter groups
2017-10-20 17:01:57 -04:00
Richard Alam
afb217fe70
Merge branch 'remove-reconnect-handler' of https://github.com/ritzalam/bigbluebutton into ritzalam-remove-reconnect-handler
2017-10-20 08:11:49 -07:00
Richard Alam
11f0bdf0ac
Merge branch 'pods_vol4' of https://github.com/antobinary/bigbluebutton into antobinary-pods_vol4
2017-10-19 17:46:35 -07:00
Richard Alam
e01692c40b
- send voice conf started and destroyed message
2017-10-19 17:18:50 -07:00
Anton Georgiev
04cef71384
re-enable next/prev/goto slide
2017-10-19 14:47:59 -04:00
Richard Alam
cbd82ffa29
- simplify sending of message
2017-10-18 10:07:54 -07:00
Anton Georgiev
d521b19623
Merge branch 'implement-multi-chat' of github.com:ritzalam/bigbluebutton into pods_vol3
2017-10-03 11:13:48 -04:00
Richard Alam
398e6f7a02
- try opening windows
2017-10-01 17:29:44 -07:00
Anton Georgiev
60904989b3
work on set presentation (client + akka apps)
2017-10-01 09:50:12 -04:00
Anton Georgiev
23dadc5477
work on separating pods - client/conversion/apps
2017-09-29 18:20:33 -04:00
Richard Alam
e849e1b5ee
- approve guest user
2017-09-28 16:56:33 -07:00
Richard Alam
8e7670c81d
- handle guest policy
2017-09-27 11:16:14 -07:00
Richard Alam
4804d69a62
- reject user on enter api if guest has been denied
2017-09-25 14:29:02 -07:00
Richard Alam
e062e42cd0
- implement redirect of client to guest waiting
2017-09-25 14:12:54 -07:00
Anton Georgiev
6d4fa587c8
work on add and remove presentation pods
2017-09-25 14:58:11 -04:00
Richard Alam
5c2e12f04f
- display chat history
2017-09-21 14:13:42 -07:00
Anton Georgiev
9283c342b7
add a default presentation pod on present module load
2017-09-21 15:30:39 -04:00
Richard Alam
e651785a4e
- handle group chat created msg on client
2017-09-20 11:59:33 -07:00
Richard Alam
ff23e66220
- implement create group chat handler
2017-09-20 09:04:00 -07:00
Anton Georgiev
32398bc40e
Merge branch 'implement-group-chat' of github.com:ritzalam/bigbluebutton into pods_vol1
2017-09-19 11:41:52 -04:00
Augusto Bennemann
2067c50c55
HTML5 video for bbb2.0
2017-09-19 10:53:27 -03:00
Richard Alam
fea62db871
- handle get chat history
2017-09-15 13:04:22 -07:00
Richard Alam
1fae5d6b96
- send and receive public chat message
2017-09-15 11:17:19 -07:00
Richard Alam
9b0f074d6e
- modify chat to use models
2017-09-13 13:35:46 -07:00
Richard Alam
a790143d37
- create publish group chat
2017-09-13 10:55:08 -07:00
Anton Georgiev
f8087e0af3
store, check, exprire upload authz tokens in bbb-web
2017-09-13 10:39:28 -04:00
Richard Alam
6decd24480
- implement group chat handlers
2017-09-12 14:47:33 -07:00
Anton Georgiev
bba8300fbf
require token to upload presentation
2017-09-12 16:25:41 -04:00
Anton Georgiev
e9d7fe0468
reorganize presentation messages
2017-09-12 09:47:31 -04:00
Richard Alam
81acf00079
- change access type to string
2017-09-07 13:21:09 -07:00
Richard Alam
e0161b8da8
- implement group chat message handlers
2017-09-07 12:51:19 -07:00
Richard Alam
c7686b3a90
- implement group chat
2017-09-06 12:58:36 -07:00
Richard Alam
3a6690c335
- start implementing group chat
2017-09-05 17:08:40 -07:00
Pedro Beschorner Marin
4017d12fa1
Refactored shared notes cleaning to force sync
2017-09-01 19:36:15 +00:00
Richard Alam
5e1297e8f8
- trigger sending of rtt from server side
...
- send rtt of client to server so we can collect data
2017-08-16 14:05:22 -07:00
Richard Alam
ec314b8105
- add round trip trace message from client and back to tell us where the bottleneck
...
might be when using multi-user whiteboard.
2017-08-16 09:44:27 -07:00
Richard Alam
3879d48f17
Merge branch 'audio-state' of https://github.com/antobinary/bigbluebutton into antobinary-audio-state
2017-08-14 11:52:04 -07:00
Anton Georgiev
293c58ca42
distinguish fresh user join from reconnect. Recover audio state
2017-08-14 14:38:51 -04:00
Chad Pilkey
ac030e6254
fix meeting and client locking
2017-08-11 20:53:09 -04:00
Anton Georgiev
1e492dba73
Merge branch 'bbb-2x-mconf' of github.com:bigbluebutton/bigbluebutton into fix-webcam-state
2017-08-10 15:31:29 -04:00
Anton Georgiev
1dc5de1665
cleanup unused object
2017-08-10 15:30:29 -04:00
Richard Alam
1a698058e1
- implement check to see if akka-apps is alive from bbb-web so we can return an
...
error to API requests
2017-08-08 12:16:00 -07:00
Richard Alam
5ecf0c3651
- hook up end meeting from api
2017-08-02 13:06:16 -07:00
Richard Alam
b072b6e354
- log start voice recording message
2017-08-02 11:32:43 -07:00
Richard Alam
510d7717ab
Merge pull request #4167 from ritzalam/fix-user-leaving
...
tracking user disconnects
2017-07-31 13:58:18 -04:00
Richard Alam
747c197239
- add analytics actor for logging messages we are interested in. Better to do this in another app
...
but don't want to create another app for now. Might extract this sometime in the future.
2017-07-31 10:54:05 -07:00
Chad Pilkey
56b362e3c7
Merge pull request #4165 from capilkey/2.0-message-recording
...
Replace old Java event recording with Scala equivalent
2017-07-31 13:24:18 -04:00
Anton Georgiev
f6699b10f7
Merge pull request #4166 from antobinary/request-wb-access-on-meteor-start
...
Inform meteor app about current multi-user property in each meeting
2017-07-31 13:21:51 -04:00
Anton Georgiev
39565e5a72
switch to a new sync message on html5 only redis channel
2017-07-31 12:12:16 -04:00
Chad Pilkey
1f8aa4618f
new akka-apps record structure
2017-07-31 12:02:13 -04:00
Pedro Beschorner Marin
77603a62c8
Limiting the number of shared notes
2017-07-30 22:11:13 +00:00
Richard Alam
d39e823a85
Merge branch 'akka-transcode-new-messages' of https://github.com/prlanzarin/bigbluebutton-1 into prlanzarin-akka-transcode-new-messages
2017-07-27 07:53:27 -07:00
Richard Alam
6fb08c1396
- convert over lock setting into 2x messages
2017-07-26 13:19:19 -07:00
Pedro Beschorner Marin
cd34d2c139
Merge remote-tracking branch 'bbb-2x-mconf' into transcode-new-messages
...
Conflicts:
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonActor.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/MessageSenderActor.scala
2017-07-25 14:47:21 +00:00
Pedro Beschorner Marin
d50f65fce1
Moved akka-transcode messages to 2.0 format
2017-07-25 13:23:20 +00:00
Richard Alam
ad37b52835
Merge branch 'bbb-2x-mconf' of github.com:bigbluebutton/bigbluebutton into fix-breakout-room-messaging
2017-07-24 18:21:59 -07:00
Richard Alam
5afcbe539b
- put back old messages as they are still used by video-broadcast and bbb-video. We
...
can remove them once we've worked on those 2 apps.
2017-07-24 18:02:45 -07:00
Richard Alam
555302f11e
- try to fix messaging of breakout rooms
2017-07-24 10:39:29 -07:00
Richard Alam
1269347289
Merge branch 'bbb-2x-mconf' of github.com:bigbluebutton/bigbluebutton into fix-breakout-room-messaging
2017-07-21 20:55:40 -07:00
Richard Alam
47f012f08f
- start fixing breakout rooms
2017-07-21 14:15:51 -07:00
Chad Pilkey
c8f38ebae1
Merge remote-tracking branch 'upstream/bbb-2x-mconf' into cleanup-old-1.1-apps
2017-07-21 14:30:51 -04:00
Chad Pilkey
043c55e0bf
Merge remote-tracking branch 'upstream/bbb-2x-mconf' into cleanup-old-1.1-apps
2017-07-21 13:55:06 -04:00
Richard Alam
ba2e99ed0e
Merge branch 'work-on-meeting-lifcycle-2' of https://github.com/ritzalam/bigbluebutton into ritzalam-work-on-meeting-lifcycle-2
2017-07-20 18:19:00 -07:00
Richard Alam
f1b4f87752
Merge branch 'late-joiner-webrtc-screenshare' of https://github.com/antobinary/bigbluebutton into antobinary-late-joiner-webrtc-screenshare
2017-07-20 17:41:55 -07:00
Chad Pilkey
3a824e13db
cleaned up pre-2.0 user messages
2017-07-20 18:57:55 -04:00
Richard Alam
d7e1a23022
- continue implement guest policy
2017-07-19 19:24:43 -07:00
Richard Alam
d488ff745d
- implement guest policy
2017-07-19 14:59:36 -07:00
Richard Alam
a61030a95f
- track meeting inactivity and expiry in akka-apps
2017-07-18 14:47:42 -07:00
Richard Alam
810a027907
Merge branch '2x-transcode-screenshare-merge' of https://github.com/prlanzarin/bigbluebutton-1 into prlanzarin-2x-transcode-screenshare-merge
2017-07-17 18:49:58 -07:00
Anton Georgiev
d8dc01d333
display current webrtc screenshare to late joiners (if broadcasting)
2017-07-17 17:48:44 -04:00
Richard Alam
bf1031374a
- pass timeout expire when last user leaves from bbb-web to akka-apps
2017-07-16 08:11:48 -07:00
Richard Alam
8994c7f644
Merge branch 'bbb-2x-mconf' into implement-meeting-expiry
2017-07-16 07:49:45 -07:00
Richard Alam
0f39d99ce5
- implement meeting expiry
2017-07-15 19:10:04 -07:00
Chad Pilkey
f4a5286005
remove pre-2.0 breakout room code
2017-07-15 19:00:18 -04:00
Chad Pilkey
1bb72e6391
clean up pre-2.0 voice message code
2017-07-15 17:33:25 -04:00
Chad Pilkey
2dfd202a0b
reorganized akka-apps whiteboard, cleaned up caption and poll
2017-07-15 15:31:49 -04:00
Richard Alam
a0467f319c
Merge branch 'bbb-2x-mconf' into work-on-meeting-lifcycle
2017-07-15 09:30:02 -07:00
Chad Pilkey
3c60131a5c
remove pre-2.0 layout message code
2017-07-14 16:57:20 -04:00
Chad Pilkey
816daf29ae
remove pre-2.0 poll message code
2017-07-14 16:10:17 -04:00
Chad Pilkey
5ebdd61d3b
remove pre-2.0 presentation message code
2017-07-14 14:19:20 -04:00
Richard Alam
5bccf11319
Merge branch 'convert-global-audio-messages' of https://github.com/capilkey/bigbluebutton into capilkey-convert-global-audio-messages
2017-07-13 17:33:22 -07:00
Chad Pilkey
86da035674
move the global audio messages to the 2.0 format
2017-07-13 18:09:15 -04:00
Anton Georgiev
1687dc7281
Merge branch 'bbb-2x-mconf' of github.com:bigbluebutton/bigbluebutton into implement-bbb-web-msgs
2017-07-12 19:43:38 -04:00
Anton Georgiev
d33c1b03ae
handle DestroyMeetingSysCmdMsg on akka-apps
2017-07-12 19:21:01 -04:00
Richard Alam
d48f46c5e7
- try renaming deskshare to screenshare
2017-07-12 10:50:27 -07:00
prlanzarin
e3cf771891
Merge branch 'bbb-2x-mconf' of https://github.com/bigbluebutton/bigbluebutton into 2x-transcode-screenshare-merge
2017-07-12 15:14:07 +00:00
Richard Alam
19e98b22f5
Merge branch 'fs-webrtc-screenshare' of https://github.com/ritzalam/bigbluebutton into ritzalam-fs-webrtc-screenshare
2017-07-11 17:08:38 -07:00
Pedro Beschorner Marin
2097b611ed
Merge remote-tracking branch 'prlanzarin/1.1-transcode-screenshare-merge' into bigbluebutton/bbb-2.x-mconf
...
Conflicts:
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/LiveMeeting.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/MeetingActor.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/MessageSenderActor.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/UsersApp.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/UsersModel.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/endpoint/redis/AppsRedisSubscriberActor.scala
bbb-common-message/src/main/java/org/bigbluebutton/common/messages/RegisterUserMessage.java
bigbluebutton-client/src/org/bigbluebutton/modules/layout/managers/LayoutManager.as
bigbluebutton-client/src/org/bigbluebutton/modules/phone/PhoneOptions.as
bigbluebutton-client/src/org/bigbluebutton/modules/phone/views/components/ToolbarButton.mxml
bigbluebutton-client/src/org/bigbluebutton/modules/present/ui/views/PresentationWindow.mxml
bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/managers/WebRTCDeskshareManager.as
bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/model/ScreenshareOptions.as
bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/view/components/ScreensharePublishWindow.mxml
bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/view/components/ScreenshareViewWindow.mxml
bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/maps/VideoEventMap.mxml
bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/views/UserGraphicHolder.mxml
record-and-playback/core/scripts/rap-process-worker.rb
2017-07-11 20:41:38 +00:00
Richard Alam
b04519ef0f
FreeSWITCH webrtc screenshare
...
- use webrtc screenshare using FS Verto
- publish screenshare as rtmp to red5
- flash clients view screenshare from red5 rtmp
Fix mute/unmute/talking of user in voice conference
2017-07-11 13:31:56 -07:00
Anton Georgiev
f6ef0ddf75
Merge branch 'bbb-2x-mconf' of github.com:bigbluebutton/bigbluebutton into implement-bbb-web-msgs
2017-07-11 15:35:17 -04:00
Anton Georgiev
c5ca6a2fcc
red5 closes connection when user is ejected
2017-07-11 14:56:35 -04:00
Richard Alam
02d9c6717b
Merge branch 'implement-bbb-web-msgs' of https://github.com/antobinary/bigbluebutton into antobinary-implement-bbb-web-msgs
2017-07-11 08:12:18 -07:00
Chad Pilkey
f6d92e5a50
add deskshare msg handlers to akka-apps
2017-07-10 18:12:06 -04:00
Anton Georgiev
c810c2cf73
Merge branch 'bbb-2x-mconf' of github.com:bigbluebutton/bigbluebutton into implement-bbb-web-msgs
2017-07-10 17:26:04 -04:00
Anton Georgiev
797b2904aa
handle eject user from meeting (a.k.a. kick)
2017-07-10 15:36:26 -04:00
Richard Alam
7a7712d986
- start implementing lock settings
2017-07-09 15:00:13 -07:00
Richard Alam
8d91ef8132
- convert several old client messages to new ones
2017-07-09 07:44:29 -07:00
Richard Alam
5dbb8d5515
- implement emoji status message
2017-07-08 13:39:41 -07:00
Richard Alam
77de38e2f3
Merge branch 'move-chat-messages-2x' of https://github.com/capilkey/bigbluebutton into capilkey-move-chat-messages-2x
2017-07-08 08:41:20 -07:00
Richard Alam
0cf4227273
Merge branch 'implement-bbb-web-msgs' into implement-meeting-status
2017-07-08 08:04:13 -07:00
Chad Pilkey
bf9f6df9b1
remove all 1.1 chat messaging code
2017-07-07 20:16:14 -04:00
Chad Pilkey
550b880db7
convert chat messages to 2x
2017-07-07 19:14:00 -04:00
Richard Alam
70c7ebc1a1
- continue removing old messages in akka-apps
2017-07-07 14:23:56 -07:00
Anton Georgiev
0ec660c8d3
handle assign presenter in flash client and akka apps
2017-07-07 10:32:38 -04:00
Richard Alam
a0ed7685ce
- continue removing old code
2017-07-06 18:48:26 -07:00
Richard Alam
2945c0e6fc
- continue removing old messages
2017-07-06 14:50:34 -07:00
Richard Alam
246fded4ff
- start removing old out messages
2017-07-05 14:08:30 -07:00
Richard Alam
955b162915
- send new presentation conversion progress messages
2017-07-04 10:32:30 -07:00
Richard Alam
caa49b84cd
Merge branch 'bbb-2x-mconf' into implement-bbb-web-msgs
2017-07-04 07:20:08 -07:00
Richard Alam
dfabf2f224
Merge branch '2.0-sharednotes-messages' of https://github.com/pedrobmarin/bigbluebutton into pedrobmarin-2.0-sharednotes-messages
2017-07-04 07:02:11 -07:00
Pedro Beschorner Marin
0c3d5990ff
Replaced sharednotes mutable Stack undo/redo structures for immutable List
2017-07-03 17:29:39 +00:00
Pedro Beschorner Marin
79cf6bb623
Moved sharednotes messages to 2.0 format
2017-07-03 17:28:12 +00:00
Richard Alam
8ca0d6c9fe
- wire up new message path
2017-07-03 07:44:13 -07:00
Anton Georgiev
2e0f6d8610
trigger syncing with state from akka-apps
2017-06-30 11:19:11 -04:00
Richard Alam
50acc517af
Merge branch 'fix-2.0-layout' of https://github.com/capilkey/bigbluebutton into capilkey-fix-2.0-layout
2017-06-29 18:20:40 -07:00
Chad Pilkey
4e5df30ac4
Merge remote-tracking branch 'upstream/bbb-2x-mconf' into fix-2.0-layout
2017-06-29 16:57:28 -04:00
Richard Alam
fcf41c9f61
- move to different packages
2017-06-29 13:55:37 -07:00
Chad Pilkey
9f904e6267
reorganized the layout code in akka-apps and fixed layout broadcast
2017-06-29 16:55:25 -04:00
Richard Alam
a11c45fa02
- implement handlers for guest policy
2017-06-29 11:34:08 -07:00
Chad Pilkey
15c938e9cd
fixed layout message response and removed redundant props
2017-06-29 14:32:31 -04:00
Richard Alam
f4bf6912d4
- add create meeting request test for BigBlueButtonActor
2017-06-28 09:01:45 -07:00
Richard Alam
04e55a1dd4
Merge branch 'move-caption-messages-2x' of https://github.com/capilkey/bigbluebutton into capilkey-move-caption-messages-2x
2017-06-28 07:47:56 -07:00
Richard Alam
30827f680e
- move messages into different package
2017-06-27 19:44:47 -07:00
Richard Alam
a32193bd68
- reorganize messages
2017-06-27 15:01:42 -07:00
Richard Alam
03010eedb2
- put users messages in one file
...
- put guest policy into it's own class
2017-06-27 13:05:38 -07:00
Chad Pilkey
4c66393dbd
Merge remote-tracking branch 'upstream/bbb-2x-mconf' into move-caption-messages-2x
2017-06-26 18:09:56 -04:00
Chad Pilkey
7c19972d24
remove pre-2.0 caption server code
2017-06-26 16:47:18 -04:00
Richard Alam
99046fb685
- handle emoji status changed message in client
2017-06-26 12:38:00 -07:00
Chad Pilkey
76026da06c
moved caption messages to 2.0 format
2017-06-26 15:00:32 -04:00
Richard Alam
f7376e11c0
- get presentation info
2017-06-25 16:11:29 -07:00
Richard Alam
2931b719c6
- get presentation info
2017-06-25 13:26:37 -07:00
Richard Alam
9317cdfcc0
Merge branch 'capilkey-move-presentation-messages-2x' into merge-presentation
2017-06-25 11:25:23 -07:00
Richard Alam
34cab65b2e
Merge branch 'move-presentation-messages-2x' of https://github.com/capilkey/bigbluebutton into capilkey-move-presentation-messages-2x
2017-06-24 15:46:22 -07:00
Richard Alam
7ffd1a80bd
- assign presenter when no presenter present
2017-06-23 11:12:17 -07:00
Chad Pilkey
1c226fd3af
2.0 presentation message work, presentation conversion msgs in bbb-web missing
2017-06-23 13:27:56 -04:00
Richard Alam
2c8b771056
- break voice messages into separate files
2017-06-21 17:54:37 -07:00
Richard Alam
c41b9b9a7a
- display users list
2017-06-21 13:32:37 -07:00
Richard Alam
281108b1ab
- send waitForApproval for guest on validate token
2017-06-21 10:49:08 -07:00
Richard Alam
28b115d742
- break down messages
2017-06-20 19:15:38 -07:00
Richard Alam
63574cd8bd
- split messages
2017-06-20 18:57:10 -07:00
Ghazi Triki
46556a8405
Add Layout server messages for V2.
2017-06-20 17:14:46 +01:00
Richard Alam
bd46c386fc
Merge branch 'bbb-2x-mconf' into refactor-client
2017-06-19 13:28:51 -07:00
Richard Alam
6021bb93c9
- send users, voice users, webcams on validate auth token
2017-06-19 11:21:51 -07:00
Ghazi Triki
5fc84b50f0
Merge remote-tracking branch 'bigbluebutton/bbb-2x-mconf' into breakout-rooms-2x-messages
...
# Conflicts:
# akka-bbb-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonInGW.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/pubsub/senders/ReceivedJsonMsgHandlerActor.scala
# akka-bbb-apps/src/main/scala/org/bigbluebutton/core/running/MeetingActor.scala
# akka-bbb-apps/src/main/scala/org/bigbluebutton/core/running/RunningMeeting.scala
# akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/UserJoinMeetingReqMsgHdlr.scala
# akka-bbb-apps/src/main/scala/org/bigbluebutton/endpoint/redis/RedisRecorderActor.scala
# bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/MessageBody.scala
# bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/Messages.scala
# bigbluebutton-client/src/org/bigbluebutton/main/model/users/NetConnectionDelegate.as
# bigbluebutton-client/src/org/bigbluebutton/modules/users/services/MessageReceiver.as
2017-06-19 17:46:46 +01:00
Ghazi Triki
c7c39989a3
Added all breakout rooms events handlers in akka-bbb-apps project.
2017-06-19 16:57:36 +01:00
Richard Alam
e7ffcbfbe7
- merging latest bbb-2x-mconf
2017-06-16 18:12:29 -07:00
Richard Alam
5c76f413bb
Merge branch '2.0-Polls' of https://github.com/antobinary/bigbluebutton into antobinary-2.0-Polls
2017-06-16 17:38:06 -07:00
Richard Alam
dc1c1e8b9e
Merge branch 'move-whiteboard-messages-2x' of https://github.com/capilkey/bigbluebutton into capilkey-move-whiteboard-messages-2x
2017-06-16 17:18:50 -07:00
Chad Pilkey
f3ab70f060
convert whiteboard messages to the 2.0 method and remove old
2017-06-16 18:09:25 -04:00
Anton Georgiev
c6e7a17085
sendGetCurrentPollRespMsg with Option[PollVO]
2017-06-16 17:03:21 -04:00
Richard Alam
2ce9b95775
- some util scripts
2017-06-16 10:07:47 -07:00
Anton Georgiev
77b78a1ae7
Polls 2.0 - the rest of the messages
2017-06-16 12:01:14 -04:00
Anton Georgiev
882b4215d4
added Polls model, StartPollReqMsg and StartPollRespMsg
2017-06-16 11:51:07 -04:00
Richard Alam
f430c7dce3
- create classes for guest policy
2017-06-14 14:17:54 -07:00
Richard Alam
596800e8d9
- breakdown handlers
2017-06-14 13:49:28 -07:00
Ghazi Triki
1e3f91bb6e
Improve code and replace deprecated parts.
2017-06-14 15:11:38 +01:00
Richard Alam
b677b4490f
- partially convert some messages
2017-06-13 14:42:02 -07:00
Pedro Beschorner Marin
15c6420e97
Merge tag 'v1.1.0' into 1.1-transcode
...
tagging v1.1.0 release
Conflicts:
bbb-common-message/src/main/java/org/bigbluebutton/common/messages/RegisterUserMessage.java
bbb-web-api/src/main/java/org/bigbluebutton/api/messaging/RedisMessagingService.java
bigbluebutton-client/resources/config.xml.template
bigbluebutton-client/src/org/bigbluebutton/modules/layout/managers/LayoutManager.as
bigbluebutton-client/src/org/bigbluebutton/modules/phone/PhoneOptions.as
bigbluebutton-client/src/org/bigbluebutton/modules/phone/views/components/ToolbarButton.mxml
bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/view/components/ScreensharePublishWindow.mxml
bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/view/components/ScreenshareViewWindow.mxml
record-and-playback/core/scripts/rap-process-worker.rb
2017-06-13 17:44:12 +00:00
Ghazi Triki
ed939d74a7
Merge remote-tracking branch 'bigbluebutton/bbb-2x-mconf' into breakout-rooms-2x-messages
...
# Conflicts:
# akka-bbb-apps/src/main/scala/org/bigbluebutton/core/pubsub/senders/ReceivedJsonMsgDeserializer.scala
# akka-bbb-apps/src/main/scala/org/bigbluebutton/core/pubsub/senders/ReceivedJsonMsgHandlerActor.scala
# akka-bbb-apps/src/main/scala/org/bigbluebutton/core/running/LiveMeeting.scala
# akka-bbb-apps/src/main/scala/org/bigbluebutton/core/running/MeetingActor.scala
# akka-bbb-apps/src/main/scala/org/bigbluebutton/core/running/RunningMeeting.scala
# bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/Messages.scala
2017-06-13 17:58:46 +01:00
Richard Alam
0c189059ff
- see if we can simplify routing of deserialized message
...
- user TypeTag instead of Manifest
2017-06-12 18:15:17 -07:00
Ghazi Triki
0478a3f658
First pass moving breakout rooms messages to v2 format.
2017-06-12 20:32:10 +01:00
Richard Alam
c0cc7138b3
- add new user joined voice event message
2017-06-12 11:39:53 -07:00
Richard Alam
4727eb8e8e
- send messages from fs to akka apps
2017-06-09 11:04:17 -07:00
Richard Alam
1ccf71cad7
- add new voice conf messages
2017-06-08 17:55:27 -07:00
Richard Alam
9b9b93c779
- record new messages
2017-06-08 13:11:46 -07:00
Richard Alam
aa99cb45eb
- use redis scala to record events to redis instead of jedis
2017-06-08 11:16:18 -07:00
Pedro Beschorner Marin
555c7e351f
Merge remote-tracking branch 'mconf-akka-transcoding' into merging-into-bbb-1.1
...
Conflicts:
akka-bbb-apps/src/main/java/org/bigbluebutton/core/pubsub/receivers/UsersMessageReceiver.java
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonActor.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/MeetingActor.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/MessageSenderActor.scala
bbb-video/src/main/java/org/bigbluebutton/app/video/VideoApplication.java
bbb-video/src/main/java/org/bigbluebutton/app/video/converter/H263Converter.java
bigbluebutton-config/bin/bbb-conf
2017-06-07 18:18:54 -03:00
Richard Alam
7db33c594b
- handle start/stop brocast cam on the client
2017-06-07 12:12:30 -07:00
Richard Alam
7e14c133b3
- send start/stop broadcasting webcam from client to server
...
- send webcam broadcast started/stopped event from server to client
2017-06-07 11:08:46 -07:00
Richard Alam
5ef4dd9e88
- change how we deserialize message so we can log errors
...
- add helper methods to add routing info for messages
- add a way to deserialize message from client
2017-06-06 14:25:40 -07:00
Richard Alam
7f9809459c
- try to simpify deserializer
2017-05-31 11:50:59 -07:00
Richard Alam
84bfd93701
- handle register user message
2017-05-29 12:17:25 -07:00
Richard Alam
240176ca32
Merge branch 'bbb-2x-mconf' of github.com:bigbluebutton/bigbluebutton into move-java-classes-from-bbb-web-to-bbb-common-web
2017-05-27 18:30:50 -07:00
Richard Alam
73ec6bb25d
- implement validate auth token
2017-05-26 10:04:38 -07:00
Chad Pilkey
09ec1e6151
first pass at multi whiteboard cursors
2017-05-25 23:45:27 -04:00
Richard Alam
18cce3a818
- send and handle meeting created event
2017-05-25 14:34:46 -07:00
Richard Alam
72f7272eb7
- handle create meeting request message
2017-05-25 13:02:26 -07:00
Richard Alam
e56a758c5f
- send create message from bbb-web
2017-05-24 15:19:03 -07:00
Richard Alam
d305b02a42
- rename messages
2017-05-19 12:52:52 -07:00
Richard Alam
330faf317d
- rename core message
2017-05-19 11:37:13 -07:00
Pedro Beschorner Marin
481a05233b
Included video rotation and h263 convertion in akka-transcode
2017-05-18 19:47:06 +00:00
Mario Gasparoni
9a3fc66687
Stop Meeting Transcoders
...
Stop any remaining transcoder used by the meeting. Useful for mediaSource transcoders.
Conflicts:
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonActor.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/MeetingActor.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/MessageSenderActor.scala
2017-05-17 17:43:30 +00:00
Mario Gasparoni
34fd6b0aad
Using DESTINATION_IP_ADDRESS instead of SIP_HOST in akka-transcode
...
Conflicts:
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/VoiceApp.scala
2017-05-17 17:37:51 +00:00
Mario Gasparoni
16698f7489
Introducing bbb-transcode-akka
...
Conflicts:
akka-bbb-apps/src/main/java/org/bigbluebutton/core/api/IBigBlueButtonInGW.java
akka-bbb-apps/src/main/java/org/bigbluebutton/core/pubsub/receivers/MeetingMessageReceiver.java
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/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/UsersApp.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/UsersModel.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/VoiceApp.scala
akka-bbb-fsesl/src/main/java/org/bigbluebutton/freeswitch/voice/freeswitch/ESLEventListener.java
akka-bbb-transcode/src/main/java/org/bigbluebutton/transcode/core/VideoTranscoderObserver.java
akka-bbb-transcode/src/main/java/org/bigbluebutton/transcode/core/ffmpeg/FFmpegCommand.java
akka-bbb-transcode/src/main/java/org/bigbluebutton/transcode/core/ffmpeg/FFmpegConstants.java
akka-bbb-transcode/src/main/java/org/bigbluebutton/transcode/core/ffprobe/FFProbeCommand.java
akka-bbb-transcode/src/main/java/org/bigbluebutton/transcode/core/processmonitor/ProcessMonitor.java
akka-bbb-transcode/src/main/java/org/bigbluebutton/transcode/core/processmonitor/ProcessMonitorObserver.java
akka-bbb-transcode/src/main/java/org/bigbluebutton/transcode/core/processmonitor/ProcessStream.java
bbb-common-message/src/main/java/org/bigbluebutton/common/messages/Constants.java
bbb-common-message/src/main/java/org/bigbluebutton/common/messages/MessageFromJsonConverter.java
bbb-common-message/src/main/java/org/bigbluebutton/common/messages/MessagingConstants.java
bbb-voice/src/main/java/org/bigbluebutton/voiceconf/messaging/Constants.java
bbb-voice/src/main/java/org/bigbluebutton/voiceconf/messaging/IMessagingService.java
bbb-voice/src/main/java/org/bigbluebutton/voiceconf/messaging/MessageReceiver.java
bbb-voice/src/main/java/org/bigbluebutton/voiceconf/messaging/ReceivedMessageHandler.java
bbb-voice/src/main/java/org/bigbluebutton/voiceconf/messaging/RedisMessagingService.java
bbb-voice/src/main/java/org/bigbluebutton/voiceconf/red5/Service.java
bbb-voice/src/main/java/org/bigbluebutton/voiceconf/sip/CallAgent.java
bbb-voice/src/main/java/org/bigbluebutton/voiceconf/sip/CallAgentObserver.java
bbb-voice/src/main/java/org/bigbluebutton/voiceconf/sip/GlobalCall.java
bbb-voice/src/main/java/org/bigbluebutton/voiceconf/sip/SipPeer.java
bbb-voice/src/main/java/org/bigbluebutton/voiceconf/sip/SipPeerManager.java
bbb-voice/src/main/webapp/WEB-INF/bbb-redis-messaging.xml
bbb-voice/src/main/webapp/WEB-INF/red5-web.xml
2017-05-17 15:54:44 +00:00
Richard Alam
c4c629f699
- continue wiring bbb-apps actor system
2017-05-16 19:13:06 -07:00
Richard Alam
414a4e0fd9
- start wiring bbb-apps actor system
2017-05-16 14:58:49 -07:00
Richard Alam
a1071ce7ba
- try to wire spring for bbb-apps
2017-05-15 12:23:54 -07:00
Richard Alam
a5654804cc
- handle bbb-apps messages
2017-05-14 16:03:50 -07:00
Richard Alam
c0e4a4d681
- handle json message in akka apps
2017-05-12 15:33:46 -07:00
Chad Pilkey
a7366d611a
normalize annotation thickness to preserve size
2017-05-11 20:32:51 -04:00
Richard Alam
0d53d2bf93
- fix compile issues
2017-05-10 14:24:36 -07:00
Richard Alam
76a6d99ca3
- move java classes from bbb-web into bbb-common-web
2017-05-10 13:22:50 -07:00
Richard Alam
0c200871da
- add Jackson Json dependencies
2017-05-09 14:19:22 -07:00
Chad Pilkey
85d525172b
rewrote the text tool to be like other annotations and removed redundant processing
2017-05-03 18:06:26 -04:00
Richard Alam
2fd18e7c09
Merge branch 'multi-user-2.0' of https://github.com/capilkey/bigbluebutton into bbb-2.x-dev-mconf
2017-04-25 11:21:34 -07:00
Richard Alam
e61220e933
Merge branch 'bbb-2.x-dev' of github.com:ritzalam/bigbluebutton into bbb-2.x-dev-mconf
2017-04-25 11:06:31 -07:00
Chad Pilkey
c97aed4057
line smoothing, shape location zoom drift fix, shape drawing efficiency
2017-04-21 17:29:31 -04:00
Richard Alam
a9590976c2
- allow setting default guest policy for meeting
2017-04-18 19:45:32 +00:00
Richard Alam
b8de0c9231
- add authorized role to registered user
2017-04-17 21:23:17 +00:00
Richard Alam
262c7250c8
Merge branch 'master' with bbb-mconf
2017-04-17 15:57:31 +00:00
Richard Alam
a5bc64362d
- user internal userId instead of external userId in register user message
2017-04-12 16:50:54 +00:00
Richard Alam
6537e99981
Merge branch 'multiuser-whiteboard' of https://github.com/capilkey/bigbluebutton into merge-multi-user-whiteboard
2017-04-06 19:12:42 +00:00
Chad Pilkey
1a78091d01
multi-user whiteboard little bit of polish
2017-04-05 19:54:40 -04:00
Chad Pilkey
f7b9782ef3
multi-user whiteboard clear works
2017-04-04 16:43:15 -04:00
Pedro Beschorner Marin
f59e42bb02
Merge remote-tracking branch 'bigbluebutton/master' into merging-into-bbb-1.1
2017-04-04 20:42:15 +00:00
Chad Pilkey
cc2c461df3
first pass as multiuser whiteboard, can mutli draw
2017-03-29 20:12:15 -04:00
Pedro Beschorner Marin
c74cc682c4
Merge remote-tracking branch 'mconf/mconf'
2017-03-20 19:45:59 +00:00
Ghazi Triki
4c4d768883
Added new "webcamsOnlyForModerator" parameter for create meeting API.
2017-01-02 16:56:32 +01:00
Pedro Beschorner Marin
14b480c8ce
Working on avoiding reconnection when ending a meeting by API call
2016-12-09 20:33:03 +00:00
Ghazi Triki
59a0f4665d
Updated RequestBreakoutJoinURL to return two join urls, the first with redirection enable and the second without redirection.
2016-11-21 18:01:22 +01:00
Felipe Cecagno
8f4ca962cc
Merge branch 'undo-stack-size' of github.com:pedrobmarin/bigbluebutton into mconf
...
Conflicts:
bbb-common-message/src/main/java/org/bigbluebutton/common/messages/Constants.java
2016-11-20 21:20:16 -02:00
Felipe Cecagno
faba97fdee
Merge branch 'inactivity-metadata' of github.com:pedrobmarin/bigbluebutton into mconf
...
Conflicts:
bbb-common-message/src/main/java/org/bigbluebutton/common/messages/Constants.java
2016-11-20 00:41:28 -02:00
Pedro Beschorner Marin
1e014f9298
Included metadata reading at server. Setting meeting timeleft and deadline as meta_inactivity-timeleft and meta_inactivity-deadline on create params
2016-10-31 16:51:07 +00:00
Pedro Beschorner Marin
5416d01dcc
Syncing note if a problem is detected while patching
2016-10-26 17:25:49 +00:00
Pedro Beschorner Marin
67189dff4e
Sending sharednotes undo and redo status with current documents message as client starts
2016-10-24 15:42:45 +00:00
Richard Alam
1e8d7a5229
Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into try-to-cleanup-connection
...
Conflicts:
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/BreakoutRoomApp.scala
2016-10-21 19:36:07 +00:00
Pedro Beschorner Marin
ddd1459d4c
Refactored sharednotes UNDO operation and implemented REDO
2016-10-21 19:33:30 +00:00
Pedro Beschorner Marin
1eb1aea65e
More sofisticated control of sharednotes undo button
2016-10-20 19:56:57 +00:00
Pedro Beschorner Marin
758adb3b8e
First functional version of sharednotes undo operation
2016-10-20 17:52:37 +00:00
Richard Alam
5ba3405941
- remove defunct connection when client auto-reconnects.
2016-10-20 15:08:58 +00:00
Ghazi Triki
415e34fb28
Added new property redirectOnJoin to CreateBreakoutRoomsRequest.
2016-10-14 21:28:44 +01:00
Ghazi Triki
c694f632ea
Added redirect property to RequestBreakoutJoinURL.
2016-10-14 20:46:34 +01:00
Ghazi Triki
b078628ad9
Store breakout room externalMeetingID to be used for generating join URL.
2016-10-13 17:17:47 +01:00
Ghazi Triki
5e002d845e
Store breakout room sequence in akka-apps and bbb-web.
2016-10-13 12:53:53 +01:00
Ghazi Triki
ff9bc17c15
Send sequence number when creating breakout rooms and correctly generate a unique externalMeetingId for breakout rooms.
2016-10-12 19:55:20 +01:00
Ghazi Triki
c95d208da7
Added sequence property breakout room.
2016-10-11 22:13:22 +01:00
Ghazi Triki
f7be426305
Breakout rooms refactoring: generated uniques external ID and internal ID.
2016-10-11 20:50:51 +01:00
Ghazi Triki
0e72d7523d
Make breakout rooms use the selected slide of the current presentation as default presentation.
2016-09-28 22:19:48 +01:00
Chad Pilkey
1b72f8b077
add property to closed caption transcript model for the locale code
2016-08-30 17:10:03 -04:00
Richard Alam
65605ee3f9
Merge pull request #3296 from ritzalam/start-pause-stop-screen-sharing-with-webrtc
...
Stop JWS when flash client dies.
2016-08-19 11:23:56 -04:00
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
