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
10c4846b92
- provide a way to filter messages we want to record
2017-07-21 20:25:41 -07:00
Richard Alam
2abedb7276
- try to fix breakout rooms
2017-07-21 19:00:00 -07:00
Richard Alam
47f012f08f
- start fixing breakout rooms
2017-07-21 14:15:51 -07:00
Chad Pilkey
d68229f182
fix the resize and move data storage
2017-07-21 15:53:43 -04: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
Richard Alam
905f1a8e71
- clean up
2017-07-20 17:33:49 -07:00
Chad Pilkey
c5e9f4401e
change Polls.scala to use better ArrayBuffer to Array conversion
2017-07-20 18:58:50 -04:00
Chad Pilkey
3a824e13db
cleaned up pre-2.0 user messages
2017-07-20 18:57:55 -04:00
Richard Alam
6be6e9191a
- try to fix webcam list
2017-07-20 10:09:01 -07: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
56ae9ca9a8
- move handlers to a different package
2017-07-19 11:40:30 -07:00
Richard Alam
a61030a95f
- track meeting inactivity and expiry in akka-apps
2017-07-18 14:47:42 -07:00
Richard Alam
03ea339e21
Merge branch 'bbb-2x-mconf' into work-on-meeting-lifcycle
2017-07-17 19:37:38 -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
Richard Alam
e62efc3820
- try to figure out why meeting doesn't end when user leaves
2017-07-17 14:59:31 -07:00
Anton Georgiev
d8dc01d333
display current webrtc screenshare to late joiners (if broadcasting)
2017-07-17 17:48:44 -04:00
Richard Alam
61147dbb67
- try passing state around to track meeting expiry
2017-07-17 14:30:08 -07:00
Richard Alam
1f50ec2da7
- send destroy meeting to BBBActor when meeting ends
2017-07-17 09:13:07 -07:00
Richard Alam
eb9a96348a
- restructure handlers to make it easier to test
2017-07-16 18:34:44 -07:00
Richard Alam
43edb0ea4c
- convert get users query to 2x
2017-07-16 14:06:05 -07: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
cc1e47ecef
fixed the poll annotation drawing
2017-07-15 15:34:30 -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
Richard Alam
80213da06e
- try writing test
...
- start implementing meeting inactivity
- updated scalariform to format scala code
2017-07-14 14:50:34 -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
08fe6cea81
Merge branch 'bbb-2x-mconf' of github.com:bigbluebutton/bigbluebutton into work-on-meeting-lifcycle
2017-07-14 07:25:31 -07:00
Richard Alam
f2eebff87f
- init test data properly
2017-07-13 19:32:58 -07:00
Richard Alam
4d12ed57fd
- remove log noise
2017-07-13 18:16:18 -07: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
Richard Alam
e7d1bd6a26
- make outgwbus replaceable for testing
2017-07-13 14:55:58 -07:00
Anton Georgiev
701ada98a8
unsubscribe from screenshare bus channel
2017-07-13 12:27:30 -04:00
Anton Georgiev
3d420cf459
force disconnect for all users on meeting end
2017-07-13 11:58:16 -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
199af1773b
send userLeave on user eject
2017-07-11 15:25:51 -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
Richard Alam
40d00282f5
- send deskshare messages from fsesl
2017-07-10 19:17:51 -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
Anton Georgiev
0e9dcee399
Merge branch 'bbb-2x-mconf' of github.com:bigbluebutton/bigbluebutton into implement-bbb-web-msgs
2017-07-09 11:09:23 -04:00
Richard Alam
8d91ef8132
- convert several old client messages to new ones
2017-07-09 07:44:29 -07:00
Anton Georgiev
35b87ee069
Merge branch 'bbb-2x-mconf' of github.com:bigbluebutton/bigbluebutton into implement-bbb-web-msgs
2017-07-09 10:37:34 -04:00
Anton Georgiev
900518fb1b
cleanup
2017-07-09 10:26:55 -04: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
Richard Alam
2212d95a28
Merge branch 'bbb-2x-mconf' of https://github.com/bigbluebutton/bigbluebutton into implement-meeting-status
2017-07-08 07:23:30 -07:00
Richard Alam
1320988a95
- handle register user properly
2017-07-08 07:22:45 -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
prlanzarin
a9bbdd11aa
Now correctly pointed akka-transcode ffmpeg path
...
Reverted akka-apps video-broadcast application.conf
2017-07-06 15:33:04 +00:00
prlanzarin
2d8e04ffd8
Transcoder now only relays RTP to RTMP video
...
Updated akka-transcode base SDP to use AVPF. Will make it dynamic later
Changed akka-transcode ffmpeg base path to packaged ffmpeg
2017-07-06 13:02:29 +00:00
Richard Alam
246fded4ff
- start removing old out messages
2017-07-05 14:08:30 -07:00
Klauswk
ebb3984828
Merge branch 'bbb-2x-mconf' into html5-2x-getAll-messages
2017-07-05 15:28:35 -03:00
Richard Alam
44f7b0c622
- remove old users model
2017-07-05 11:20:48 -07:00
Richard Alam
53bdd7f008
- handle messages from akka-apps to update meeting state in bbb-web used to return
...
in GetMeetingInfo API requests
2017-07-04 12:58:26 -07:00
Richard Alam
955b162915
- send new presentation conversion progress messages
2017-07-04 10:32:30 -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
962deb555d
Removed synchronized blocks from sharednotes akka-app
2017-07-03 20:22:13 +00: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
Anton Georgiev
189230cc43
Merge branch 'sync' into presentation-and-slides
2017-06-30 14:12:25 -04:00
Anton Georgiev
2e0f6d8610
trigger syncing with state from akka-apps
2017-06-30 11:19:11 -04:00
Anton Georgiev
19d89c6f92
trigger syncing with state from akka-apps
2017-06-30 10:58:49 -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
29052e6f79
- send layout response to requester user instead of whole meeting
2017-06-29 07:31:23 -07:00
Richard Alam
0aed46c986
- add validate token handler tests
2017-06-28 14:56:35 -07: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
Richard Alam
f4bcb2421a
- send poll voting to client
2017-06-26 14:39:52 -07:00
Richard Alam
2316e73c26
Merge branch '2.0-Polls' of https://github.com/antobinary/bigbluebutton into antobinary-2.0-Polls
2017-06-26 14:00:38 -07:00
Chad Pilkey
7c19972d24
remove pre-2.0 caption server code
2017-06-26 16:47:18 -04:00
Chad Pilkey
d690b49898
clear transcript owner when they leave the meeting
2017-06-26 16:46:09 -04:00
Anton Georgiev
f98bd01c3f
send poll result without extra stringify
2017-06-26 15:45:15 -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
9dc41437e8
- handle user left
2017-06-26 10:34:22 -07:00
Richard Alam
dfa1557116
- display default presentation
2017-06-26 07:24:38 -07: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
dd175bee89
- mute user
2017-06-24 14:56:06 -07:00
Richard Alam
ae4fc536b1
- fix use leaving voice conf
2017-06-24 06:47:19 -07:00
Richard Alam
77da487c60
- handle user muted and talking messages
2017-06-23 18:14:55 -07:00
Richard Alam
002a447273
- user talking message
2017-06-23 15:18:30 -07:00
Richard Alam
ceb4d74e55
- handle user join and left voice conference
2017-06-23 14:34:05 -07:00
Anton Georgiev
9a0a4d5669
work on displaying poll result annotation in flash client
2017-06-23 17:26:53 -04: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
c4616f1ce0
- load modules after validate token
2017-06-22 14:42:10 -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
30bafd7983
- try using new user data instead of BBBUser
2017-06-21 09:41:59 -07:00
Richard Alam
582cdf07ec
- fix compile issue due to breaking of messages
2017-06-21 08:05:49 -07:00
Richard Alam
71d8b26ec1
- fake user generator so we can populate meeting with fake users for development
2017-06-20 13:44:26 -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
d0343b40d2
- delay processing of pre-uploaded presentation to make sure that meeting has been created before
...
presentation conversion has completed.
2017-06-19 13:04:07 -07:00
Richard Alam
bb8944570b
- fix validate auth token race condition where the validate auto token is sent to the meeting before
...
the meeting has been created
2017-06-19 12:34:53 -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
e80a3de440
- put message into it's own sender
2017-06-17 19:28:43 -07: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
522227da51
startPoll does not need to return anything. Avoid .get
2017-06-16 17:19:09 -04:00
Anton Georgiev
b3c323bdc7
cleanup
2017-06-16 17:05:12 -04:00
Anton Georgiev
c6e7a17085
sendGetCurrentPollRespMsg with Option[PollVO]
2017-06-16 17:03:21 -04:00
Anton Georgiev
b61fe6faaf
send events straight to meeting eventBus
2017-06-16 14:54:38 -04: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
5c84354715
- try to consolidate meeting state in one place
2017-06-15 19:09:32 -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
326ba5e481
- put message into it's own hdlr
2017-06-13 19:26:04 -07: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
Richard Alam
55209b0685
- simplify deserializing of messages
2017-06-12 14:12:28 -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
de0001bb74
- webcam streams model
2017-06-11 18:07:19 -07:00
Richard Alam
35b449b199
- create new status models
2017-06-10 11:11:22 -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
Pedro Beschorner Marin
d6b1dd09b9
Merge remote-tracking branch 'mconf-akka-transcoding' into 1.1-transcode
...
Conflicts:
akka-bbb-apps/src/main/java/org/bigbluebutton/core/pubsub/receivers/UsersMessageReceiver.java
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/MeetingActor.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/VideoApp.scala
2017-06-08 18:57:37 +00:00
Richard Alam
b3e5bd1c37
- remove jedis dependecy
2017-06-08 11:29:44 -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
40aeabb41c
Cleaning up some unused transcode akka-apps methods
2017-06-08 15:53:49 +00:00
Richard Alam
b6f1b6447d
- start refactoring recording service
2017-06-07 14:48:33 -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
Pedro Beschorner Marin
719ef1377a
Merge remote-tracking branch 'mconf' into merging-into-bbb-1.1
...
Conflicts:
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/MeetingActor.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
bbb-video/src/main/java/org/bigbluebutton/app/video/VideoApplication.java
bbb-video/src/main/java/org/bigbluebutton/app/video/converter/VideoRotator.java
bigbluebutton-client/locale/en_US/bbbResources.properties
bigbluebutton-client/locale/pt_BR/bbbResources.properties
bigbluebutton-client/resources/prod/MconfLive.html
bigbluebutton-client/src/org/bigbluebutton/common/Images.as
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/present/ui/views/PresentationWindow.mxml
bigbluebutton-client/src/org/bigbluebutton/modules/users/views/UsersWindow.mxml
bigbluebutton-config/bin/bbb-conf
record-and-playback/core/lib/recordandplayback/generators/audio_processor.rb
record-and-playback/core/lib/recordandplayback/generators/video.rb
record-and-playback/core/scripts/rap-worker.rb
record-and-playback/presentation/playback/presentation/0.9.0/lib/writing.js
record-and-playback/presentation/scripts/process/presentation.rb
record-and-playback/presentation/scripts/publish/presentation.rb
2017-06-07 19:31:15 +00: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
2999e71530
- remove meeting model
2017-05-29 18:59:00 -07:00
Richard Alam
47b0ada045
- track meeting status
2017-05-29 14:41:37 -07:00
Richard Alam
84bfd93701
- handle register user message
2017-05-29 12:17:25 -07:00
Richard Alam
bd83dc012e
- fix test
2017-05-28 18:12:52 -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
272df3c23d
- send message to client
2017-05-26 20:00:33 -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
467598ffd2
- turn off keep alive message
2017-05-23 17:36:05 -07:00
Richard Alam
d30b5c4aac
- start up the client
2017-05-19 20:00:20 -07:00
Pedro Beschorner Marin
6966bfc5af
Added VideoApp in akka-apps to manage the video transcoding
2017-05-17 18:01:25 +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
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
aeb4445453
- finish wiring up actor system for bbb-apps
2017-05-17 08:20:01 -07:00
Richard Alam
f610e4e2ce
Merge branch 'move-java-classes-from-bbb-web-to-bbb-common-web' of github.com:ritzalam/bigbluebutton into move-java-classes-from-bbb-web-to-bbb-common-web
2017-05-12 15:34:54 -07:00
Richard Alam
c0e4a4d681
- handle json message in akka apps
2017-05-12 15:33:46 -07:00
Richard Alam
a077748c57
- start setup akka system for bbb-apps
2017-05-12 13:11:28 -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
Richard Alam
422ee08ea1
- setup tests
2017-05-09 11:47:44 -07:00
Richard Alam
2aa12e9301
- comment out println
2017-05-08 12:57:32 -07:00
Richard Alam
ddf5eb9caa
- upgrade dependencies versions
2017-05-08 12:43:19 -07:00
