Richard Alam
|
47147056c4
|
- handle properly out of order recording started/stopped events from freeswitch
|
2018-02-07 07:30:33 -08:00 |
|
Richard Alam
|
2fa91e3308
|
- silence log
|
2018-02-05 17:30:51 -08:00 |
|
Richard Alam
|
1354b065be
|
Merge branch 'require-auth-token-on-red5-connect' of github.com:ritzalam/bigbluebutton into merge-20-with-master
|
2018-01-29 12:36:41 -08:00 |
|
Richard Alam
|
e3c54fc27c
|
- fix merge exceptions
|
2018-01-23 09:01:14 -08:00 |
|
Ghazi Triki
|
a2feb9bf5b
|
Merge remote-tracking branch 'bigbluebutton/v2.0.x-release' into master-merge-2.0
# Conflicts:
# akka-bbb-apps/src/main/scala/org/bigbluebutton/core/domain/MeetingStatus.scala
# akka-bbb-apps/src/main/scala/org/bigbluebutton/core/running/MeetingActor.scala
# bbb-common-web/src/main/scala/org/bigbluebutton/api2/BbbWebApiGWApp.scala
# bigbluebutton-client/branding/default/style/css/V2Theme.css
# bigbluebutton-client/branding/default/style/css/assets/swf/v2_skin.fla
# bigbluebutton-client/branding/default/style/css/assets/swf/v2_skin.swf
# bigbluebutton-client/locale/en_US/bbbResources.properties
# bigbluebutton-client/src/org/bigbluebutton/main/model/users/JoinService.as
# bigbluebutton-client/src/org/bigbluebutton/main/model/users/UserService.as
# bigbluebutton-client/src/org/bigbluebutton/main/views/LoggedOutWindow.mxml
# bigbluebutton-client/src/org/bigbluebutton/main/views/MainToolbar.mxml
# bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/AddChatTabBox.mxml
# bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatMessageRenderer.mxml
# bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatWindowEventHandler.as
# bigbluebutton-client/src/org/bigbluebutton/modules/users/services/MessageReceiver.as
# bigbluebutton-client/src/org/bigbluebutton/modules/users/views/MediaItemRenderer.mxml
# bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/maps/VideoEventMap.mxml
# bigbluebutton-html5/private/config/development/server/log.yaml
|
2018-01-23 12:27:42 +01:00 |
|
Richard Alam
|
aef4030750
|
- authorize connection using token
|
2018-01-22 14:05:48 -08:00 |
|
Richard Alam
|
672d3b5ef7
|
- try to prevent connecting to bbb-video with authz
|
2018-01-22 11:54:57 -08:00 |
|
Ghazi Triki
|
d6294c84a4
|
Fix function name typo.
|
2018-01-20 16:36:54 +01:00 |
|
Richard Alam
|
d4a5b91bc4
|
Merge pull request #4940 from capilkey/update-air-2.1
Update AIR for 2.1
|
2018-01-10 14:06:20 -08:00 |
|
Chad Pilkey
|
2717ef39da
|
removed unneeded properties from chat messages
|
2018-01-10 15:06:43 -05:00 |
|
Richard Alam
|
a5f80187e6
|
- when the client is ejected and it attempts to reconnect, the validate token should fail.
|
2018-01-09 12:31:50 -08:00 |
|
Ghazi Triki
|
9cad3facc3
|
Set webcamsOnlyForModerator in MeetingActor when the meeting is creator.
|
2018-01-09 20:47:03 +01:00 |
|
Richard Alam
|
e9b4cb817d
|
- change presenter of default presentation pod when presenter has changed
|
2018-01-08 12:13:20 -08:00 |
|
Richard Alam
|
1a2a2826ec
|
- do not kick new presenter out because of permission check
|
2018-01-08 11:23:21 -08:00 |
|
Ghazi Triki
|
d1c765e614
|
Merge remote-tracking branch 'bigbluebutton/v2.0.x-release' into webcams-only-for-moderator-on-off
|
2018-01-08 19:33:23 +01:00 |
|
Richard Alam
|
b93a95ca8e
|
Merge pull request #4896 from prlanzarin/flash-webcam-fix
Ghost flash webcams fix
|
2018-01-08 10:18:52 -08:00 |
|
Ghazi Triki
|
36f02e8528
|
Request webcamsOnlyForModerator value at user enter success.
|
2018-01-07 22:24:54 +01:00 |
|
Ghazi Triki
|
38ab186b53
|
Change webcamsOnlyForModerator property and handle saving it in server and client.
|
2018-01-07 16:45:24 +01:00 |
|
Richard Alam
|
fb7a38eb52
|
- remove presenter group
|
2018-01-05 12:59:40 -08:00 |
|
prlanzarin
|
3f8e7c308c
|
Revert "Added checking for HTML5 webcams"
This reverts commit 51b62ed30d.
|
2017-12-22 18:30:40 +00:00 |
|
Anton Georgiev
|
61c12298e2
|
Merge pull request #4661 from prlanzarin/bbb-webrtc-sfu
Add support for WebRTC screensharing into Flash/HTML5 and WebRTC video into HTML5
|
2017-12-22 14:43:38 -02:00 |
|
Richard Alam
|
7637cedd4b
|
Merge branch 'v2.0.x-release' of github.com:bigbluebutton/bigbluebutton into synch-with-v2.0
|
2017-12-21 12:48:20 -08:00 |
|
Richard Alam
|
78afb91562
|
- implement muteOnstart by passing on create API or using bigbluebutton.properties in bbb-web instead of setting it in config.xml
|
2017-12-21 10:40:44 -08:00 |
|
prlanzarin
|
51b62ed30d
|
Added checking for HTML5 webcams
This should prevent blank webcams on the flash client
|
2017-12-21 17:38:39 +00:00 |
|
Richard Alam
|
64a9cbfea1
|
- users come in as always unmuted, so no need to check muted flag
|
2017-12-20 13:30:35 -08:00 |
|
Ghazi Triki
|
276e9e2f5f
|
Fix put meeting and at muted status.
|
2017-12-20 17:32:10 +01:00 |
|
Chad Pilkey
|
911c2b84fe
|
Merge pull request #4845 from capilkey/fix-presentationpod-reconnect
Change presentation pod reconnect to get all pods
|
2017-12-18 20:30:54 -05:00 |
|
Chad Pilkey
|
5bb13dedbf
|
change presentation pod reconnect to get all pods
|
2017-12-18 17:07:08 -05:00 |
|
Richard Alam
|
fd9906844f
|
- auto join user on reconnect
|
2017-12-15 19:17:08 -08:00 |
|
Richard Alam
|
72fd493c23
|
- add reason on why client is disconnected
|
2017-12-15 19:16:37 -08:00 |
|
Richard Alam
|
f5b9dfd644
|
Merge pull request #4837 from capilkey/2.1-checkpresenter-podmsghandlers
Add a check for currentPresenter in pod message handlers
|
2017-12-15 19:55:22 -05:00 |
|
Richard Alam
|
058fff1e00
|
Merge branch '2.1-checkpresenter-podmsghandlers' of https://github.com/capilkey/bigbluebutton into capilkey-2.1-checkpresenter-podmsghandlers
|
2017-12-15 16:50:34 -08:00 |
|
Chad Pilkey
|
32375f1c66
|
add check for currentPresenter in pod message handlers
|
2017-12-15 19:47:06 -05:00 |
|
Richard Alam
|
31a80be511
|
- handle presentation download change in client
|
2017-12-15 08:50:59 -08:00 |
|
Ghazi Triki
|
89814bd613
|
Implement new feature: set presentation downloadable on and off. Work in progress.
|
2017-12-15 16:08:56 +01:00 |
|
Richard Alam
|
6a66a9fe01
|
- add create breakout rooms request to whitelist
- use current presentation and page of main presentation window as default presentation for breakout rooms
|
2017-12-13 12:15:18 -08:00 |
|
Richard Alam
|
e0d0971070
|
Merge branch '2.1-whiteboard-improvements' of https://github.com/capilkey/bigbluebutton into capilkey-2.1-whiteboard-improvements
|
2017-12-13 10:16:43 -08:00 |
|
Chad Pilkey
|
1587b7560c
|
remove SyncWhiteboardAccess from one more place
|
2017-12-13 12:14:04 -05:00 |
|
Chad Pilkey
|
1551dcae15
|
move multiuser to be per-whiteboard
|
2017-12-13 02:14:43 -05:00 |
|
Richard Alam
|
3e3e661856
|
Merge pull request #4799 from ritzalam/eject-duplicate-user
Eject duplicate user
|
2017-12-12 10:55:51 -05:00 |
|
Richard Alam
|
fe41b7eaa9
|
Merge pull request #4797 from ritzalam/use-sha256hex
Use sha256hex
|
2017-12-11 17:12:28 -05:00 |
|
Richard Alam
|
e1a7946640
|
Merge pull request #4790 from ritzalam/promote-demote-user
- promote to moderator only authenticated users
|
2017-12-11 17:11:57 -05:00 |
|
Richard Alam
|
7f51071f9e
|
- display specific eject reason to user
|
2017-12-11 14:03:14 -08:00 |
|
Richard Alam
|
9923704012
|
- eject user with duplicate external userid
|
2017-12-11 12:51:00 -08:00 |
|
Richard Alam
|
9e7e2a199b
|
- switch how to calc checksum from sha1hex to sha256hex
|
2017-12-11 11:07:29 -08:00 |
|
Richard Alam
|
dda21b4a5e
|
Merge pull request #4793 from capilkey/disabled-moderator-unmute
Fix meeting mute and disable unmute of others
|
2017-12-11 11:00:41 -05:00 |
|
Chad Pilkey
|
860fd2a5df
|
fix meeting mute and disable unmute of others
|
2017-12-11 00:00:32 -05:00 |
|
Richard Alam
|
b35e750f86
|
- promote to moderator only authenticated users
|
2017-12-09 19:10:14 -08:00 |
|
Richard Alam
|
2574a18e7f
|
Merge branch 'synch-with-v2.0' into guest-and-authenticated-guest
|
2017-12-08 12:04:56 -08:00 |
|
Richard Alam
|
b74a57aaaf
|
Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into guest-and-authenticated-guest
|
2017-12-08 11:32:46 -08:00 |
|
Richard Alam
|
715a0177fd
|
Merge branch 'v2.0.x-release' of github.com:bigbluebutton/bigbluebutton into synch-with-v2.0
|
2017-12-08 11:26:09 -08:00 |
|
Richard Alam
|
2acff2ce45
|
Merge branch 'check-guest-status' of https://github.com/ritzalam/bigbluebutton into ritzalam-check-guest-status
|
2017-12-08 08:30:33 -08:00 |
|
Richard Alam
|
68e452df6c
|
- add guest and authenticated info in client so we can display them separately
|
2017-12-07 10:47:07 -08:00 |
|
Chad Pilkey
|
4ce4204536
|
added poll record events, removed unused HidePoll message
|
2017-12-07 07:58:42 -08:00 |
|
Richard Alam
|
f5e6cc4046
|
- use header userId to validate token
|
2017-12-06 18:15:28 -08:00 |
|
Richard Alam
|
5a45dce81b
|
Merge pull request #4775 from ritzalam/check-guest-status
- check guest status when validating auth token
|
2017-12-06 21:14:44 -05:00 |
|
Richard Alam
|
7c4435b0bb
|
- check guest status when validating auth token
|
2017-12-06 17:50:53 -08:00 |
|
Chad Pilkey
|
0159dd39dc
|
block slider change event handling when not presenter
|
2017-12-06 19:09:08 -05:00 |
|
Richard Alam
|
93f5dec98c
|
- remove duplicate message entry
|
2017-12-05 17:14:22 -08:00 |
|
Chad Pilkey
|
dd498ebf3a
|
correct build warnings in akka-apps
|
2017-12-04 22:23:06 -05:00 |
|
Chad Pilkey
|
5fc5cdbf8d
|
Merge remote-tracking branch 'upstream/master' into cleanup-akka-apps
|
2017-12-04 21:42:21 -05:00 |
|
Chad Pilkey
|
158fb6c7b2
|
cleanup of old java messages and other unused code
|
2017-12-04 12:31:16 -05:00 |
|
Richard Alam
|
ab2b1a6a35
|
- do allow mute/unmute self when lock settings is applied
|
2017-12-01 13:43:23 -08:00 |
|
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 |
|