BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
38,990 Commits 13 Branches 260 Tags 1.1 GiB
d7d228d047
Commit Graph

1824 Commits

Author SHA1 Message Date
Aron Engineer
6d100d2a21 WIP: New params added to MeetingInfoAnalyticsLogMessage 2021-03-23 20:13:40 +00:00
Aron Engineer
f0b7aea734 Merge branch 'develop' into analytics_actor_for_meeting_info 2021-03-23 13:06:15 +00:00
Aron Engineer
f598862149 feat: Presenter added to presentationInfo analytics message 2021-03-19 19:25:08 +00:00
Aron Engineer
af528b26d1 feat: WIP meeting info analytics logging messages computed 2021-03-18 21:43:49 +00:00
Anton Georgiev
b1bbc3fd52
Merge branch 'develop' into multiple-choice-poll 2021-03-17 16:11:49 -04:00
Pedro Beschorner Marin
d90ba5e286 Merge branch '2.3-per-user-wb' into develop 2021-03-16 20:28:39 -03:00
Pedro Beschorner Marin
381c5cb15c Isolated whiteboard access 
Modified the previous implementation of the whiteboard individual access to remove
multiple Collections dependency on this feature. Multi-user whiteboard is now an
array instead of a boolean value and most of the access control can be synchronized
and handled by akka-apps.
 2021-03-16 19:55:25 -03:00
