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

851 Commits

Author SHA1 Message Date
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
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
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
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
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
Anton Georgiev
0b6496618c Merge branch 'develop' of github.com:amguirado73/bigbluebutton into external-video-sync-lucas 2021-02-21 11:04:39 +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
91f4eba678 Replace registeredOn params to Long (timestamp) instead of String (ISO_OFFSET_DATE_TIME) 2021-02-17 09:20:55 -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
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
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
Michael Zinsmeister
462f963d08 backend mutiple choice 2021-02-04 16:13:07 +01: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
hiroshisuga
ad40faaf66
Rename GoupChatMsg.scala to GroupChatMsg.scala 2021-01-09 09:01:51 +09: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
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
73f890c9d8 Merge branch 'develop' of https://github.com/bigbluebutton/bigbluebutton into 2.3-updated-polling 2020-10-21 16:05:03 +00:00
KDSBrowne
c518263fc9 fix broken undo of consecutive pencil annotations 2020-10-08 14:35:36 +00:00
KDSBrowne
3e8eebdd1b move random viewer selection to akka-apps 2020-09-25 19:41:30 +00: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
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
e7917994d5 add banUser field in EjectUserFromMeetingCmdMsgBody 2020-05-22 10:45:28 -04: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
da5bbe210e - fix var name 2020-03-14 12:04:42 -07: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
bba17c3a03 - handle pages on page converted messages instead on conversion completed message 2020-02-24 15:00:20 -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
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
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
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
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
b0276e5725 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into voice-conf-user-status-audit 2019-10-21 14:32:19 -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
63525b425e Add timestamp on message 
- add a new timestamp field on the message envelope so we can collect
   statistics on message processing times.
 2019-10-18 08:41:27 -07: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
