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
