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

1247 Commits

Author SHA1 Message Date
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