Chad Pilkey
027c28c320 add lock setting option to hide viewers from each other 2019-08-09 16:45:26 -07:00
Richard Alam
7659e7fc0e - store single use auth keys in redis 2019-06-06 14:26:28 -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
Pedro Beschorner Marin
9867aa6b78 Shared notes lock settings first commit 2019-05-08 20:36:36 +00: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
e3a68f9a97 - cleanup 2019-04-30 13:10:51 -07:00
Richard Alam
f2165c1783 - cleanup 2019-04-29 12:59:45 -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
Pedro Beschorner Marin
50afb24653 Changed from unmute only viewers to unmute anyone 2019-04-17 10:55:01 -03: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
Richard Alam
a33271bc09 - make akka-apps and bbb-web work with redis password 2019-04-04 14:38:53 -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
fe3979e4a2 - enable scalariform for bbb-common-message 2019-03-27 13:34:56 -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
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
Ghazi Triki
5a60f62b41 Copy dial number from the parent room to all breakout rooms. 2019-03-11 22:33:34 +01: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
Ghazi Triki
78232d8b92 Remove RedisStorageService commands logging and use transactions for multiple commands. 2019-02-12 20:04:47 +01: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
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
21057708f5 Updated akka-bbb-transcode project structure and replace rediscala by lettuce. 2018-12-15 20:24:21 +01: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
Pedro Beschorner Marin
948576887e Includes publish/unpublish/delete API calls as Redis events 2018-12-10 10:14:02 -02:00
Ghazi Triki
9615f88288 Do not close redis connection RedisStorageService except when stopping the service. 2018-12-07 11:55:57 +01:00
Ghazi Triki
114cba670f Improved redis connection logging. 2018-12-06 21:35:51 +01:00
Ghazi Triki
c9791b32ee Use single connection for RedisStorageService instead of connection pool. 2018-12-06 17:51:28 +01: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
7e736d41f6 Re-added redis connection pooling and running subscribers and publishers inside executors. 2018-11-30 18:49:22 +01:00
Ghazi Triki
5b8a9a0ace Add password to redis scala classes. 2018-11-23 11:38:28 -02:00
Ghazi Triki
d8588da28a Add support for redis password. 2018-11-22 16:02:55 -02:00
Ghazi Triki
e768cbe3c5 Updated red5 applications configuration to accept redis parameters. 2018-11-21 19:31:01 -02:00
Ghazi Triki
dc5c98b8cf Updated Red5 applications configuration. 2018-11-21 12:34:23 -02:00
Ghazi Triki
de0c992e51 Update redis commands implementation. 2018-11-21 12:01:10 -02:00
Ghazi Triki
fbd1d631d6 Move redis communication classes from red5 applications to bbb-apps-common project. 2018-11-21 10:55:06 -02:00
Ghazi Triki
5550d4464d Updated bbb-screenshare project to use common redis classes from bbb-common-message. 2018-11-13 16:19:35 +01:00
Ghazi Triki
fc4028d6de Redis refactoring : remove duplicate classes, factorisation and build configuration update. 2018-11-09 20:19:46 +01:00
Ghazi Triki
3c758cc9d1 Replace lettuce methods by custom commands. 2018-11-07 21:02:54 +01:00
Ghazi Triki
21cb59487c Move RedisStorageService from bigbluebutton-web to bbb-common-message and replace jedis with lettuce-core. 2018-11-06 18:54:27 +01:00
Ghazi Triki
e812160ee9 Fix bbb-common-message unit tests. 2018-11-06 15:45:42 +01: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
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
dffeeb8daf Update user last activity time when he sends a message. 2018-07-30 11:43:19 +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
Chad Pilkey
d1e649189e add option to user gear menu to look up their directory data 2018-07-11 10:33:38 -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
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
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
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
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
Ghazi Triki
4eebdf00fa Add a new message RecordAndClearPreviousMarkersCmd. 2018-05-23 16:09:15 +01:00
Ghazi Triki
634635c8cd Update recording confirmation window and add recording timer (Work In Progress) 2018-05-18 15:58:08 +01: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
48de7625c9 - user inactivity audit message sending and receiving 2018-04-09 12:22:00 -07:00
Richard Alam
39284f1d18 - start implementing user inactivity timer 2018-04-06 14:52:21 -07:00
Oleksandr Zhurbenko
eef2d65d93 Sync message for the group chats and group chat messages 2018-04-01 20:10:28 -07:00
Anton Georgiev
3fec097faa send presentation pods through redis on html5 server start 2018-02-16 15:00:53 -05: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
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
672d3b5ef7 - try to prevent connecting to bbb-video with authz 2018-01-22 11:54:57 -08:00
Chad Pilkey
2717ef39da removed unneeded properties from chat messages 2018-01-10 15:06:43 -05: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
prlanzarin
dfb5170e5d Finished filtering out HTML5 and Flash webcams using stream name patterns 2018-01-04 16:24:50 +00: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
prlanzarin
3a72afa350 Merge remote-tracking branch 'upstream/v2.0.x-release' into video-reconnection 2017-12-21 17:37:07 +00: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
72fd493c23 - add reason on why client is disconnected 2017-12-15 19:16:37 -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
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
777fe53c39 rearrange WhiteboardMsgs so they are divided by direction 2017-12-13 12:14:39 -05:00
Chad Pilkey
4881fbbc0b clean up spacing for WhiteboardMsgs so they're easier to read 2017-12-13 02:17:36 -05:00
Chad Pilkey
1551dcae15 move multiuser to be per-whiteboard 2017-12-13 02:14:43 -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
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
2574a18e7f Merge branch 'synch-with-v2.0' into guest-and-authenticated-guest 2017-12-08 12:04:56 -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
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
Chad Pilkey
158fb6c7b2 cleanup of old java messages and other unused code 2017-12-04 12:31:16 -05: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
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
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
b2aae3ab3c - clear public chat (incomplete) 
TODO: client doesn't clear yet
 2017-11-13 05:56:14 -08:00
