Richard Alam
|
7b80d678dd
|
- remove user from presenter list when removed from presenter group
|
2017-11-30 15:14:42 -08:00 |
|
Richard Alam
|
0f23891649
|
- set no presenter to a pod if presenter group is empty
|
2017-11-30 13:24:19 -08:00 |
|
Richard Alam
|
fdf075e7df
|
- look for all pods where the user was the presenter
|
2017-11-30 13:10:37 -08:00 |
|
Richard Alam
|
0a2610ab18
|
- when a presenter on a pod leaves, assigne another presenter into that pod
|
2017-11-30 12:58:02 -08:00 |
|
Chad Pilkey
|
01efd0dbf4
|
stop viewers from opening new public chat pods
|
2017-11-24 19:04:31 -05:00 |
|
Richard Alam
|
99367b171b
|
- handle delayed messages in cases where lock settings are being changed
|
2017-11-23 08:16:34 -08:00 |
|
Richard Alam
|
b1b04939bd
|
- add comment on why we filter delayed messages after switching presenter
|
2017-11-22 14:14:22 -08:00 |
|
Richard Alam
|
3a29ecdc49
|
- filter delayed presentation messages after swithching presenter
|
2017-11-22 14:10:33 -08:00 |
|
Richard Alam
|
ace9fdd2b7
|
- handle delayed wb messages when switching from multi-user to single-user
|
2017-11-22 13:35:57 -08:00 |
|
Richard Alam
|
e3fc2b7088
|
- add the current presenter into the old presenter list when switching presenters
|
2017-11-21 15:07:54 -08:00 |
|
Richard Alam
|
e6b9946ba7
|
- do not eject old presenter messages in cases where delayed messages arrive in akka-apps
|
2017-11-21 14:42:33 -08:00 |
|
Richard Alam
|
764bc5a00c
|
Merge branch 'fix-private-chat-issues' of https://github.com/ritzalam/bigbluebutton into ritzalam-fix-private-chat-issues
|
2017-11-20 08:51:50 -08: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
|
1623e5b05e
|
- retrieve private chat for user if reconnected
|
2017-11-17 11:37:41 -08: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 |
|
Richard Alam
|
13d8711c53
|
Merge branch 'v2.0.x-release' of github.com:bigbluebutton/bigbluebutton into synch-with-v2.0
|
2017-11-15 07:35:52 -08:00 |
|
Fred Dixon
|
4e59904455
|
Merge pull request #4672 from antobinary/add-multi-login-html5-flash
Do not send UserLeftVoice on UserLeave - fix for audio state issue on reconnect
|
2017-11-15 08:36:32 -05:00 |
|
Anton Georgiev
|
a892d9fdd8
|
do not send UserLeftVoice on UserLeave --fix for audio state issue on reconnect
|
2017-11-14 17:36:08 -05:00 |
|
Anton Georgiev
|
16e7f5867b
|
I missed a line when resolving the conflict
|
2017-11-14 12:16:29 -05: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
|
f22cab9ac7
|
Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into fix-chat-issues
|
2017-11-13 08:54:19 -08:00 |
|
Richard Alam
|
b2aae3ab3c
|
- clear public chat (incomplete)
TODO: client doesn't clear yet
|
2017-11-13 05:56:14 -08:00 |
|
Chad Pilkey
|
82ea62a7ac
|
Merge pull request #4653 from capilkey/2.1-update-record-events
Modify presentation, chat, and cursor record events to match 2.1 specs
|
2017-11-09 19:20:53 -05:00 |
|
Chad Pilkey
|
627a4e332e
|
modify presentation, chat, and cursor record events to match 2.1 specs
|
2017-11-09 19:03:55 -05:00 |
|
Chad Pilkey
|
46e0253f17
|
Merge remote-tracking branch 'upstream/master' into implement-rights-management
|
2017-11-09 14:36:25 -05:00 |
|
Anton Georgiev
|
84df0dfdd4
|
Merge pull request #4646 from ritzalam/fix-chat-issues
Fix chat issues
|
2017-11-09 13:46:31 -02:00 |
|
Chad Pilkey
|
d1ebaa249b
|
Merge remote-tracking branch 'upstream/master' into implement-rights-management
|
2017-11-08 19:47:50 -05:00 |
|
Chad Pilkey
|
9f9cef6088
|
add rights-management for creating chat groups and sending messages
|
2017-11-08 19:24:53 -05:00 |
|
Chad Pilkey
|
bd20efea20
|
finished rights-management checks (minus chat)
|
2017-11-08 18:48:25 -05:00 |
|
Richard Alam
|
60d030d436
|
- track chat box closing
|
2017-11-07 04:31:01 -08:00 |
|
Chad Pilkey
|
0b7ee4d694
|
improvements to the page move events
|
2017-11-06 16:36:20 -05:00 |
|
Richard Alam
|
42b96e370d
|
- propagate guest policy change to bbb-web
|
2017-11-05 20:21:42 -08:00 |
|
Richard Alam
|
fb5723af1e
|
Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into fix-chat-issues
|
2017-11-05 15:46:06 -08:00 |
|
Richard Alam
|
8e350724f4
|
- cleanup
|
2017-11-03 14:58:00 -07:00 |
|
Anton Georgiev
|
3ed0fc2a55
|
cleanup
|
2017-11-03 16:22:26 -04:00 |
|
Anton Georgiev
|
411307af3f
|
handle zoom and move event in presentation pods
|
2017-11-03 15:35:59 -04:00 |
|
Anton Georgiev
|
9451b774aa
|
move presentation conversion handling under presentatio pods
|
2017-11-03 14:27:10 -04:00 |
|
Anton Georgiev
|
57bd43f8a8
|
move presentation upload token to presentationPods
|
2017-11-03 13:55:44 -04:00 |
|
Richard Alam
|
3698c08315
|
Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into fix-chat-issues
|
2017-11-03 10:11:10 -07:00 |
|
Anton Georgiev
|
4b3dd41c13
|
adjust permission level formation for presenter group
|
2017-11-03 11:59:15 -04:00 |
|
Anton Georgiev
|
ed725e1a97
|
remove user from presenter group on user leave
|
2017-11-03 11:43:06 -04:00 |
|
Richard Alam
|
4a5e4d4238
|
- cleanup
|
2017-11-03 08:38:49 -07:00 |
|
Anton Georgiev
|
a3d91b9ddb
|
adjust permissions for RemovePresentationPodPubMsg
|
2017-11-03 10:57:46 -04:00 |
|
Anton Georgiev
|
6ce6b73e6a
|
Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into pods_vol4
|
2017-11-03 10:08:10 -04:00 |
|
Anton Georgiev
|
5e5abc871d
|
adapt Polls in akka-apps to work with the default presentation pod only
|
2017-11-02 18:08:42 -04:00 |
|
Richard Alam
|
1c5c387456
|
- add all moderators to presenter group
|
2017-11-02 14:08:38 -07:00 |
|
Anton Georgiev
|
f1d3f31f3f
|
reuse DEFAULT_PRESENTATION_POD as a const
|
2017-11-02 16:54:42 -04:00 |
|
Richard Alam
|
4d44f09c84
|
- add permissions check on a few messages
|
2017-11-02 13:16:44 -07:00 |
|
Richard Alam
|
c2d0406d4c
|
- Check auth token when connecting to bbb-video. Close connection if not authorized.
|
2017-11-02 10:33:28 -07:00 |
|
Richard Alam
|
06e974847e
|
- send validate conn token
|
2017-11-01 19:54:24 -07:00 |
|
Richard Alam
|
4e8f2abbb3
|
- pass token on video connect
|
2017-11-01 14:55:48 -07:00 |
|
Richard Alam
|
f9b4209d74
|
- make chapter break length configurable
|
2017-11-01 12:23:03 -07:00 |
|
Anton Georgiev
|
9818fca29e
|
Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into pods_vol4
|
2017-11-01 09:56:58 -04: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 |
|
Chad Pilkey
|
a51274c7ad
|
add security check for ChangeUserEmoji
|
2017-10-31 13:07:53 -04:00 |
|
Chad Pilkey
|
3b91a87658
|
change two security checks to header userId from body
|
2017-10-31 13:06:00 -04:00 |
|
Chad Pilkey
|
7e47a08f29
|
allow users to mute themselves again
|
2017-10-31 13:05:07 -04:00 |
|
Chad Pilkey
|
ebcf7dc4cc
|
added some of the rights management checks
|
2017-10-30 23:21:02 -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 |
|
Anton Georgiev
|
d888af2583
|
cleanup; moved assignments after constructor
|
2017-10-29 11:53:16 -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
|
7885023e19
|
Merge branch 'implement-multi-chat' of github.com:ritzalam/bigbluebutton into antobinary-pods_vol4
|
2017-10-28 14:58:35 -07:00 |
|
Richard Alam
|
519da9033d
|
Merge branch 'pods_vol4' of https://github.com/antobinary/bigbluebutton into antobinary-pods_vol4
|
2017-10-27 17:16:57 -07:00 |
|
Anton Georgiev
|
99f409f41e
|
cleanup
|
2017-10-27 19:28:22 -04:00 |
|
Anton Georgiev
|
d38a05105c
|
work on maintaining correct state (current presentation in pod)
|
2017-10-27 19:17:50 -04:00 |
|
Richard Alam
|
14691b2bf1
|
- change trigger for start/stop voice recording
|
2017-10-27 09:29:27 -07:00 |
|
Richard Alam
|
a7a8c2a0cc
|
Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into implement-multi-chat
|
2017-10-27 08:03:25 -07:00 |
|
Richard Alam
|
84b12dfa94
|
Merge branch 'v2.0.x-release' of github.com:bigbluebutton/bigbluebutton into synch-with-v2.0
|
2017-10-27 07:51:17 -07:00 |
|
Anton Georgiev
|
1efe354031
|
work on default pod race condition and controlling current pres
|
2017-10-26 17:54:21 -04:00 |
|
Richard Alam
|
51b9634bcd
|
- cahpterBreakLength config option
|
2017-10-26 14:14:00 -07:00 |
|
Richard Alam
|
c14a946041
|
- generate recording path in akka-apps for audio
|
2017-10-26 14:07:22 -07:00 |
|
Fred Dixon
|
4569e2d25e
|
Merge pull request #4575 from capilkey/fix-fit-to-width-extremes
Relax presentation resize bounds to accommodate fit-to-width
|
2017-10-26 15:00:48 -04:00 |
|
Chad Pilkey
|
18a97923c6
|
relax presentation resize bounds to accomodate fit-to-width
|
2017-10-26 13:20:43 -04:00 |
|
Richard Alam
|
1fc7362b2b
|
- add user into user's list when auto-reconnected to bbb-apps
|
2017-10-25 14:58:09 -07:00 |
|
Richard Alam
|
852353a491
|
- stop, start voice recording when chapter break occurs
|
2017-10-25 11:18:27 -07:00 |
|
Richard Alam
|
8497b9049d
|
Merge branch 'master' into implement-multi-chat
|
2017-10-25 07:33:26 -07:00 |
|
Anton Georgiev
|
ff1aac2698
|
hardcode podId for first pod (for default.pdf)
|
2017-10-24 16:54:55 -04:00 |
|
Anton Georgiev
|
8e06408a33
|
set current presenter in pod
|
2017-10-24 15:49:57 -04:00 |
|
Richard Alam
|
1f99106ba1
|
- write chapter break done file to kick off processing
|
2017-10-23 13:31:07 -07:00 |
|
Anton Georgiev
|
31ce060896
|
added podId to SlideView to isolate events
|
2017-10-23 16:30:25 -04:00 |
|
Richard Alam
|
066ceea0f4
|
- generate record chapter break event
|
2017-10-23 12:16:26 -07:00 |
|
Richard Alam
|
6067b96db8
|
Merge branch 'master' into implement-multi-chat
|
2017-10-23 08:00:42 -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
|
325a6ef8f2
|
show presenter group in pod dropdown
|
2017-10-21 08:03:52 -04:00 |
|
Anton Georgiev
|
030567368a
|
add/remove user from presenter groups
|
2017-10-20 17:01:57 -04:00 |
|
Richard Alam
|
d832719d27
|
- clean up some unused code
|
2017-10-20 11:24:05 -07:00 |
|
Richard Alam
|
54bd2acf99
|
- fix tests
|
2017-10-20 10:49:36 -07: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
|
ec35eed07c
|
Merge branch 'v2.0.x-release' of github.com:bigbluebutton/bigbluebutton
|
2017-10-20 08:10:43 -07:00 |
|
Richard Alam
|
333dba585b
|
- 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-20 07:38:50 -07:00 |
|
Richard Alam
|
cfec9de678
|
Merge branch 'v2.0.x-release' of github.com:bigbluebutton/bigbluebutton into update-with-20
|
2017-10-19 18:20:25 -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 |
|
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 |
|