Michael Z
4d3bda1306
Merge branch 'develop' into multiple-choice-poll 2021-03-16 18:38:48 +01:00
Aron Engineer
eb601eef3e fix: create meeting message order precedes group chat message in akka-apps 2021-03-15 22:34:54 +00:00
Michael Zinsmeister
b99bd3be0c Merged upstream develop branch 2021-03-14 22:17:19 +01:00
Anton Georgiev
9f841bd64b
Merge pull request #11622 from prlanzarin/u23-ilgiardino 
[screenshare] Rewrite SFU/Kurento screensharing bridge (+reconnections|audio sharing|QoL, was #11025)
 2021-03-12 05:13:11 -05:00
prlanzarin
7eb91f9273 Merge branch 'u22-screenshare18102020' of https://github.com/prlanzarin/bigbluebutton-1 into u23-ilgiardino 2021-03-11 18:49:14 +00:00
Aron Engineer
625c4962a0 feat: ValidateAuthToken revoked when user is logged out, reason added to response message 2021-03-11 14:32:01 +00:00
Aron Engineer
56a2ff5df8 feat: User modified to add logged out attribute 2021-03-11 14:32:01 +00:00
Pedro Beschorner Marin
0365018e92 Add guest lobby messages 
Moderators are able to send a message to the meeting's guest lobby. This new
event reaches bbb-web and is sent to the guest user with her/his status response
while polling. All guest users that are waiting for acceptance will be able to
read this message.

enableGuestLobbyMessage is disabled by default.
 2021-03-09 11:02:25 -03:00
Michael Zinsmeister
6ac09c25cf change back application.conf 2021-03-07 15:32:52 +01:00
Michael Zinsmeister
81d5129084 Merge with upstream 2021-03-07 15:28:39 +01:00
Michael Zinsmeister
214b236701 Merge with upstream 2021-03-07 15:12:49 +01:00
Richard Alam
28245a1b58
Merge pull request #11557 from aron-2809/bbb-core-http-endpoint-wip 
Bbb core http endpoint wip
 2021-03-05 14:27:48 -05:00
Aron Engineer
2c8220a897 fix: HealthActor messages optimized for the timestamp value update 2021-03-05 18:31:31 +00:00
Aron Engineer
284ba1af97 fix: Timeout exception response modified with typesafety. 2021-03-05 17:23:51 +00:00
Anton Georgiev
228bad03d5 Merge branch 'v2.2.x-release' of github.com:bigbluebutton/bigbluebutton into march4-merge 2021-03-04 21:25:47 +00:00
Aron Engineer
cae124aed7 feat: pubsub send and receive statuses added to health endpoint 2021-03-04 21:16:48 +00:00
Aron Engineer
391ce4d83d feat: BasicStatusCheck added for redis db, computation added to HeathActor 2021-03-02 20:49:02 +00:00
Anton Georgiev
abf9ed4063
Merge pull request #11538 from prlanzarin/u22-track1006022021 
Improve permission checks for video, screen sharing and listen only
 2021-03-02 15:46:33 -05:00
Anton Georgiev
eba2d0ab58
Merge pull request #11535 from pedrobmarin/etherpad-patch 
Rework padIds and turn bbb-web pad aware
 2021-03-02 14:48:34 -05:00
Anton Georgiev
879c54981e
Merge pull request #11447 from antobinary/external-video-sync-lucas-amguirado73 
External video events propagated through akka-apps
 2021-03-02 08:53:09 -05:00
Anton Georgiev
550bf6d282
Merge pull request #11525 from gustavotrott/develop 
Adds lastAuthTokenValidatedOn to users
 2021-03-01 13:56:16 -05:00
Anton Georgiev
d20479d7c4
Merge pull request #11493 from aron-2809/bbb-core-http-endpoint-wip 
WIP: Http endpoint added for health check
 2021-02-26 12:44:04 -05:00
Pedro Beschorner Marin
540ce10c24 Recording external video events 2021-02-26 00:59:40 +00:00
Anton Georgiev
aff272cbf3 Merge #7484 into #11447 ExternalVideo recording events 2021-02-25 19:54:22 +00:00
Gustavo Trott
63e00bd7ca Adds lastAuthTokenValidatedOn to users in Akka, send it in ValidateAuthTokenRespMsg pubSub msg, makes Meteor store it as authTokenValidatedTime 2021-02-25 16:52:20 -03:00
Aron Engineer
135f80ba71 WIP: Http endpoint added for health check 2021-02-24 21:23:07 +00:00
Anton Georgiev
af7e158244 Set falllback value of voiceConf.ejectRogueVoiceUsers to true 2021-02-24 13:12:02 -05:00
Anton Georgiev
b8eaf47263
Merge pull request #11454 from schrd/akka-config 
Akka config
 2021-02-23 08:44:00 -05:00
Anton Georgiev
0b6496618c Merge branch 'develop' of github.com:amguirado73/bigbluebutton into external-video-sync-lucas 2021-02-21 11:04:39 +00:00
Daniel Schreiber
5d620e7acd let bbb-apps-akka read an override config file from /etc/bigbluebutton 
This change introduces a config file
`/etc/bigbluebutton/bbb-apps-akka.conf` which reads the default config
from packages and allows operators to keep their own config file changes
across package upgrades. This removes the workaround of copying the
config file to /tmp in preinst and then extracvting API URI and secret
and then in postinst inject it back to the config file in /usr/share

If the config file in /usr does not have the "changeme" secret, then API
URI and secret are extracted and injected to the generated file /etc, so
packages would upgrade in a clean way.

The postrm script removes the config file in /etc if the package is
purged but not if it is just uninstalled.

bbb-install and bbb-conf must reflect this change and replace the API
secret and URL in /etc, not /usr/share
 2021-02-19 13:55:36 +01:00
Anton Georgiev
55e8de4357 Merge branch 'v2.2.x-release' of github.com:bigbluebutton/bigbluebutton into feb18-merge 2021-02-18 20:33:19 +00:00
Anton Georgiev
e966d6c7b6
Merge pull request #11366 from MaximKhlobystov/updating-poll-ui 
Updated poll UI: question field and typed responses
 2021-02-18 10:32:33 -05:00
Anton Georgiev
49cdf9faef
Merge pull request #11413 from gustavotrott/develop 
Include registeredOn date in pubSub user creation messages to replace loginTime creation in Meteor
 2021-02-17 16:56:53 -05:00
Gustavo Trott
573bfc107b Remove changes not related to issue 2021-02-17 09:39:36 -03:00
Gustavo Trott
91f4eba678 Replace registeredOn params to Long (timestamp) instead of String (ISO_OFFSET_DATE_TIME) 2021-02-17 09:20:55 -03:00
prlanzarin
866c771792 akka-apps: make ejectRogueVoiceUsers true by default 2021-02-17 08:54:47 -03:00
Anton Georgiev
b2c4244276 Merge branch 'develop' of github.com:bigbluebutton/bigbluebutton into 2.3-alpha5-with-split-meteor-roles-10349 2021-02-16 19:55:10 +00:00
Gustavo Trott
129a4e4f33 Remove changes not related with registeredOn issue 2021-02-16 15:40:56 -03:00
Gustavo Trott
12e363eb92 Removes loginTime creation from Meteor and use the registeredOn date created on Akka. Makes Akka send the registeredOn date throught PubSub messages: UserRegisteredRespMsg, GuestsWaitingForApprovalEvtMsg and ValidateAuthTokenRespMsg. 2021-02-16 14:46:30 -03:00
Anton Georgiev
f43560d535 Support for backend vs frontend nodejs instances bbb-html5 2021-02-16 03:19:31 +00:00
prlanzarin
8f233b74ee akka-apps: handle dial-in users in voice user ejection 2021-02-12 17:16:32 -03:00
Richard Alam
04a05f0bbe
Merge pull request #11390 from aron-2809/fix-userId-EndMeeting 
fix inserts userId to the EndMeeting function calls.
 2021-02-12 14:58:52 -05:00
prlanzarin
703505c486 akka-apps: extend SysConf in VoiceApp 
To be used with the ejectRogueVoiceUsers config option
 2021-02-12 16:01:44 -03:00
Pedro Beschorner Marin
ba9528ebb1 Option to eject voice users with no matching user 
Reconnects may introduce ghost voice users in a meeting when the client fails to
rejoin but the audio connection remains active.

While fetching for the voice conference user's status, apps can now check if a
voice user has a matching user record. If it doesn't, eject the voice user.
 2021-02-12 15:29:56 -03:00
Aron Engineer
1d8c51e9cf fix inserts userId to the EndMeeting function calls. 2021-02-12 17:45:08 +00:00
prlanzarin
1290838b16 akka-apps: cleanup on the camera/listen/screen permission calls 2021-02-11 19:45:59 -03:00
Richard Alam
71eb8cc664
Merge pull request #11383 from aron-2809/fix-issue-11182 
User role is incorrect after client reconnect.
 2021-02-11 14:53:55 -05:00
Aron Engineer
a49789d50a User role is incorrect after client reconnect. 
fix for issue: https://github.com/bigbluebutton/bigbluebutton/issues/11182
 2021-02-11 18:57:58 +00:00
Anton Georgiev
2061e0ddd2
Merge pull request #11164 from BrentBaccala/preserve-bbb-web-settings 
preserve bbbWebAPI and sharedSecret over upgrades
 2021-02-11 12:50:42 -05:00
Fred Dixon
54ae154759
Merge pull request #11380 from schrd/akka-systemd 
Customize systemd unit files
 2021-02-11 07:36:19 -04:00
Daniel Schreiber
b6777ed9cb Customize Systemd unit files 
Currently there is a mechanism in bbb-config which adds overlay units.
This is not neccesary because sbt allows you to specify your own unit
files.
 2021-02-11 11:16:55 +01:00
prlanzarin
765686714b akka-apps, video: add camera broadcast and subscribe permission check messages 
Used by bbb-webrtc-sfu to enrich its validation on whether a user is allowed to broadcast or subscribe to a camera stream
 2021-02-10 21:55:46 -03:00
prlanzarin
93aa556aba akka-apps, screenshare: add broadcast and subscribe permission check messages 
Used by bbb-webrtc-sfu to enrich its validation on whether a user is allowed to broadcast a screen or subscribe to one
 2021-02-10 19:02:19 -03:00
prlanzarin
c226d9544e akka-apps: add global audio permission check messages 
Used by bbb-webrtc-sfu to enrich its validation on whether a user is allowed to subscribe to the global audio bridge via listen only or not
 2021-02-10 15:00:04 -03:00
Pedro Beschorner Marin
09b39a8d63 Add extra pad validation 
Associate pads with meetings so session validation is restricted to the
meeting's valid session tokens.

Meteor will dispatch new redis events on shared notes and closed captions
pads creation. This event will go through apps and reach web to populate
a new meeting's pad collection that contains all valid pad id's for that
session. Nginx will use this collection to check if the user's session token
belongs to the pad's authorized users.

Besides these modifications, an extra change will be needed at notes.nginx.
Location /pad/p/ needs to change it's auth_request:

from /bigbluebutton/connection/checkAuthorization;
to /bigbluebutton/connection/validatePad;
 2021-02-10 13:37:04 -03:00
Michael Zinsmeister
129681c0d5 Merge remote-tracking branch 'origin/multiple-choice-poll' into multiple-choice-poll 2021-02-09 14:40:50 +01:00
Michael Zinsmeister
f5831d7da7 Revert "backend mutiple choice - config files" 
This reverts commit 7a6c534f
 2021-02-09 14:38:49 +01:00
Maxim Khlobystov
480602a1a6 Using ArrayBuffer instead of Array when creating a new Question 2021-02-09 06:24:23 +00:00
Anton Georgiev
e2e0b78d40 Merge branch 'develop' of github.com:bigbluebutton/bigbluebutton into split-meteor-roles-on-top-of-2.3-alpha6 2021-02-08 23:39:42 +00:00
Maxim Khlobystov
ff4260dc98 Merge branch 'develop' of https://github.com/bigbluebutton/bigbluebutton into updating-poll-ui 2021-02-08 21:41:43 +00:00
Simon Hirtreiter
70fc71cc70 Merge remote-tracking branch 'upstream/develop' into multiple-choice-poll 
# Conflicts:
#	bbb-common-message/src/main/scala/org/bigbluebutton/common2/domain/Meeting2x.scala
 2021-02-08 17:00:36 +01:00
Michael Zinsmeister
eaa6f0260c Fix poll results and add locale entries 2021-02-08 10:57:39 +01:00
Anton Georgiev
363c801338
Merge pull request #11215 from pedrobmarin/guest-draft 
Disable authenticated guests
 2021-02-05 16:13:46 -05:00
Anton Georgiev
8c0f0fdd52 Split Meteor roles backend-frontend revisit 2021-02-05 17:47:46 +00:00
hiroshisuga
0d63383c2a
Prevent presenter being selected by random viewer selection (#11275) 
Akka-apps filter presenter and moderators from random viewer selection list
 2021-02-04 20:26:04 -05:00
Michael Zinsmeister
7a6c534fef backend mutiple choice - config files 2021-02-04 16:13:21 +01:00
Michael Zinsmeister
462f963d08 backend mutiple choice 2021-02-04 16:13:07 +01:00
Anton Georgiev
09e6ba8dfd Merge branch 'v2.2.x-release' of github.com:bigbluebutton/bigbluebutton into merge-Jan30 2021-01-29 20:58:05 +00:00
Pedro Beschorner Marin
7e26e78c4f Cleanup from authenticated guests removal 
While cherry-picking some of this work I noticed those extras.
 2021-01-23 22:22:52 -03:00
werk21
80af96ff76 9101: Survey: New profile yes/no/abstention 2021-01-24 02:22:40 +01:00
Pedro Beschorner Marin
19cbef1fd9 When authenticatedGuests is disabled, guests should be fit for promotion 2021-01-23 21:51:03 -03:00
Pedro Beschorner Marin
0bbef12ac7 Authenticated guests feature controlled at bbb-web properties 2021-01-23 21:48:02 -03:00
Anton Georgiev
45c1ff6e40
Merge pull request #11175 from MaximKhlobystov/select-random-user 
Presenter selecting a random viewer
 2021-01-22 15:31:00 -05:00
Brent Baccala
434b64ed88 packaging for bbb-web: preserve bbbWebAPI and sharedSecret over upgrades 
Trying to get to the point where upgrades can occur without having
to re-run bbb-conf
 2021-01-15 16:35:50 -05:00
hiroshisuga
7f5352e2f9
Update application.conf 2020-12-17 23:13:32 +09:00
Anton Georgiev
8b65f9e15b Set bbb-html5 loadbalancing to be round robin 2020-12-15 01:55:57 +00:00
Anton Georgiev
9239d515a5 dispatch whiteboard events to html5 redis channel only 2020-12-12 01:45:38 +00:00
Anton Georgiev
09ca742e01 cleanup 2020-12-11 23:46:01 +00:00
Anton Georgiev
0be8773e4c Loadbalance bbb-html5 in bbb-web based on CPU 2020-12-11 21:36:06 +00:00
germanocaumo
83fe68db08 Play screenshare audio when present 2020-12-08 20:30:22 +00:00
Anton Georgiev
3faabd1821 Merge 2.2.29 and 2.2.30 into 2.3.x 2020-11-24 15:13:09 +00:00
KDSBrowne
50f85ff2e2 make responders private | add accessors 2020-11-05 19:24:10 +00:00
KDSBrowne
2f46c1fd28 Merge branch 'develop' of https://github.com/bigbluebutton/bigbluebutton into 2.3-user-rand-select 2020-11-02 16:16:29 +00:00
KDSBrowne
d2cb02b3bd prevent users from being able to send more than 1 poll vote 2020-10-28 18:33:09 +00:00
Anton Georgiev
df8b6350c9
Merge pull request #10617 from KDSBrowne/2.3-undo-pencil 
Fix broken undo of consecutive pencil annotations
 2020-10-27 14:59:57 -04:00
KDSBrowne
73f890c9d8 Merge branch 'develop' of https://github.com/bigbluebutton/bigbluebutton into 2.3-updated-polling 2020-10-21 16:05:03 +00:00
Anton Georgiev
0c7ead1916 Merge branch 'v2.2.x-release' of github.com:bigbluebutton/bigbluebutton into oct16-merge 2020-10-21 14:48:02 +00:00
KDSBrowne
d74b5af2a9 clear selected user when moderator closes modal | clean up 2020-10-19 14:46:41 +00:00
KDSBrowne
c518263fc9 fix broken undo of consecutive pencil annotations 2020-10-08 14:35:36 +00:00
hiroshisuga
ff47857c18
Update Bezier.java 2020-09-30 22:44:26 +09:00
hiroshisuga
a7c981d124
Update Bezier.java 2020-09-30 09:59:11 +09:00
hiroshisuga
e857d016e0
Update Bezier.java 2020-09-30 09:49:08 +09:00
KDSBrowne
3e8eebdd1b move random viewer selection to akka-apps 2020-09-25 19:41:30 +00:00
Pedro Beschorner Marin
a7e1623619 Option to prevent eject users by permission violation 
PermissionCheck verifies ejectOnViolation before eject an user
 2020-09-22 15:13:15 -03:00
KDSBrowne
d32155cc5f add new poll type | allow typed responses | update UI 2020-09-21 12:07:36 +00:00
Pedro Beschorner Marin
e2adf24546 Support for avatar images 
Use the former Flash client avatarURL join param to replace the name
initials avatar from the user list, chat, waiting guests and connection
status list.

It is possible to define a defaultAvatarURL at bbb-web and enable/disable it
 2020-09-15 16:50:10 -03:00
Anton Georgiev
14f464087f
Merge pull request #8417 from pedrobmarin/backend-cleanup 
Backend cleanup
 2020-08-28 15:37:00 -04:00
root
851c2645ea Committer: Antonio Guirado <amguirado73@gmail.com> 
Changes to be committed:
	new file:   akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/externalvideo/ExternalVideoApp2x.scala
	new file:   akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/externalvideo/StartExternalVideoPubMsgHdlr.scala
	new file:   akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/externalvideo/StopExternalVideoPubMsgHdlr.scala
	new file:   akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/externalvideo/UpdateExternalVideoPubMsgHdlr.scala
	modified:   akka-bbb-apps/src/main/scala/org/bigbluebutton/core/pubsub/senders/ReceivedJsonMsgHandlerActor.scala
	modified:   akka-bbb-apps/src/main/scala/org/bigbluebutton/core/running/MeetingActor.scala
	modified:   akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/FromAkkaAppsMsgSenderActor.scala
	new file:   bbb-common-message/src/main/scala/org/bigbluebutton/common2/msgs/ExternalVideoMsgs.scala
	new file:   bigbluebutton-html5/imports/api/external-videos/server/eventHandlers.js
	new file:   bigbluebutton-html5/imports/api/external-videos/server/handlers/startExternalVideo.js
	new file:   bigbluebutton-html5/imports/api/external-videos/server/handlers/stopExternalVideo.js
	new file:   bigbluebutton-html5/imports/api/external-videos/server/handlers/updateExternalVideo.js
	modified:   bigbluebutton-html5/imports/api/external-videos/server/index.js
	modified:   bigbluebutton-html5/imports/api/external-videos/server/methods.js
	modified:   bigbluebutton-html5/imports/api/external-videos/server/methods/emitExternalVideoEvent.js
	modified:   bigbluebutton-html5/imports/api/external-videos/server/methods/startWatchingExternalVideo.js
	modified:   bigbluebutton-html5/imports/api/external-videos/server/methods/stopWatchingExternalVideo.js
	new file:   bigbluebutton-html5/imports/api/external-videos/server/streamer.js
	modified:   bigbluebutton-html5/imports/api/meetings/server/handlers/meetingDestruction.js
	modified:   bigbluebutton-html5/imports/api/meetings/server/modifiers/addMeeting.js
	modified:   bigbluebutton-html5/imports/api/meetings/server/modifiers/meetingHasEnded.js
	modified:   bigbluebutton-html5/imports/api/users/server/handlers/validateAuthToken.js
	modified:   bigbluebutton-html5/imports/api/users/server/store/bannedUsers.js
	modified:   bigbluebutton-html5/imports/startup/server/index.js
	modified:   bigbluebutton-html5/imports/startup/server/redis.js
	modified:   bigbluebutton-html5/imports/ui/components/external-video-player/service.js
	modified:   bigbluebutton-html5/private/config/settings.yml
 2020-08-28 12:58:55 +02:00
KDSBrowne
0fdd1dc978 allow start / stop of polls with no presentation 2020-07-20 14:34:46 +00:00
Anton Georgiev
3b843e7c56 Do not ban user who left while in waiting list. Adjusting after merging 2.2. into 2.3 in #9672 2020-05-26 13:55:38 +00:00
Anton Georgiev
c9e996de21 Merge branch 'v2.2.x-release' of github.com:bigbluebutton/bigbluebutton into merge-2.2-into-develop 2020-05-25 17:32:24 +00:00
Anton Georgiev
b6194f96cb Add log in akka-apps to show whether user was banned or simply ejected 2020-05-22 11:12:19 -04:00
Anton Georgiev
e7917994d5 add banUser field in EjectUserFromMeetingCmdMsgBody 2020-05-22 10:45:28 -04:00
Richard Alam
eb006d470b Ejected users due to permission check cannot rejoin meeting 
- users who are ejected from meeting because of permission check cannot
   rejoin meeting as we mark them as banned. Only users ejected by a
   moderator should be banned. Later on, we should make the moderator
   indicate if the ejected user should be bannd or not.

   see https://github.com/bigbluebutton/bigbluebutton/issues/9608
 2020-05-19 12:41:35 -07:00
basisbit
5ccba7b0fb
akka-bbb-apps only listen on localhost 
attack surface reduction by having akka-bbb-apps only listen on localhost
 2020-05-15 13:42:20 +02:00
Anton Georgiev
c3e1738314 Adjust #8499 for 58fed45754 
Tweaking `RegisteredUsers.remove(u.id, liveMeeting.registeredUsers)`
since we no longer have .remove on RegisteredUsers
 2020-05-06 16:27:47 +00:00
Anton Georgiev
cc79c4b6ae merge 2.2.10 into 2.3 2020-05-05 19:52:44 +00:00
Richard Alam
292f673f5e Do not send disconnect message 
Do not send disconnect message when validate token fails as meteor will disconnect the client itself.
 2020-04-28 19:29:21 -07:00
Richard Alam
309ac30899 - comment out debug printlns 2020-04-24 07:20:42 -07:00
Richard Alam
58fed45754 Do not ban users ejecting self from meeting 
Some users join with multiple browsers. When user is ejecting self from one browser,
 do not eject all sessions for that user and do not prevent them from rejoining.
 2020-04-24 07:14:50 -07:00
Richard Alam
cca49e4546 Keep track of banned dial-in callers 
When a dial-in caller is ejected from the meeting, keep track of the callerid number.
 When the same callerid number rejoins the conference, eject the caller.
 2020-04-23 19:12:16 -07:00
Richard Alam
c40f1727d3 Prevent ejected users from rejoining 
- track ejected user based on external userid. If user rejoins with the same external
   userid, fail the validate token.
 2020-04-21 19:26:09 -07:00
Chad Pilkey
40b18b0662 whiteboard performance improvements 2020-04-08 20:03:56 +00:00
Anton Georgiev
1299abdf2c Revert "Merge pull request #8782 from ritzalam/generate-meeting-data" 
This reverts commit 37ed2c7501, reversing
changes made to 5af41dabb4.
 2020-03-25 16:13:01 -04:00
Richard Alam
3cddd8a1c5 - dump out some meeting stats data into the log 2020-03-14 11:54:45 -07:00
Anton Georgiev
8129468300 Merge branch 'v2.2.x-release' of github.com:bigbluebutton/bigbluebutton into merging 2020-03-04 23:36:21 +00:00
Richard Alam
f8437fb19d Merge branch 'v2.2.x-release' of https://github.com/bigbluebutton/bigbluebutton into pres-url-on-page-convert 2020-03-01 05:38:04 -08:00
Richard Alam
d879710503 - minimize logs 2020-02-28 13:12:53 -08:00
Ghazi Triki
64d08d69c7 Updated java projects dependencies versions. 2020-02-28 10:44:28 +01:00
Richard Alam
bba17c3a03 - handle pages on page converted messages instead on conversion completed message 2020-02-24 15:00:20 -08:00
Richard Alam
2fbd2821f4 - fix to display slodes 2020-02-20 12:43:23 -08:00
Richard Alam
7099df132d - handle new messages in akka apps 2020-02-19 15:04:19 -08:00
Richard Alam
db4dc4aff0 - add urls on presentation page conversion message 2020-02-18 14:03:08 -08:00
Anton Georgiev
4b0452d1fd Merge branch 'v2.2.x-release' of github.com:bigbluebutton/bigbluebutton into feb14-merge-2.2-into-master 2020-02-14 21:43:35 +00:00
Richard Alam
7911d2b874 - client session wasn't set properly 2020-02-06 07:36:42 -08:00
Richard Alam
5af6374265 Track call session state 
Currently, we user DTMF to inform the client when the call session is in echo test and when entering the voice conference.
 Unfortunately, sometimes when FS sends the DTMF, FS crashes.

 Monitor the progress of the call session using ESL events and propagate to the client.

 The client would be informed of these call states: CALL_STARTED, IN_ECHO_TEST, IN_CONFERENCE, CALL_ENDED.
 2020-02-05 14:58:47 -08:00
Pedro Beschorner Marin
397041efcc Removes waiting guests that stop polling for their status 2020-01-15 12:03:52 -03:00
Anton Georgiev
866f359b0e Add handling route for GetRunningMeetingsReqMsg 2020-01-09 15:59:48 +00:00
Pedro Beschorner Marin
13060aef26 Moving CheckRunningAndRecordingVoiceConfEvtMsg outside the messages that affect inactivity handler 2019-12-12 17:46:11 -03:00
Pedro Beschorner Marin
690d34029d Remove Flash shared notes backend 2019-12-11 17:40:56 -03:00
Pedro Beschorner Marin
b11113c165 Remove meeting inactivity monitor 2019-12-11 17:11:57 -03:00
Anton Georgiev
56b1b12431
Merge branch 'master' into v2.2.x-release 2019-12-10 11:07:23 -05:00
Richard Alam
ecc99fa415 - apply lock settings when user is locked. 2019-12-06 14:31:50 -08:00
Richard Alam
e40def72a4 - enforce only mic settings when disabling mic 2019-12-06 13:46:02 -08:00
Richard Alam
bf2f4c536d - apply lock settings to viewers and non-listen only users 2019-12-06 13:11:45 -08:00
Richard Alam
a26d1f0a8f - enforce lock settings 
- make sure listen only users are muted
 2019-12-06 11:50:50 -08:00
Richard Alam
124924735a - if muted user is talking, mute the user 2019-12-06 11:37:20 -08:00
Richard Alam
27d9879c12 - check if listen only user is talking and mute if so 2019-12-06 11:24:38 -08:00
Richard Alam
bcc14792ea - enforce lock settings when user joins voice conf 
- make sure liten only user is muted when they join voice conf
 2019-12-06 11:11:48 -08:00
Richard Alam
ace413b319 - apply disableMic lock settings to viewers and listen only users 2019-12-06 10:33:04 -08:00
Richard Alam
5d7dbee1a6 - return all meeting id of running meetings and allow requesting state for each meeting. 2019-12-03 08:14:51 -08:00
Richard Alam
1f74bd8cf4 - send reply to get meeting request when there are no meeting running 2019-12-03 07:17:51 -08:00
Richard Alam
1f2448c1ea
Merge pull request #8256 from ritzalam/change-audio-recording-codec 
Change audio recording codec
 2019-11-05 16:18:55 -05:00
Richard Alam
613a214817
Default recording codec 
Set the default recording codec to opus since we now have opus support in freeswitch.
 2019-11-05 16:18:19 -05:00
Richard Alam
4c6bdebd00
Merge pull request #8225 from riadvice/big-pdf-conversion 
Detect big PDF files and check the page size
 2019-10-29 16:47:26 -04:00
Richard Alam
0b81cb055b - add flac codec 2019-10-29 08:44:33 -07:00
Richard Alam
bea53ac633 Allow configure of audio recording codec 
- set audio recording codec to ogg so file size will be smaller compared to wav
 2019-10-25 13:13:41 -07:00
Richard Alam
6f29c5307f - set different interval in sending recording and user status audio to freeswitch 2019-10-25 11:26:27 -07:00
Richard Alam
4f62e0ea79 - update last status in one spot 2019-10-24 15:28:16 -07:00
Richard Alam
5d52c15456 - handle voice user status event from FreeSWITCH 2019-10-24 13:36:28 -07:00
Richard Alam
7752808f47 - keep track of last user status update 2019-10-23 14:19:51 -07:00
Richard Alam
0261a5e2b8 - send users and recordings in one message 2019-10-21 14:29:52 -07:00
Richard Alam
1e7557562f Sync FS user status 
- poll FreeSWITCH for status of user so that akka-apps would be in sync with FreeSWITCH
 2019-10-21 11:01:58 -07:00
Ghazi Triki
cd944d4770 Add missing PdfConversionInvalidErrorEvtMsg event to be sent to the web client. 2019-10-21 13:33:40 +01:00
Richard Alam
3395cdbdc0 Make sure we record audio if meeting is recorded 
- We had an issue where FreeSWITCH, for some unknow reason, stopped recording the voice conference
   in the middle of the meeting while there are users in the voice conference. We've relied on the
   voice conf started event to trigger recording of wav files. This event is sent when the first user
   joins the voice conference. In this case, there was no voice user joined after the recording stopped
   as there were already users in the voice conference. TO make sure that the audio is recorded, akka-apps
   will send a "check if voice conf is running and recording" message to FreeSWITCH every 30sec. If akka-apps
   receives a "running=true recording=false" response from FreeSWITCH, akka-apps will send a start recording
   msg to FreeSWITCH.
 2019-10-17 11:50:12 -07:00
Ghazi Triki
ba109530ae Disallow converting PDF files that have at least one big weighted page. 2019-10-16 08:37:03 +01:00
Richard Alam
13d610f798 Stop recording of voice 
- stop recording of voice conference when meeting ends.
 2019-10-01 11:34:41 -07:00
Chad Pilkey
027c28c320 add lock setting option to hide viewers from each other 2019-08-09 16:45:26 -07:00
Richard Alam
db88be858b - fix https://github.com/bigbluebutton/bigbluebutton/issues/7452 2019-05-16 13:55:52 -07:00
Fred Dixon
056ef6ee8c
Merge pull request #7327 from ritzalam/add-redis-password-on-master 
Add redis password on master
 2019-05-09 16:35:42 -04:00
Pedro Beschorner Marin
c27f409def Locking shared notes from akka-apps up to the Flash client 2019-05-08 20:36:36 +00:00
Richard Alam
52964f9e6b - put allow duplicate external userids behind a flag so we can enable/disable 2019-05-03 09:15:14 -07:00
Pedro Beschorner Marin
a0590c12ea Merge remote-tracking branch 'origin/master' into set-lock-settings-on-meeting-create 2019-05-02 11:05:34 -03:00
Richard Alam
47ea1bed67
Merge pull request #7270 from pedrobmarin/unmute-users 
Unmute users
 2019-05-01 10:52:12 -04:00
Richard Alam
bf7898225b - minor cleanup 2019-04-30 12:30:59 -07:00
Richard Alam
0bd6b214d8 - add redis password to red5 apps 2019-04-29 09:04:16 -07:00
Pedro Beschorner Marin
324681d5b2 Renamed unmuteUsers to allowModsToUnmuteUsers 2019-04-23 12:30:55 -03:00
Richard Alam
1a39ecdc64 Merge branch 'master' into add-redis-password-on-master 2019-04-23 07:36:55 -07:00
Pedro Beschorner Marin
50afb24653 Changed from unmute only viewers to unmute anyone 2019-04-17 10:55:01 -03:00
Richard Alam
7fb5dc6e37 Do not trigger chapter break recording when meeting is set not to be recorded 
When chapterBreakLengthInMinutes > 0 in /usr/share/bbb-apps-akka/conf/application.conf, the
 chapter break is triggered even when the meeting isn't set to be recorded.

 Check if meeting is to be recorded before triggering chapter break.
 2019-04-16 07:27:18 -07:00
Pedro Beschorner Marin
87435c515c Merge remote-tracking branch 'master' into set-lock-settings-on-meeting-create 2019-04-12 13:58:58 -03:00
Richard Alam
e98c5b0f26 - log whiteboard shape that has null values 
- sanitized pool results
 2019-04-11 15:28:20 -07:00
Richard Alam
dcbeee3d17 - remove null values from whiteboard shapes 2019-04-11 12:57:47 -07:00
Pedro Beschorner Marin
5f011f2e2e Included unmuteViewers param on create 2019-04-10 17:55:24 -03:00
Richard Alam
b50c22f445 - propagate privateChatEnabled value from parent meeting to breakout room 2019-04-10 13:53:03 -07:00
Richard Alam
f6c0d21fda - pass breakout and lock setting using create meeting message 2019-04-09 14:33:08 -07:00
Pedro Beschorner Marin
3ac5204141 Filtering only Flash moderators 2019-04-05 14:47:43 +00:00
Pedro Beschorner Marin
9ae8813f47 Sending an extra message for guest management in Meteor 2019-04-05 13:18:24 +00:00
Richard Alam
a33271bc09 - make akka-apps and bbb-web work with redis password 2019-04-04 14:38:53 -07:00
Richard Alam
3aeaf72719 - flag that an authed user joined the meeting 2019-03-28 12:47:52 -07:00
Richard Alam
790c9f9629 - fix formatting using scalariform 2019-03-28 07:34:46 -07:00
Richard Alam
09a5a09c67 Merge branch 'master' into set-lock-settings-on-meeting-create 2019-03-28 07:10:52 -07:00
Richard Alam
3f7199c307 - enable scariform for akka-apps 2019-03-27 13:41:16 -07:00
Richard Alam
3b4a10ebd5 - do not override settings from config.xml unless an override param is passed on create api call 2019-03-27 08:15:01 -07:00
Richard Alam
a63f7dccc3 - allow passing of breakout and lock settings params on create API 2019-03-26 10:57:50 -07:00
Richard Alam
9801efb95a - make user inactivitiy audit disabled by default 2019-03-25 12:39:09 -07:00
Richard Alam
547249b475 - set meeting inactivity check to zero as default which disables the check. When set to 
zero, the meeting won't end due to inactivity.
 2019-03-25 10:10:03 -07:00
Fred Dixon
4770ef7144
Merge pull request #6929 from fcecagno/disable-chapter-break 
Disable chapter break by default
 2019-03-20 10:21:31 -04:00
Richard Alam
1e26e8ce29 Merge branch 'track-user-register-join' of https://github.com/ritzalam/bigbluebutton into ritzalam-track-user-register-join 2019-03-16 09:32:55 -07:00
Richard Alam
b41d25d847 Merge branch 'bbb-conf-clean' of https://github.com/riadvice/bigbluebutton into riadvice-bbb-conf-clean 2019-03-16 08:07:36 -07:00
Chad Pilkey
9cfc792eaf allow unlocked viewers to unmute when meeting is locked 2019-03-13 10:28:43 -07:00
Felipe Cecagno
9ce5c45ee2 fix typo 2019-03-13 12:14:49 -03:00
Ghazi Triki
5a60f62b41 Copy dial number from the parent room to all breakout rooms. 2019-03-11 22:33:34 +01:00
Felipe Cecagno
f67808e9ae set also default recordingChapterBreakLength to zero on SystemConfiguration 2019-03-07 13:49:11 -03:00
Felipe Cecagno
db2bfbe1dd disable chapter break by default 2019-03-07 11:53:44 -03:00
Anton Georgiev
c7647a7254
Merge pull request #6862 from capilkey/2.2-fix-inactivity 
Fixed mapping of inactivity values
 2019-03-05 16:43:26 -05:00
Richard Alam
9ecdff3d81 - track if user joins within a certain period of time. Sometimes, nodejs takes 
most of the CPU that users takes a long time to load the client and join. This
   way, we can detect if there are a number of users failing to join the meeting.
 2019-02-26 20:27:52 -08:00
Chad Pilkey
5a6d067e98 fix private chat for viewers and allow pc with mod 2019-02-25 16:19:41 -08:00
Chad Pilkey
9a07f0abd2 fixed mapping of inactivity values 2019-02-25 12:48:46 -08:00
Anton Georgiev
38b743b895
Merge pull request #6711 from jfsiebel/sync-lock-settings-status 
Sync meeting lock settings status
 2019-02-11 17:34:44 -05:00
Richard Alam
733923de99 Merge branch 'akka-transcode-update' of https://github.com/riadvice/bigbluebutton into riadvice-akka-transcode-update 2019-02-09 09:04:04 -08:00
Joao Siebel
555ee1232a sync meeting lock settings status and handle GetLockSettingsRespMsg message. close #6669 2019-02-04 14:07:20 -02:00
Fred Dixon
566b245e3c
Merge pull request #6385 from pedrobmarin/keep-meeting-events 
Created property keepEvents at bbb-web to make redis record the event…
 2019-01-24 21:47:50 -05:00
Ghazi Triki
0bad0747be Update scala, sbt and akka version to the latest. 2018-12-16 20:18:37 +01:00
Ghazi Triki
78f5b2715d Improve akka-bbb-fsesl packaging. 2018-12-14 15:15:19 +01:00
Ghazi Triki
b3ce26f753 Use the packaged logback configuration. 2018-12-13 22:55:45 +01:00
Ghazi Triki
dde9419ca4 Make akka-bbb-apps runnable for developers while keeping the packaging intact. 2018-12-13 22:29:05 +01:00
Pedro Beschorner Marin
dec1fe481d Not overriding record prop 2018-12-13 11:46:20 -02:00
Richard Alam
71da5e6cac
Merge pull request #6383 from ritzalam/try-to-fix-akka-logging 
- minimize logging of redis connection
 2018-12-11 17:08:35 -05:00
Richard Alam
3f9dc6655a - minimize logging of redis connection 2018-12-11 14:06:09 -08:00
Richard Alam
2f383512c8
Merge pull request #6382 from ritzalam/try-to-fix-akka-logging 
Try to fix akka logging
 2018-12-11 16:47:16 -05:00
Richard Alam
9a612f7e3d - see if akka-apps package will start logging. 2018-12-11 13:33:07 -08:00
Pedro Beschorner Marin
ebffcb0848 Created property keepEvents at bbb-web to make redis record the events for all meetings 2018-12-11 18:37:31 -02:00
Ghazi Triki
4a5a1c572c Fix logback dependency fro akka-bbb-apps. 2018-12-11 15:36:42 +01:00
Ghazi Triki
9569704254 Exclude red5 dependencies from akka and web projects. 2018-12-10 20:32:08 +01:00
Ghazi Triki
575c77d991 Minor edits to build.sbt 2018-12-10 19:18:32 +01:00
Ghazi Triki
5a9f74c88d Fix akka applications packaging configuration. 2018-12-10 19:10:46 +01:00
Richard Alam
cb0d282451
Merge pull request #6293 from riadvice/redis-refactor 
Refactor redis implementation in server applications
 2018-12-09 10:33:31 -05:00
Ghazi Triki
79d34c42d2 Fix redis storage issues. 2018-12-06 11:53:39 +01:00
Ghazi Triki
fd959f9e14 Remove rediscala library and replace it by a lettuce implementation. 2018-12-05 20:21:06 +01:00
Ghazi Triki
5b8a9a0ace Add password to redis scala classes. 2018-11-23 11:38:28 -02:00
Ghazi Triki
2614ba2cd0 Update deployment configuration. 2018-11-22 12:54:40 -02:00
Richard Alam
ff3f8239c8 - end the meeting asap when the last user leaves by setting meetingExpireWhenLastUserLeftInMinutes=0 in 
bbb-web's bigbluebutton.properties
 2018-11-16 10:36:10 -08:00
Ghazi Triki
8e10280614 Fix configuration for akka and bbb-web projects. 2018-11-14 20:18:12 +01:00
Richard Alam
d1dad75898 Merge branch 'v2.0.x-release' of github.com:bigbluebutton/bigbluebutton into merge-v20-master-nov14 2018-11-14 08:47:21 -08:00
Richard Alam
ddc391b3d9 - fix issue where meeting doesn't end when lasr user leaves or when meetign is never joined. 
- the client to server rtt message is always updating the meeting activity. This prevents the meeting
   from ending due to inactivity.
 2018-11-13 13:01:16 -08:00
Ghazi Triki
fc4028d6de Redis refactoring : remove duplicate classes, factorisation and build configuration update. 2018-11-09 20:19:46 +01:00
Ghazi Triki
0614ccd763 Updated akka-bbb-apps project to use sbt 1.2.6 and scala 2.12.7 2018-11-08 14:53:00 +01:00
Ghazi Triki
653fd74440 Merge remote-tracking branch 'bigbluebutton/v2.0.x-release' into merge-2.x-release-into-master 
# Conflicts:
#	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/users/UserLeaveReqMsgHdlr.scala
#	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/models/Users2x.scala
#	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/running/HandlerHelpers.scala
#	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/running/MeetingActor.scala
#	akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/testdata/FakeTestData.scala
#	bbb-common-web/src/main/java/org/bigbluebutton/api/MeetingService.java
#	bbb-common-web/src/main/java/org/bigbluebutton/presentation/PresentationUrlDownloadService.java
#	bbb-common-web/src/main/java/org/bigbluebutton/presentation/imp/ImageToSwfSlidesGenerationService.java
#	bbb-common-web/src/main/java/org/bigbluebutton/presentation/imp/Office2PdfPageConverter.java
#	bbb-common-web/src/main/java/org/bigbluebutton/presentation/imp/OfficeDocumentValidator.java
#	bbb-common-web/src/main/java/org/bigbluebutton/presentation/imp/Pdf2SwfPageConverter.java
#	bbb-common-web/src/main/java/org/bigbluebutton/presentation/imp/PdfToSwfSlidesGenerationService.java
#	bbb-common-web/src/main/java/org/bigbluebutton/presentation/imp/SvgImageCreatorImp.java
#	bbb-common-web/src/main/java/org/bigbluebutton/presentation/imp/TextFileCreatorImp.java
#	bbb-common-web/src/main/scala/org/bigbluebutton/api2/bus/ReceivedJsonMsgHdlrActor.scala
#	bbb-common-web/src/main/scala/org/bigbluebutton/api2/meeting/OldMeetingMsgHdlrActor.scala
#	bigbluebutton-client/src/org/bigbluebutton/core/UsersUtil.as
#	bigbluebutton-client/src/org/bigbluebutton/main/events/BBBEvent.as
#	bigbluebutton-client/src/org/bigbluebutton/main/maps/ApplicationEventMap.mxml
#	bigbluebutton-client/src/org/bigbluebutton/main/model/users/JoinService.as
#	bigbluebutton-client/src/org/bigbluebutton/main/model/users/NetConnectionDelegate.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/MainApplicationShell.mxml
#	bigbluebutton-client/src/org/bigbluebutton/modules/layout/managers/LayoutManager.as
#	bigbluebutton-client/src/org/bigbluebutton/modules/layout/views/LayoutsCombo.mxml
#	bigbluebutton-client/src/org/bigbluebutton/modules/users/services/MessageReceiver.as
#	bigbluebutton-client/src/org/red5/flash/bwcheck/app/BandwidthDetectionApp.as
#	bigbluebutton-config/bigbluebutton-release
#	bigbluebutton-html5/client/compatibility/kurento-extension.js
#	bigbluebutton-html5/imports/api/users/server/modifiers/addUser.js
#	bigbluebutton-web/grails-app/controllers/org/bigbluebutton/web/controllers/ApiController.groovy
 2018-11-01 14:00:54 +01:00
Richard Alam
92a2cd0d60 - delay removing user from user's list in case the user is just reconnecting 2018-10-24 12:42:00 -07:00
Richard Alam
eafa3273c5 - flag the user first when receiving user left event in case user is just reconnecting 2018-10-24 07:41:39 -07:00
Richard Alam
cc6f88d020 - my IntelliJ IDE seems to format differently with Ghazi's 
- fix screenshare redis connection error
 - fix bbb-web create meeting exception when second user joins
 2018-09-13 13:08:49 -07:00
Ghazi Triki
83025a9d5e Merge remote-tracking branch 'bigbluebutton/master' into jvm-quality-improve 
# Conflicts:
#	bbb-common-web/src/main/java/org/bigbluebutton/presentation/imp/ImageToSwfSlidesGenerationService.java
 2018-09-12 18:49:25 +01:00
Richard Alam
cdaf447758
Merge pull request #5975 from riadvice/user-typing-feature 
Implementation of user typing feature to chat
 2018-09-12 13:43:43 -04:00
Richard Alam
5b03e0ef6c
Merge pull request #5581 from riadvice/recording-timer 
Add a new message RecordStatusResetSysMsg to be handled and saved in events.xml
 2018-09-12 12:03:09 -04:00
Anton Georgiev
1462810b96 Merge branch 'v2.0.x-release' of github.com:bigbluebutton/bigbluebutton into merge-2.0 2018-09-06 22:06:40 +00:00
Felipe Cecagno
232c485762 revert some unneeded changes 2018-08-24 17:15:47 -03:00
Felipe Cecagno
b91c13e054 update instructions and implementation of a working docker-compose (no recordings yet) 2018-08-24 17:15:47 -03:00
Felipe Cecagno
16a59b7e3e push unfinished work on docker 2018-08-24 17:15:47 -03:00
Felipe Cecagno
62311387b8 more changes to configure redis using environment variables 2018-08-24 17:15:47 -03:00
Felipe Cecagno
c2e507713a add a few docker containers definitions and compiled a list of what is still missing 2018-08-24 17:15:47 -03:00
Chad Pilkey
a8938c4605 add config option in akka-apps for default multi-user whiteboard state 2018-08-24 12:50:55 -07:00
Joao Siebel
11a139a2b8 add new SyncGetVoiceUsersRespMsg message in akka 2018-08-14 09:41:21 -03:00
Ghazi Triki
7d64eb69f9 Added user typing feature to chat. 2018-08-13 17:48:48 +01:00
Ghazi Triki
cb152bf864 Improved java classes code quality. 2018-08-05 22:41:15 +01:00
Ghazi Triki
2820178b83 Updated JVM projects dependencies and configuration. 2018-08-05 22:37:11 +01:00
Richard Alam
a57f389f4a - fix tracking of user inactivity 2018-07-30 10:53:29 -07:00
Richard Alam
804d1e2cc6 - change the log to be specific on what the method does. 2018-07-30 09:34:32 -07:00
Ghazi Triki
dffeeb8daf Update user last activity time when he sends a message. 2018-07-30 11:43:19 +01:00
Ghazi Triki
ffb6d6e593 Update last user activity depending on his actions. 2018-07-27 19:00:15 +01:00
Ghazi Triki
7da3fb3c37 Fix inactive user check rule using time. 2018-07-27 17:48:39 +01:00
Ghazi Triki
c21f5aabad Add new parameter userInactivityThresholdInMinutes to bigbluebutton.properties and improve inactive user warning and eject from server. 2018-07-27 15:02:04 +01:00
Ghazi Triki
5472456e90 Refactor user inactivity messages naming to have two distinct names: UserInactivityInspectMsg and UserActivitySignResponseMsg. 2018-07-25 21:14:38 +01:00
Ghazi Triki
5b34f93daa Move user inactivity configuration parameters to bigbluebutton-web application and rename them to userInactivityLogoutTimerInMinutes and userInactivityResponseDelayInMinutes. 2018-07-25 10:56:55 +01:00
Richard Alam
b2c2705223 - send only recording timer updates to clients when the meeting is recording 2018-07-20 08:20:41 -07:00
Anton Georgiev
c1a739a883
Merge pull request #5298 from OZhurbenko/akka-create-default-pods-groupchats 
Added missing messages for presentation pods and group chats
 2018-07-04 14:28:16 -04:00
Richard Alam
fb234ae882 - end meeting after 2 minutes (configrable) after the last authenticated user leaves 2018-07-03 13:48:57 -07:00
Richard Alam
445d16f27c Merge branch 'implement-meeting-inactivity-timer' of https://github.com/ritzalam/bigbluebutton into ritzalam-implement-meeting-inactivity-timer 2018-06-28 10:32:46 -07:00
Richard Alam
d891a4e85f Merge branch 'v2.0.x-release' of github.com:bigbluebutton/bigbluebutton into merge-latest-20-branch 2018-06-28 08:30:17 -07:00
Richard Alam
0356721627 - clean up printlns 2018-06-27 12:58:49 -07:00
Richard Alam
db80060968 - fix reason ended string 2018-06-27 12:57:36 -07:00
Anton Georgiev
e2e83e08df plug clientType in UserJoin* messages, not separate ones 2018-06-26 19:27:42 +00:00
Anton Georgiev
a6c693c93d add clientType in User and show it in api getMeeting* 2018-06-22 19:19:46 +00:00
Richard Alam
80ea665049 - send meeting inactivity warning to client 2018-06-21 14:32:41 -07:00
Richard Alam
dc62b89691 Merge branch 'v2.0.x-release' of github.com:bigbluebutton/bigbluebutton into 21-and-20-merge-working-branch 2018-06-08 17:49:13 -07:00
Richard Alam
83ac942452 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into 21-and-20-merge-working-branch 2018-06-08 17:23:49 -07:00
Richard Alam
5df4bef903 - toggle presentation downloads 2018-06-07 12:13:00 -07:00
Anton Georgiev
eb7a49f142 renamed noRedirect* to redirectToHtml5* 2018-06-07 15:59:06 +00:00
Anton Georgiev
a77ee38741 make breakout url for html5 and use it 2018-06-07 15:59:06 +00:00
Richard Alam
a2eaa9babd Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into 21-and-20-merge-working-branch 
- some conflicts have been fixed.

The following needs working on:

       both modified:   ../bigbluebutton-client/src/org/bigbluebutton/modules/chat/services/ChatCopy.as
        both modified:   ../bigbluebutton-client/src/org/bigbluebutton/modules/chat/services/ChatSaver.as
        both modified:   ../bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatTab.mxml
        both modified:   ../bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatWindowEventHandler.as
        both modified:   ../bigbluebutton-client/src/org/bigbluebutton/modules/users/services/MessageReceiver.as
        both modified:   ../bigbluebutton-client/src/org/bigbluebutton/modules/users/services/MessageSender.as
        both modified:   ../bigbluebutton-client/src/org/bigbluebutton/modules/users/views/MediaItemRenderer.mxml

Parking as need to work on something else.
 2018-06-06 08:23:13 -07:00
Chad Pilkey
f7a5f675b6 add a table showing individual votes in the PollResultsModal 2018-06-01 16:06:49 -07:00
Anton Georgiev
658b9d81b3
Merge pull request #5512 from lfzawacki/use-get-recording-status 
Use GetRecordingStatus message to start recordings from the bbb-webrtc-sfu side
 2018-05-28 13:55:30 -04:00
Ghazi Triki
8b85628549 Add a new message RecordStatusResetSysMsg to be handled and saved in events.xml 2018-05-23 21:14:34 +01:00
Richard Alam
6323289cbb - no need to log 2018-05-23 11:08:11 -07:00
Richard Alam
69528a0d43 Merge branch 'breakout-room-server-expiry' of https://github.com/riadvice/bigbluebutton into riadvice-breakout-room-server-expiry 2018-05-23 10:39:39 -07:00
Richard Alam
4eb86bfb52 - format 2018-05-23 10:32:51 -07:00
Richard Alam
39558cd805 Merge branch 'recording-timer' of https://github.com/riadvice/bigbluebutton into riadvice-recording-timer 2018-05-23 10:11:09 -07:00
Ghazi Triki
eab45f7fa5 Fix event name typo. 2018-05-23 17:26:05 +01:00
Richard Alam
46a00dc82f - fix issue where meeting ends when only or last user auto-reconnects 2018-05-23 08:09:51 -07:00
Ghazi Triki
4eebdf00fa Add a new message RecordAndClearPreviousMarkersCmd. 2018-05-23 16:09:15 +01:00
Ghazi Triki
a4fef6ff8a Fix server recording timer and correctly save MettingState2x 2018-05-22 18:07:06 +01:00
Richard Alam
ef60beec7c - update the state to keep recording timer updated 2018-05-18 11:35:30 -07:00
Ghazi Triki
634635c8cd Update recording confirmation window and add recording timer (Work In Progress) 2018-05-18 15:58:08 +01:00
Richard Alam
b352ee2c95 - change log timestamp format so they are all the same 2018-05-15 10:50:40 -07:00
Ghazi Triki
48b695697e Make breakout rooms expire only by their duration. 2018-05-11 16:50:12 +01:00
Richard Alam
0614fd7916 - wait for the video stream stopped message from red5 to tell us that the stream is gone instead of guessing that 
the stream stopped because usef has left the meeting.
 2018-05-11 08:49:44 -07:00
Richard Alam
14b35c8784 - add video stream events to logging so we can trace it 2018-05-11 08:49:06 -07:00
Richard Alam
aa3b3c9589 - remove extra logging 2018-05-11 08:48:42 -07:00
Lucas Fialho Zawacki
2d222b7b2e Merge branch 'v2.0.x-release' of https://github.com/bigbluebutton/bigbluebutton into use-get-recording-status 2018-05-09 19:02:31 +00:00
Lucas Fialho Zawacki
9149d0c597 Add recorded parameter to GetRecordingStatusRespMsg 2018-05-09 17:53:45 +00:00
Ghazi Triki
54ae79d533 Add new feature to breakout rooms that allows to freely join them. 2018-05-07 16:03:53 +01:00
Richard Alam
a3d1e18a77 - format 2018-04-24 15:04:52 -07:00
Chad Pilkey
04eefb40f2
Merge pull request #5329 from ritzalam/mobile-inactivity-timer 
User inactivity timer
 2018-04-11 11:46:27 -04:00
Oleksandr Zhurbenko
2e0b9f9798 Combined traits for group chats and group chat messages 2018-04-09 20:59:03 -07:00
Richard Alam
5e10d6bd22 - handle user inacitivty message 2018-04-09 14:33:09 -07:00
Richard Alam
b85a361f3e - init properly last inactivity audit response to handle late users 2018-04-09 14:02:00 -07:00
Richard Alam
48de7625c9 - user inactivity audit message sending and receiving 2018-04-09 12:22:00 -07:00
Richard Alam
837453454e - user inactivity timer configuration 2018-04-09 12:20:21 -07:00
Chad Pilkey
880c5dc48e
Merge pull request #5314 from ritzalam/mobile-lock-settings 
Mobile lock settings
 2018-04-09 13:44:59 -04:00
Richard Alam
39284f1d18 - start implementing user inactivity timer 2018-04-06 14:52:21 -07:00
Richard Alam
4baec2c7df Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into mobile-lock-settings 2018-04-04 13:17:51 -07:00
Richard Alam
5c92632032 - prevent flash client from being ejected when mobile client joins first 2018-04-04 08:55:27 -07:00
Oleksandr Zhurbenko
eef2d65d93 Sync message for the group chats and group chat messages 2018-04-01 20:10:28 -07:00
Oleksandr Zhurbenko
9141ae51fd Added a message for when a default group chat is being created 2018-03-27 15:09:26 -07:00
Oleksandr Zhurbenko
32041e7a86 Added a message for when a default presentation pod is created 2018-03-26 16:24:51 -07:00
Richard Alam
efaf450472 - allow promoting of non-guest viewers to moderator role 2018-03-23 12:34:50 -07:00
Anton Georgiev
3fec097faa send presentation pods through redis on html5 server start 2018-02-16 15:00:53 -05:00
Ghazi Triki
00734d8018 Store role change in session and registered users then propagate the change from akka-apps to bbb-web. 2018-02-08 19:57:57 +01:00
Richard Alam
09cf94cb8a - simplify check 2018-02-07 13:57:22 -08:00
Richard Alam
c67cb19dd4 - exclude pencil draw update and end status from being dropped by rights management so that pencil lines will smooth out 2018-02-07 13:39:24 -08:00
Richard Alam
8a1a1fc3ce - clean up formatting 2018-02-07 12:34:39 -08:00
Richard Alam
d2fd54e6e9 - drop whiteboard and cursor messages instead of enforcing rights management 2018-02-07 11:31:36 -08:00
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
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
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