prlanzarin
f43b77c19f Merge branch 'node-bbb-apps-packaging' into bbb-webrtc-sfu 
Conflicts:
	bigbluebutton-html5/imports/startup/client/base.jsx
	bigbluebutton-html5/imports/ui/components/actions-bar/actions-dropdown/component.jsx
	bigbluebutton-html5/imports/ui/components/actions-bar/component.jsx
	bigbluebutton-html5/imports/ui/components/app/container.jsx
	bigbluebutton-html5/imports/ui/components/screenshare/service.js
	bigbluebutton-html5/imports/ui/components/video-dock/component.jsx
	bigbluebutton-html5/imports/ui/components/video-dock/container.jsx
	bigbluebutton-html5/private/locales/en.json bigbluebutton-html5/server/main.js
 2017-11-11 03:41:37 +00:00
Anton Georgiev
411307af3f handle zoom and move event in presentation pods 2017-11-03 15:35:59 -04:00
Richard Alam
4e8f2abbb3 - pass token on video connect 2017-11-01 14:55:48 -07: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
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
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
c14a946041 - generate recording path in akka-apps for audio 2017-10-26 14:07:22 -07:00
Richard Alam
8497b9049d Merge branch 'master' into implement-multi-chat 2017-10-25 07:33:26 -07:00
Anton Georgiev
8e06408a33 set current presenter in pod 2017-10-24 15:49:57 -04:00
Richard Alam
066ceea0f4 - generate record chapter break event 2017-10-23 12:16:26 -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
030567368a add/remove user from presenter groups 2017-10-20 17:01:57 -04: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
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
Anton Georgiev
04cef71384 re-enable next/prev/goto slide 2017-10-19 14:47:59 -04:00
Richard Alam
cbd82ffa29 - simplify sending of message 2017-10-18 10:07:54 -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
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
e849e1b5ee - approve guest user 2017-09-28 16:56:33 -07:00
Richard Alam
8e7670c81d - handle guest policy 2017-09-27 11:16:14 -07:00
Richard Alam
4804d69a62 - reject user on enter api if guest has been denied 2017-09-25 14:29:02 -07:00
Richard Alam
e062e42cd0 - implement redirect of client to guest waiting 2017-09-25 14:12:54 -07:00
Anton Georgiev
6d4fa587c8 work on add and remove presentation pods 2017-09-25 14:58:11 -04: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
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
Anton Georgiev
32398bc40e Merge branch 'implement-group-chat' of github.com:ritzalam/bigbluebutton into pods_vol1 2017-09-19 11:41:52 -04:00
Augusto Bennemann
2067c50c55 HTML5 video for bbb2.0 2017-09-19 10:53:27 -03: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
Anton Georgiev
e9d7fe0468 reorganize presentation messages 2017-09-12 09:47:31 -04: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
c7686b3a90 - implement group chat 2017-09-06 12:58:36 -07:00
Richard Alam
3a6690c335 - start implementing group chat 2017-09-05 17:08:40 -07:00
Pedro Beschorner Marin
4017d12fa1 Refactored shared notes cleaning to force sync 2017-09-01 19:36:15 +00: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
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
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
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
Anton Georgiev
1dc5de1665 cleanup unused object 2017-08-10 15:30:29 -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
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
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
1f8aa4618f new akka-apps record structure 2017-07-31 12:02:13 -04:00
Pedro Beschorner Marin
77603a62c8 Limiting the number of shared notes 2017-07-30 22:11:13 +00: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
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
ad37b52835 Merge branch 'bbb-2x-mconf' of github.com:bigbluebutton/bigbluebutton into fix-breakout-room-messaging 2017-07-24 18:21:59 -07:00
Richard Alam
5afcbe539b - put back old messages as they are still used by video-broadcast and bbb-video. We 
can remove them once we've worked on those 2 apps.
 2017-07-24 18:02:45 -07:00
