Richard Alam
a3530cad91
- remove for now as sometimes when reconnect occurs while there is only one user in the voice conference and
...
the meeting is being records, the audio conference fails to record.
2017-10-19 12:59:14 -07:00
Anton Georgiev
04cef71384
re-enable next/prev/goto slide
2017-10-19 14:47:59 -04:00
Richard Alam
a548af00f7
- format
2017-10-18 10:11:56 -07:00
Richard Alam
8070821068
Merge branch 'pods_vol4' of https://github.com/antobinary/bigbluebutton into implement-multi-chat
2017-10-18 10:09:54 -07:00
Richard Alam
cbd82ffa29
- simplify sending of message
2017-10-18 10:07:54 -07:00
Anton Georgiev
56cdecf152
add presentation into state
2017-10-18 11:46:33 -04:00
Richard Alam
313440abdd
- send an eject message to the client so client doesn't attempt to auto-reconnect
2017-10-17 15:01:10 -07:00
Richard Alam
a5ddf0b203
- setup layered handler traits for rights management
2017-10-17 13:57:57 -07:00
Richard Alam
55e371fce2
- layer rights management traits
2017-10-17 12:37:22 -07:00
Richard Alam
4a48a69c7f
- start implementing rights management
2017-10-17 11:41:05 -07:00
Richard Alam
5c765072c4
- start implementing rights management
2017-10-16 14:32:05 -07:00
Richard Alam
11c7287d26
- don't force changing listen only status on mute and talking events
2017-10-12 15:36:19 -07:00
Richard Alam
73493f1345
- change how we handle listen only for html5 user
2017-10-12 15:33:22 -07:00
Richard Alam
680a538596
- do not set listenOnly status when receiving user joined voice event from FS as
...
HTML5 client connects with no mic
2017-10-12 14:41:12 -07:00
Richard Alam
b87adb98fb
- fix passing of guest policy through create api
2017-10-03 14:45:32 -07:00
Richard Alam
2958095b32
- create private and public chats
2017-10-03 13:42:24 -07:00
Richard Alam
04ae60f6aa
- fix determining of guest status
2017-10-03 11:01:48 -07:00
Richard Alam
058751c3f2
Merge branch 'pods_vol3' of https://github.com/antobinary/bigbluebutton into antobinary-pods_vol3
2017-10-03 08:44:26 -07:00
Anton Georgiev
301003bc2d
cleanup
2017-10-03 11:43:16 -04:00
Richard Alam
ac599366be
- remove akka http prototype as redis scala is incompatible with the latest akka release
2017-10-03 08:36:18 -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
Anton Georgiev
0866bc01ce
independent pods, visible slide on presenter side
2017-10-03 11:06:54 -04:00
Richard Alam
a3ad18347e
Merge branch 'v2.0.x-release' of github.com:bigbluebutton/bigbluebutton into implement-multi-chat
2017-10-02 18:28:02 -07:00
Richard Alam
8ae38b6f5a
- format
2017-10-02 18:01:33 -07:00
Richard Alam
fb72db4c8d
- open new public chat window
2017-10-02 11:04:11 -07:00
Ghazi Triki
ab93ae6c22
Fix send breakout room join url for late joiners.
2017-10-02 18:56:36 +01:00
Richard Alam
b71aaed133
- open multi chat windows
2017-10-02 08:30:20 -07: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
6e6bdd908c
- handle guest approval
2017-09-28 17:57:06 -07:00
Richard Alam
e849e1b5ee
- approve guest user
2017-09-28 16:56:33 -07:00
Richard Alam
fe44a79298
- send guest waiting message to client
2017-09-27 12:48:30 -07:00
Richard Alam
8e7670c81d
- handle guest policy
2017-09-27 11:16:14 -07:00
Anton Georgiev
6d4fa587c8
work on add and remove presentation pods
2017-09-25 14:58:11 -04:00
Richard Alam
4717a53182
- start implementing guest policy
2017-09-22 14:24:08 -07: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
Anton Georgiev
9c92780ddb
added presentation pod models
2017-09-20 16:58:04 -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
Richard Alam
5800f3b752
Merge branch 'upload-token' of https://github.com/antobinary/bigbluebutton into antobinary-upload-token
2017-09-19 10:11:09 -07:00
Richard Alam
c8de303c5c
- add message
2017-09-19 10:11:02 -07:00
Anton Georgiev
3a9eb01bf2
missed calling the handlePresentationUploadTokenReqMsg method in merge
2017-09-19 12:06:49 -04: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
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
Richard Alam
3a203e9adb
- cleanup
...
- try to break meassage
2017-09-12 12:25:10 -07:00
Richard Alam
4b20567d17
- refactor handlers
2017-09-09 06:59:12 -07:00
Richard Alam
9b5f652b1c
- try to extract logger
2017-09-08 12:25:45 -07:00
Richard Alam
8e610bbd22
- refactor handlers
2017-09-07 19:14:08 -07:00
Richard Alam
7f83fe3ea8
- modify polls
2017-09-07 18:00:32 -07:00
Richard Alam
c7c26f637b
- convert screenshare to not use traits
2017-09-07 15:04:50 -07:00
Richard Alam
2a3315f185
- remove parens
2017-09-07 14:50:30 -07:00
Richard Alam
9a5c11aceb
- remove traits from closed caption
2017-09-07 14:30:43 -07:00
Richard Alam
02289d0828
- do not use traits for handlers
2017-09-07 14:14:30 -07: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
0886bc5caa
Merge branch 'bbb-2x-mconf' into implement-group-chat
2017-09-07 09:18:49 -07:00
Richard Alam
987e58e78c
- fix issue where audio isn't recording if there is already a user joined listen only before a user
...
joins full duplex.
2017-09-07 09:11:11 -07:00
Richard Alam
659efaeff0
- start create group chat
2017-09-07 08:36:56 -07:00
Richard Alam
33aae4b505
- fix test compile
2017-09-06 18:39:38 -07:00
Richard Alam
6247079c07
- init state
2017-09-06 18:17:04 -07:00
Richard Alam
5b977fb57d
- add to state
2017-09-06 15:04:53 -07:00
Anton Georgiev
f6edf5d6fb
eject phone user from voice instead of kicking it
2017-09-06 17:55:44 -04:00
Richard Alam
00b2d9242e
- add tests
2017-09-06 14:29:30 -07:00
Richard Alam
c7686b3a90
- implement group chat
2017-09-06 12:58:36 -07:00
Richard Alam
a7056469fb
- implement models
2017-09-05 18:11:43 -07:00
Richard Alam
3a6690c335
- start implementing group chat
2017-09-05 17:08:40 -07:00
Chad Pilkey
523bfa0338
Merge pull request #4334 from ritzalam/rec-poll-result
...
- fix recording of poll result. See issue #4237 .
2017-09-05 14:18:08 -04:00
Pedro Beschorner Marin
4017d12fa1
Refactored shared notes cleaning to force sync
2017-09-01 19:36:15 +00:00
Chad Pilkey
a8ff311f91
Merge pull request #4342 from pedrobmarin/shared-notes-message-limit
...
Shared notes message limit
2017-08-30 18:42:00 -04:00
Chad Pilkey
52bff50f10
clean dimension numbers from pencil end message
2017-08-30 17:14:00 -04:00
Pedro Beschorner Marin
6ab641e7c3
Added shared notes clear button for moderators
2017-08-30 20:32:42 +00:00
Richard Alam
82177b4d85
- fix recording of poll result. See issue #4237 .
2017-08-30 11:01:19 -07:00
Chad Pilkey
b0e3442ef6
relax the pencil smoothing a little
2017-08-29 10:23:25 -04:00
Chad Pilkey
97da17d13b
send annotation updates based on timer
2017-08-23 17:55:03 -04:00
Chad Pilkey
c4f1e7b06f
Merge pull request #4269 from capilkey/remove-userid-capilization
...
Remove userId capital in AssignPresenter recorded event
2017-08-18 14:09:53 -04:00
Chad Pilkey
50d617f622
remove userId capital in AssignPresenter recorded event
2017-08-18 14:07:38 -04:00
Richard Alam
6c1945551d
- fix rtt timer
2017-08-17 14:24:23 -07:00
Anton Georgiev
7cddb1b865
Merge pull request #4258 from antobinary/webcams
...
Do not send broadcast cam event for existing stream
2017-08-17 12:21:11 -04:00
Richard Alam
458d23d0a2
- fix mute all and mute except presenter issue where all users cannot be muted then unmuted
2017-08-16 14:30:36 -07: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
Anton Georgiev
192cd48810
do not send broadcast cam event for existing stream
2017-08-16 16:16:22 -04: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
13b6dc065e
- fix issue where we cannot start breakout rooms again when the first breakout session ends.
2017-08-15 12:24:21 -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
Richard Alam
bc6f4f6638
- log switch presentation
...
- fix switch presentation
2017-08-11 13:19:56 -07:00
Richard Alam
965977cf80
- go through all presentations instead of just getting the active presentation
2017-08-11 13:19:05 -07:00
Anton Georgiev
412c1f95a2
refactor join audio user handler so it can be reused
2017-08-11 15:56:03 -04:00
Anton Georgiev
ec3166dc4a
pass correct value for voiceUserId
2017-08-11 15:51:11 -04:00
Richard Alam
7956b561d2
- remove some printlns to minimize noise
2017-08-11 11:22:26 -07:00
Richard Alam
53b64fcca0
Merge branch 'end-breakout-rooms' of https://github.com/ritzalam/bigbluebutton into ritzalam-end-breakout-rooms
2017-08-10 13:58:02 -07:00
Richard Alam
7f63490e63
- end breakout rooms when parent meeting ends
...
- send breakout ended event
- do not send negative time remaining updates
2017-08-10 13:29:33 -07: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
Richard Alam
d50041f03c
- send messages into separate channels so other components can pick and choose which
...
channels to listen to.
2017-08-10 10:14:50 -07:00
Anton Georgiev
0546afce1f
only allow presenter to change slide
2017-08-10 10:59:03 -04:00
Pedro Beschorner Marin
185f6a85e9
Missing code for the promote/demote users feature
2017-08-09 20:13:52 +00:00
Richard Alam
131c67def3
Merge branch 'fix-webcam-state' of https://github.com/antobinary/bigbluebutton into antobinary-fix-webcam-state
2017-08-08 14:41:51 -07:00
Anton Georgiev
97b3c2fec9
Merge branch 'fix-webcam-state' of github.com:antobinary/bigbluebutton into fix-webcam-state
2017-08-08 15:57:43 -04:00
Anton Georgiev
6b4c9ea8a4
drop camera for leaving user
2017-08-08 15:22:21 -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
05054e4875
- need to notify parent meeting of user join and leave to get listen in to work
2017-08-04 09:32:52 -07:00
Richard Alam
f82e4f9d45
Merge pull request #4203 from ritzalam/fix-breakout-listen-mode
...
breakout listen mode
2017-08-03 23:20:13 -04:00
Richard Alam
279d3797ef
- not transfer works but user isn't removed from users list in breakout room
2017-08-03 15:16:29 -07:00
Chad Pilkey
8db84cdf3f
improvements to the recorded shape events
2017-08-03 15:41:40 -04:00
Richard Alam
a4243ac87a
- auto-assign presenter when presenter is ejected from meeting
2017-08-03 10:50:58 -07:00
Richard Alam
dfef819823
- fix issue where if there is no presenter, we cannot assign a presenter.
2017-08-03 10:50:17 -07:00
Chad Pilkey
34fa2f22b2
Merge pull request #4195 from capilkey/record-extra-share-presentation
...
Record extra SharePresentationEvent when conversion complete and current
2017-08-02 17:30:30 -04:00
Chad Pilkey
4d16c73bde
record extra SharePresentationEvent when conversion complete and current
2017-08-02 17:26:02 -04: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
f6419cce4c
- ignore messages we don't want to record
2017-08-02 11:32:22 -07:00
Richard Alam
d169c417bc
- start recording voice conf when first user joins
2017-08-02 11:31:30 -07:00
Richard Alam
69268f8628
- fix exception when recording pencil whiteboard shape
2017-08-02 11:31:01 -07:00
Richard Alam
4889f66361
Merge branch 'restrict-remote-layout' of https://github.com/capilkey/bigbluebutton into capilkey-restrict-remote-layout
2017-08-01 17:35:47 -07:00
Chad Pilkey
89ea33359c
only apply remote layouts to non-moderators
2017-08-01 18:51:20 -04:00
Richard Alam
3b44d0eac2
- fix issue where late joiners displays the wrong slide
2017-08-01 14:50:44 -07:00
Chad Pilkey
c8caf39d50
make layout data instance based instead of static
2017-07-31 19:02:45 -04:00
Richard Alam
bd0ae4f969
Fix #4159
...
- When a user is in the voice conference using webrtc and the browser refreshes, FS doesn't detect that the
webrtc connection has gone down so it is not able to send a user left voice conf message. It would take a
media timeout for FS to send a user left voice conf event. Remove the user from voice list when user leaves
the meeting. Not sure how this behaves on auto-reconnect of bbb-apps while the webrtc connection is actually
still working.
2017-07-31 14:47:39 -07:00
Richard Alam
8345a97960
- log more messages
2017-07-31 13:55:48 -07:00
Richard Alam
991d704d43
- fix wrong reason when meeting ends due to duration
2017-07-31 13:55:11 -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
f69a70bb3b
remove old java record classes in akka-apps
2017-07-31 12:07:06 -04:00
Chad Pilkey
1f8aa4618f
new akka-apps record structure
2017-07-31 12:02:13 -04:00
Richard Alam
3a6225da2a
- reset timestamp of when last user left when a user joins the meeting
2017-07-31 08:55:58 -07:00
Richard Alam
4c92969a45
Merge branch 'sharednotes-limit' of https://github.com/pedrobmarin/bigbluebutton into pedrobmarin-sharednotes-limit
2017-07-31 08:44:14 -07:00
Richard Alam
2d2261f36a
Merge branch 'handle-presenter-gone' of https://github.com/antobinary/bigbluebutton into antobinary-handle-presenter-gone
2017-07-31 08:32:42 -07:00
Pedro Beschorner Marin
77603a62c8
Limiting the number of shared notes
2017-07-30 22:11:13 +00:00
Anton Georgiev
88055c5ca9
add sync of whiteboard access on meteor start
2017-07-28 17:57:41 -04:00
Anton Georgiev
173ba4531a
stop screenshare and poll on presenter leave
2017-07-28 17:16:03 -04:00
Richard Alam
eb994c09a3
- do not send extra messages on validate token response
...
- make flash client explicitly send user join message to server
2017-07-27 13:42:36 -07:00
Richard Alam
156436d34a
- reset last user left timestamp when user joins meeting
2017-07-27 12:13:05 -07:00
Richard Alam
3fd747a9b3
- log when meeting ends
2017-07-27 11:35:26 -07:00
Richard Alam
6df8305dac
- log reason when meeting expires
2017-07-27 10:18:03 -07: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
Richard Alam
36e8f02667
- fix meeting expiry
2017-07-25 15:02:07 -07:00
Richard Alam
b1ad1668dd
- fix test compile errors
2017-07-25 13:44:18 -07:00
Richard Alam
3921eaf36f
- display timer
...
- make sure talking indicator is off when user is muted
2017-07-25 13:43:35 -07:00
Richard Alam
d0b7e9c121
- assign presenter when presenter leaves
2017-07-25 13:41:56 -07:00
Richard Alam
59e149a6e1
- display meeting time remaining
2017-07-25 11:54:13 -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
8415300b3f
- fix breakout time remaining
2017-07-24 14:44:15 -07:00
Richard Alam
ab5cad41e7
- handle some of breakout messages
...
- timer still not working
- listen not working
- breakout users list not working
2017-07-24 12:56:09 -07:00
Richard Alam
555302f11e
- try to fix messaging of breakout rooms
2017-07-24 10:39:29 -07:00
Richard Alam
e89c20f245
- need to fix client to handle breakout messages properly
2017-07-23 18:39:00 -07:00
Richard Alam
8305782294
- create breakout room
...
- send join url to client
2017-07-23 18:14:26 -07:00
Richard Alam
8c2eeac294
- modify how we set meeting state
...
- cleanup
2017-07-22 08:42:02 -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
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