Richard Alam
555302f11e - try to fix messaging of breakout rooms 2017-07-24 10:39:29 -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
47f012f08f - start fixing breakout rooms 2017-07-21 14:15:51 -07:00
Chad Pilkey
c8f38ebae1 Merge remote-tracking branch 'upstream/bbb-2x-mconf' into cleanup-old-1.1-apps 2017-07-21 14:30:51 -04:00
Chad Pilkey
043c55e0bf Merge remote-tracking branch 'upstream/bbb-2x-mconf' into cleanup-old-1.1-apps 2017-07-21 13:55:06 -04:00
Richard Alam
ba2e99ed0e Merge branch 'work-on-meeting-lifcycle-2' of https://github.com/ritzalam/bigbluebutton into ritzalam-work-on-meeting-lifcycle-2 2017-07-20 18:19:00 -07:00
Richard Alam
f1b4f87752 Merge branch 'late-joiner-webrtc-screenshare' of https://github.com/antobinary/bigbluebutton into antobinary-late-joiner-webrtc-screenshare 2017-07-20 17:41:55 -07:00
Chad Pilkey
3a824e13db cleaned up pre-2.0 user messages 2017-07-20 18:57:55 -04:00
Richard Alam
d7e1a23022 - continue implement guest policy 2017-07-19 19:24:43 -07:00
Richard Alam
d488ff745d - implement guest policy 2017-07-19 14:59:36 -07:00
Richard Alam
a61030a95f - track meeting inactivity and expiry in akka-apps 2017-07-18 14:47:42 -07:00
Richard Alam
810a027907 Merge branch '2x-transcode-screenshare-merge' of https://github.com/prlanzarin/bigbluebutton-1 into prlanzarin-2x-transcode-screenshare-merge 2017-07-17 18:49:58 -07:00
Anton Georgiev
d8dc01d333 display current webrtc screenshare to late joiners (if broadcasting) 2017-07-17 17:48:44 -04:00
Richard Alam
bf1031374a - pass timeout expire when last user leaves from bbb-web to akka-apps 2017-07-16 08:11:48 -07:00
Richard Alam
8994c7f644 Merge branch 'bbb-2x-mconf' into implement-meeting-expiry 2017-07-16 07:49:45 -07:00
Richard Alam
0f39d99ce5 - implement meeting expiry 2017-07-15 19:10:04 -07:00
Chad Pilkey
f4a5286005 remove pre-2.0 breakout room code 2017-07-15 19:00:18 -04:00
Chad Pilkey
1bb72e6391 clean up pre-2.0 voice message code 2017-07-15 17:33:25 -04:00
Chad Pilkey
2dfd202a0b reorganized akka-apps whiteboard, cleaned up caption and poll 2017-07-15 15:31:49 -04:00
Richard Alam
a0467f319c Merge branch 'bbb-2x-mconf' into work-on-meeting-lifcycle 2017-07-15 09:30:02 -07:00
Chad Pilkey
3c60131a5c remove pre-2.0 layout message code 2017-07-14 16:57:20 -04:00
Chad Pilkey
816daf29ae remove pre-2.0 poll message code 2017-07-14 16:10:17 -04:00
Chad Pilkey
5ebdd61d3b remove pre-2.0 presentation message code 2017-07-14 14:19:20 -04:00
Richard Alam
5bccf11319 Merge branch 'convert-global-audio-messages' of https://github.com/capilkey/bigbluebutton into capilkey-convert-global-audio-messages 2017-07-13 17:33:22 -07:00
Chad Pilkey
86da035674 move the global audio messages to the 2.0 format 2017-07-13 18:09:15 -04:00
Anton Georgiev
1687dc7281 Merge branch 'bbb-2x-mconf' of github.com:bigbluebutton/bigbluebutton into implement-bbb-web-msgs 2017-07-12 19:43:38 -04:00
Anton Georgiev
d33c1b03ae handle DestroyMeetingSysCmdMsg on akka-apps 2017-07-12 19:21:01 -04:00
Richard Alam
d48f46c5e7 - try renaming deskshare to screenshare 2017-07-12 10:50:27 -07:00
prlanzarin
e3cf771891 Merge branch 'bbb-2x-mconf' of https://github.com/bigbluebutton/bigbluebutton into 2x-transcode-screenshare-merge 2017-07-12 15:14:07 +00:00
Richard Alam
19e98b22f5 Merge branch 'fs-webrtc-screenshare' of https://github.com/ritzalam/bigbluebutton into ritzalam-fs-webrtc-screenshare 2017-07-11 17:08:38 -07:00
Pedro Beschorner Marin
2097b611ed Merge remote-tracking branch 'prlanzarin/1.1-transcode-screenshare-merge' into bigbluebutton/bbb-2.x-mconf 
Conflicts:
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/LiveMeeting.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/MeetingActor.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/MessageSenderActor.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/api/InMessages.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/api/OutMessages.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/api/ValueObjects.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/UsersApp.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/UsersModel.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/endpoint/redis/AppsRedisSubscriberActor.scala
	bbb-common-message/src/main/java/org/bigbluebutton/common/messages/RegisterUserMessage.java
	bigbluebutton-client/src/org/bigbluebutton/modules/layout/managers/LayoutManager.as
	bigbluebutton-client/src/org/bigbluebutton/modules/phone/PhoneOptions.as
	bigbluebutton-client/src/org/bigbluebutton/modules/phone/views/components/ToolbarButton.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/present/ui/views/PresentationWindow.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/managers/WebRTCDeskshareManager.as
	bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/model/ScreenshareOptions.as
	bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/view/components/ScreensharePublishWindow.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/view/components/ScreenshareViewWindow.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/maps/VideoEventMap.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/views/UserGraphicHolder.mxml
	record-and-playback/core/scripts/rap-process-worker.rb
 2017-07-11 20:41:38 +00:00
Richard Alam
b04519ef0f FreeSWITCH webrtc screenshare 
- use webrtc screenshare using FS Verto
 - publish screenshare as rtmp to red5
 - flash clients view screenshare from red5 rtmp

 Fix mute/unmute/talking of user in voice conference
 2017-07-11 13:31:56 -07:00
Anton Georgiev
f6ef0ddf75 Merge branch 'bbb-2x-mconf' of github.com:bigbluebutton/bigbluebutton into implement-bbb-web-msgs 2017-07-11 15:35:17 -04:00
Anton Georgiev
c5ca6a2fcc red5 closes connection when user is ejected 2017-07-11 14:56:35 -04:00
Richard Alam
02d9c6717b Merge branch 'implement-bbb-web-msgs' of https://github.com/antobinary/bigbluebutton into antobinary-implement-bbb-web-msgs 2017-07-11 08:12:18 -07:00
Chad Pilkey
f6d92e5a50 add deskshare msg handlers to akka-apps 2017-07-10 18:12:06 -04:00
Anton Georgiev
c810c2cf73 Merge branch 'bbb-2x-mconf' of github.com:bigbluebutton/bigbluebutton into implement-bbb-web-msgs 2017-07-10 17:26:04 -04:00
Anton Georgiev
797b2904aa handle eject user from meeting (a.k.a. kick) 2017-07-10 15:36:26 -04:00
Richard Alam
7a7712d986 - start implementing lock settings 2017-07-09 15:00:13 -07:00
Richard Alam
8d91ef8132 - convert several old client messages to new ones 2017-07-09 07:44:29 -07:00
Richard Alam
5dbb8d5515 - implement emoji status message 2017-07-08 13:39:41 -07:00
Richard Alam
77de38e2f3 Merge branch 'move-chat-messages-2x' of https://github.com/capilkey/bigbluebutton into capilkey-move-chat-messages-2x 2017-07-08 08:41:20 -07:00
Richard Alam
0cf4227273 Merge branch 'implement-bbb-web-msgs' into implement-meeting-status 2017-07-08 08:04:13 -07:00
Chad Pilkey
bf9f6df9b1 remove all 1.1 chat messaging code 2017-07-07 20:16:14 -04:00
Chad Pilkey
550b880db7 convert chat messages to 2x 2017-07-07 19:14:00 -04:00
Richard Alam
70c7ebc1a1 - continue removing old messages in akka-apps 2017-07-07 14:23:56 -07:00
Anton Georgiev
0ec660c8d3 handle assign presenter in flash client and akka apps 2017-07-07 10:32:38 -04:00
Richard Alam
a0ed7685ce - continue removing old code 2017-07-06 18:48:26 -07:00
Richard Alam
2945c0e6fc - continue removing old messages 2017-07-06 14:50:34 -07:00
Richard Alam
246fded4ff - start removing old out messages 2017-07-05 14:08:30 -07:00
Richard Alam
955b162915 - send new presentation conversion progress messages 2017-07-04 10:32:30 -07:00
Richard Alam
caa49b84cd Merge branch 'bbb-2x-mconf' into implement-bbb-web-msgs 2017-07-04 07:20:08 -07:00
Richard Alam
dfabf2f224 Merge branch '2.0-sharednotes-messages' of https://github.com/pedrobmarin/bigbluebutton into pedrobmarin-2.0-sharednotes-messages 2017-07-04 07:02:11 -07:00
Pedro Beschorner Marin
0c3d5990ff Replaced sharednotes mutable Stack undo/redo structures for immutable List 2017-07-03 17:29:39 +00:00
Pedro Beschorner Marin
79cf6bb623 Moved sharednotes messages to 2.0 format 2017-07-03 17:28:12 +00:00
Richard Alam
8ca0d6c9fe - wire up new message path 2017-07-03 07:44:13 -07:00
Anton Georgiev
2e0f6d8610 trigger syncing with state from akka-apps 2017-06-30 11:19:11 -04:00
Richard Alam
50acc517af Merge branch 'fix-2.0-layout' of https://github.com/capilkey/bigbluebutton into capilkey-fix-2.0-layout 2017-06-29 18:20:40 -07:00
Chad Pilkey
4e5df30ac4 Merge remote-tracking branch 'upstream/bbb-2x-mconf' into fix-2.0-layout 2017-06-29 16:57:28 -04:00
Richard Alam
fcf41c9f61 - move to different packages 2017-06-29 13:55:37 -07:00
Chad Pilkey
9f904e6267 reorganized the layout code in akka-apps and fixed layout broadcast 2017-06-29 16:55:25 -04:00
Richard Alam
a11c45fa02 - implement handlers for guest policy 2017-06-29 11:34:08 -07:00
Chad Pilkey
15c938e9cd fixed layout message response and removed redundant props 2017-06-29 14:32:31 -04:00
Richard Alam
f4bf6912d4 - add create meeting request test for BigBlueButtonActor 2017-06-28 09:01:45 -07:00
Richard Alam
04e55a1dd4 Merge branch 'move-caption-messages-2x' of https://github.com/capilkey/bigbluebutton into capilkey-move-caption-messages-2x 2017-06-28 07:47:56 -07:00
Richard Alam
30827f680e - move messages into different package 2017-06-27 19:44:47 -07:00
Richard Alam
a32193bd68 - reorganize messages 2017-06-27 15:01:42 -07:00
Richard Alam
03010eedb2 - put users messages in one file 
- put guest policy into it's own class
 2017-06-27 13:05:38 -07:00
Chad Pilkey
4c66393dbd Merge remote-tracking branch 'upstream/bbb-2x-mconf' into move-caption-messages-2x 2017-06-26 18:09:56 -04:00
Chad Pilkey
7c19972d24 remove pre-2.0 caption server code 2017-06-26 16:47:18 -04:00
Richard Alam
99046fb685 - handle emoji status changed message in client 2017-06-26 12:38:00 -07:00
Chad Pilkey
76026da06c moved caption messages to 2.0 format 2017-06-26 15:00:32 -04:00
Richard Alam
f7376e11c0 - get presentation info 2017-06-25 16:11:29 -07:00
Richard Alam
2931b719c6 - get presentation info 2017-06-25 13:26:37 -07:00
Richard Alam
9317cdfcc0 Merge branch 'capilkey-move-presentation-messages-2x' into merge-presentation 2017-06-25 11:25:23 -07:00
Richard Alam
34cab65b2e Merge branch 'move-presentation-messages-2x' of https://github.com/capilkey/bigbluebutton into capilkey-move-presentation-messages-2x 2017-06-24 15:46:22 -07:00
Richard Alam
7ffd1a80bd - assign presenter when no presenter present 2017-06-23 11:12:17 -07:00
Chad Pilkey
1c226fd3af 2.0 presentation message work, presentation conversion msgs in bbb-web missing 2017-06-23 13:27:56 -04:00
Richard Alam
2c8b771056 - break voice messages into separate files 2017-06-21 17:54:37 -07:00
Richard Alam
c41b9b9a7a - display users list 2017-06-21 13:32:37 -07:00
Richard Alam
281108b1ab - send waitForApproval for guest on validate token 2017-06-21 10:49:08 -07:00
Richard Alam
28b115d742 - break down messages 2017-06-20 19:15:38 -07:00
Richard Alam
63574cd8bd - split messages 2017-06-20 18:57:10 -07:00
Ghazi Triki
46556a8405 Add Layout server messages for V2. 2017-06-20 17:14:46 +01:00
Richard Alam
bd46c386fc Merge branch 'bbb-2x-mconf' into refactor-client 2017-06-19 13:28:51 -07:00
Richard Alam
6021bb93c9 - send users, voice users, webcams on validate auth token 2017-06-19 11:21:51 -07:00
Ghazi Triki
5fc84b50f0 Merge remote-tracking branch 'bigbluebutton/bbb-2x-mconf' into breakout-rooms-2x-messages 
# Conflicts:
#	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonInGW.scala
#	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/api/InMessages.scala
#	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/api/OutMessages.scala
#	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/pubsub/senders/ReceivedJsonMsgHandlerActor.scala
#	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/running/MeetingActor.scala
#	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/running/RunningMeeting.scala
#	akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/UserJoinMeetingReqMsgHdlr.scala
#	akka-bbb-apps/src/main/scala/org/bigbluebutton/endpoint/redis/RedisRecorderActor.scala
#	bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/MessageBody.scala
#	bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/Messages.scala
#	bigbluebutton-client/src/org/bigbluebutton/main/model/users/NetConnectionDelegate.as
#	bigbluebutton-client/src/org/bigbluebutton/modules/users/services/MessageReceiver.as
 2017-06-19 17:46:46 +01:00
Ghazi Triki
c7c39989a3 Added all breakout rooms events handlers in akka-bbb-apps project. 2017-06-19 16:57:36 +01:00
Richard Alam
e7ffcbfbe7 - merging latest bbb-2x-mconf 2017-06-16 18:12:29 -07:00
Richard Alam
5c76f413bb Merge branch '2.0-Polls' of https://github.com/antobinary/bigbluebutton into antobinary-2.0-Polls 2017-06-16 17:38:06 -07:00
Richard Alam
dc1c1e8b9e Merge branch 'move-whiteboard-messages-2x' of https://github.com/capilkey/bigbluebutton into capilkey-move-whiteboard-messages-2x 2017-06-16 17:18:50 -07:00
Chad Pilkey
f3ab70f060 convert whiteboard messages to the 2.0 method and remove old 2017-06-16 18:09:25 -04:00
Anton Georgiev
c6e7a17085 sendGetCurrentPollRespMsg with Option[PollVO] 2017-06-16 17:03:21 -04:00
Anton Georgiev
77b78a1ae7 Polls 2.0 - the rest of the messages 2017-06-16 12:01:14 -04:00