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

543 Commits

Author SHA1 Message Date
Chad Pilkey
027c28c320 add lock setting option to hide viewers from each other 2019-08-09 16:45:26 -07:00
Fred Dixon
2bd95f7596 Set default URL to http for testing 2019-06-23 17:23:35 -05:00
Ghazi Triki
2f571eab10 Display SVG conversion progress. 2019-06-17 18:49:25 +03:00
Richard Alam
e3dee6d7a2 - turn on svg generation by default while swf is turned off by default 2019-06-07 13:37:24 -07:00
Richard Alam
19caf3a386 Merge branch 'fix-recording-swf-disabled' of https://github.com/riadvice/bigbluebutton into riadvice-fix-recording-swf-disabled 2019-06-07 09:14:11 -07:00
Richard Alam
6e7ece7a9f - minor cleanup 2019-06-06 15:16:43 -07:00
Richard Alam
a46d0b9680 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into captions-text-tracks-intermediate-branch 2019-06-06 15:04:53 -07:00
Richard Alam
5d9f72ae21 - add single use token to request for the text track 2019-06-06 14:54:31 -07:00
Fred Dixon
63c36cb5d3
Set bigbluebutton.web.serverURL to http by default 2019-06-02 21:30:29 -04:00
Ghazi Triki
deae4bc831 Fix svgImagesRequired, generatePngs and swfSlidesRequired flags. 2019-05-15 18:50:28 +01:00
Ghazi Triki
7c5727750f Merge remote-tracking branch 'bigbluebutton/master' into text-tracks 2019-05-13 14:46:20 +01:00
Ghazi Triki
dbd86eb096 Code improve. 2019-05-10 15:51:05 +01: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
9867aa6b78 Shared notes lock settings first commit 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
Ghazi Triki
eef047d4e3 Implement getRecordingTextTracks. 2019-05-01 16:14:10 +01:00
Richard Alam
bf7898225b - minor cleanup 2019-04-30 12:30:59 -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
a33271bc09 - make akka-apps and bbb-web work with redis password 2019-04-04 14:38:53 -07:00
Richard Alam
f2098bc376 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into ritzalam-add-redis-password-on-v2.2-dev 2019-04-02 10:43:46 -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
4e6da349d2
Update link for tutorial videos for HTML5 2019-03-22 15:05:50 -04:00
Ghazi Triki
5482fa07f9 Added a new flag to switch SWF files conversion on and off. 2019-03-06 19:07:28 +01:00
Richard Alam
2408951946 - put log into single line 2019-02-09 09:43:29 -08:00
Richard Alam
f6b690b36c - add max file upload limit 2019-01-25 12:11:18 -08:00
Richard Alam
b84b5d8552 Merge branch 'grails-gradle-update' of https://github.com/riadvice/bigbluebutton into riadvice-grails-gradle-update 2019-01-25 08:06:46 -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
5aa3b04008 Fix log file name. 2019-01-17 13:58:14 +01:00
Ghazi Triki
728491ae8d Use logback.xml for bigbluebutton-web. 2019-01-15 14:37:45 +01:00
Ghazi Triki
d38f55b30a Improve groovy code formatting. 2019-01-15 11:03:07 +01:00
Ghazi Triki
4a4edd0ca6 Update bigbluebutton-web to gradle 5.1 (Work In Progress) 2019-01-09 21:06:09 +01:00
Anton Georgiev
c9505ff56a set allowRequestsWithoutSession=false by default 2019-01-08 19:56:50 +00:00
Anton Georgiev
79ecdf56e8 BBB-web: add allowRequestsWithoutSession=false to handle stripped JSESSIONID 2019-01-08 19:54:08 +00:00
Richard Alam
05c7b5f7e7 Merge branch 'v2.2-dev' into merge-with-v2.2-dev 2018-12-14 15:08:47 -08:00
Richard Alam
11379cab49 merging adding redis password into v2.2-dev 2018-12-14 08:46:04 -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
fd959f9e14 Remove rediscala library and replace it by a lettuce implementation. 2018-12-05 20:21:06 +01:00
Richard Alam
0a14991955 - add redis password to bbb-web 2018-11-30 07:52:16 -08: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
fbd1d631d6 Move redis communication classes from red5 applications to bbb-apps-common project. 2018-11-21 10:55:06 -02:00
Ghazi Triki
8e10280614 Fix configuration for akka and bbb-web projects. 2018-11-14 20:18:12 +01: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
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
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
Ghazi Triki
41f5249f4e Updated SVG conversion to simplify complex files. 2018-10-04 23:52:57 +01:00
Ghazi Triki
b6a5e75459 Down-scale image sized over 2MB. 2018-09-11 12:51:03 +01: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
Richard Alam
119d1aecf3 - try to make comment clearer on purpose of value setting 2018-07-30 10:00:12 -07: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
aef2fe577d
Merge pull request #5889 from kepstin/turn-stun-fix 
Fix comments in turn-stun-servers.xml (v2.2-dev)
 2018-07-20 15:39:17 -04:00
Calvin Walton
4faf1c9231 Fix comments in turn-stun-servers.xml 
When some code was being moved around, it looks like a bad sed command got run
on this file which made the comments/documentation unreadable.

Revert to the previous version of the file.
 2018-07-20 11:21:46 -04:00
Richard Alam
4e215249a5 - allow downloading of presentations with utf-8 filenames 2018-07-18 11:52:11 -07:00
Richard Alam
6401bf905d - handle upload of text tracks 2018-06-29 12:27:23 -07:00
Richard Alam
b9dad9ff19 Merge branch 'upload-vtt' of https://github.com/ritzalam/bigbluebutton into ritzalam-upload-vtt 2018-06-28 14:27:16 -07:00
Richard Alam
fc3605f301 - merging latest v20-release branch 2018-06-21 07:38:19 -07:00
Richard Alam
788ca15440 Implement end meeting callback url 
To use, add meta_endcallbackurl parameter on the create api call.
 2018-06-20 13:13:44 -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
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
Richard Alam
2bb3b59b1b - handle put track api request 2018-05-29 07:19:19 -07:00
Richard Alam
3e78309877 - handle get text tracks api call 2018-05-25 12:52:16 -07:00
Richard Alam
0361f1c5db - add some kind of check to uploaded file 
NOTE: This doesn't fix issue with uploading file with FF 60 on Windows 10.
 2018-05-19 10:01:22 -07:00
Richard Alam
b352ee2c95 - change log timestamp format so they are all the same 2018-05-15 10:50:40 -07:00
Richard Alam
384df10746 - generate png files for uploaded presentation 2018-04-10 13:06:08 -07:00
prlanzarin
750d537618 Updated bbb-web apiVersion to 2.0 2018-02-09 03:22:11 +00: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
Richard Alam
beed7a1058 - make client logout timer configurable in bigbluebutton.properties 2017-12-15 14:59:00 -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
Anton Georgiev
d6e8396407 add configuration to join via html5 for attendee or mod 2017-11-30 15:19:03 -05:00
Richard Alam
5bf8258074 - make max file uploaded presentation 2017-11-27 14:03:50 -08:00
Richard Alam
3056622283 - setup polling of guest while waiting for approval from moderator 2017-10-31 12:50:54 -07:00
Fred Dixon
f72fe51c1c
Update bigbluebutton.properties 
Reverted serverURL to previous value
 2017-10-29 11:15:34 -04:00
Fred Dixon
ec87a575f7
Update bigbluebutton.properties 
Revert serverURL to previous value
 2017-10-29 11:12:25 -04:00
Richard Alam
f0cbfcaf1d Merge branch 'upgrade-to-red5-oct-10-2017' into upgrade-master-to-latest-red5 2017-10-11 05:31:51 -07:00
Anton Georgiev
9cdf0897c3 welcome msg - drop location of phone icon from msg 2017-10-05 16:46:28 -04:00
Richard Alam
6ce535b0d2 - change default policy to always accept 2017-10-03 14:03:16 -07:00
Richard Alam
84cfda3459 Merge branch 'bbb-2x-mconf' of github.com:bigbluebutton/bigbluebutton into implement-guest-policy 2017-09-27 11:32:13 -07:00
Richard Alam
9d9df0eee0 - lower timeout timer for validation 
- change location of preschecker
 2017-09-26 14:07:51 -07:00
Richard Alam
a124b2d0e8 - call presentation checker from bbb-web 2017-09-26 12:23:39 -07:00
Richard Alam
e062e42cd0 - implement redirect of client to guest waiting 2017-09-25 14:12:54 -07:00
Anton Georgiev
871498dd0d Split POST upload request into two stages at nginx 
Subrequest goes to different endpoint on bbb-web to ensure
that the content length (passed in header) is taken under
consideration prior to uploading file
 2017-09-18 14:25:00 -04:00
Anton Georgiev
f8087e0af3 store, check, exprire upload authz tokens in bbb-web 2017-09-13 10:39:28 -04:00
Richard Alam
cdb39d469e - process get recordings api call 2017-09-03 10:52:18 -07:00
Fred Dixon
c7f2459331 Merge pull request #4297 from bigbluebutton/ffdixon-patch-4 
Update bigbluebutton.properties
 2017-08-22 17:58:43 -04:00
Fred Dixon
889161a783 Update bigbluebutton.properties 
Change wording of headset icon to phone icon.
 2017-08-22 17:57:47 -04:00
Richard Alam
34f66ea1e3 - oops forgot to commit oooffice wiring 2017-08-17 14:27:16 -07:00
Richard Alam
f2a42bf791 Merge pull request #3929 from riadvice/document-conversion 
Update document conversion threshold values with lower values
 2017-08-11 11:20:29 -04:00
Richard Alam
3fe435668d - set also the status response 2017-08-08 14:06:53 -07:00
Richard Alam
fae9dfdf14 - return the following response when api service is unavailable. 
<response>
  <returncode>503</returncode>
  <reason>API Service Unavailable</reason>
</response>
 2017-08-08 13:50:08 -07: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
0f39d99ce5 - implement meeting expiry 2017-07-15 19:10:04 -07:00
Richard Alam
a0467f319c Merge branch 'bbb-2x-mconf' into work-on-meeting-lifcycle 2017-07-15 09:30:02 -07:00
Richard Alam
269d00791b - change DESKSHARE to SCREENSHARE 2017-07-12 07:43:44 -07:00
Richard Alam
f1bfac77f4 - put back to http and ip for values in bbb.properties 2017-07-11 17:29:09 -07: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
Richard Alam
8ca0d6c9fe - wire up new message path 2017-07-03 07:44:13 -07:00
Richard Alam
561c5d88e5 - add instructions on how to convert old message to new message 2017-06-05 07:36:55 -07:00
Richard Alam
5fed6779d4 - enable logging of akka system in bbb-web 2017-06-02 09:35:24 -07:00
Richard Alam
e56a758c5f - send create message from bbb-web 2017-05-24 15:19:03 -07:00
Ghazi Triki
a5482b506d Revert text object conversion threshold to 2000 2017-05-22 10:27:11 +02:00
Richard Alam
82371a41de - try to start system 2017-05-19 19:27:09 -07:00
Richard Alam
6b14d31853 - wire up bbb-web 2017-05-19 19:13:25 -07:00
Ghazi Triki
f5366fbc88 Update document conversion threshold values with lower values. 2017-05-11 17:03:24 +01:00
Richard Alam
b55beeb8fa - wire up redis publisher 2017-05-10 14:37:14 -07:00
Richard Alam
76a6d99ca3 - move java classes from bbb-web into bbb-common-web 2017-05-10 13:22:50 -07:00
Pedro Beschorner Marin
66a12c9c7a Moving the meeting life cycle management from bbb-web to akka-apps 2017-05-03 17:02:16 +00:00
Richard Alam
e89c832c8a Merge branch 'master' into bbb-2x-mconf 2017-04-25 07:40:30 -07:00
Richard Alam
69ba485fcc Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into bbb-2x-mconf 2017-04-21 08:12:56 -07:00
Ghazi Triki
8142031afe Faster PDF pages counting by replacing "pdf2swf" command with "pdfinfo". 2017-04-20 18:02:31 +01:00
Ghazi Triki
3ff28e3e9d Rename GhostscriptPageExtractor to PageExtractorImp. 2017-04-19 19:10:14 +01:00
Ghazi Triki
466c931b92 Remove usage of GhostScript and replace it by pdftocairo and pdfseparate. 2017-04-19 16:30:46 +01:00
Richard Alam
a9590976c2 - allow setting default guest policy for meeting 2017-04-18 19:45:32 +00:00
Ghazi Triki
a2644c430c Improve the document conversion fallback logic by merging the pdf page extraction and image conversion using 'convert' to a single step page to image conversion using 'gs'. Anti-aliasing for text and shapes is also improved. 2017-04-13 18:29:33 +01:00
Pedro Beschorner Marin
f59e42bb02 Merge remote-tracking branch 'bigbluebutton/master' into merging-into-bbb-1.1 2017-04-04 20:42:15 +00:00
Pedro Beschorner Marin
84fd8d4101 Branding back to BigBlueButton and adding back some of the client images we removed. This need to be reviewed to avoid having all this unused images! 2017-04-03 17:06:16 +00:00
Pedro Beschorner Marin
0ab207c997 Merge remote-tracking branch 'mconf/mconf' 2017-03-21 19:47:11 +00:00
Pedro Beschorner Marin
c74cc682c4 Merge remote-tracking branch 'mconf/mconf' 2017-03-20 19:45:59 +00:00
Felipe Cecagno
21170265e2 implement the ability to add artificial remote ICE candidates to the SDP, so we can better handle servers behind NAT (and other situations); extend the /api/stun call in order to retrieve the list of remote ICE candidates from a XML file 2017-03-12 21:45:08 -03:00
Richard Alam
217b70bce2 Merge pull request #3711 from ritzalam/synchronize-create-meeting 
Synchronize create meeting
 2017-03-07 13:41:11 -05:00
Richard Alam
1a2bd4d74d - add delay to processing of presentation to make sure that meeting has already been 
created. This makes sure that the meeting is able to handle the presentation
   processing events.
 2017-03-06 20:05:26 +00:00
Fred Dixon
c28c78a405 Minor updates for release -- bumped the API version 2017-03-06 13:57:54 -06:00
Richard Alam
19f29e8bec Merge pull request #3616 from riadvice/detect-heavy-to-convert-pptx 
Avoid converting some pptx files with certain properties and inform the user.
 2017-02-06 13:22:39 -05:00
Ghazi Triki
dfbf8c8c0a Avoid converting some pptx files with certain properties and inform the user. 2017-01-30 19:50:10 +01:00
Pedro Beschorner Marin
32cab1bcab Escaping Java's properties file instructions 2017-01-27 12:58:45 +00:00
Ghazi Triki
4c4d768883 Added new "webcamsOnlyForModerator" parameter for create meeting API. 2017-01-02 16:56:32 +01:00
Fred Dixon
21b953bc7c Removed carriage returns from bigbluebutton.properties 2016-11-28 17:21:36 -06:00
Ghazi Triki
1c45633028 Lower SWF conversion threshold from 2500 to 2000 for text objects. 2016-10-26 14:36:27 +01:00
Ghazi Triki
e187634c2a Using blank-presentation.pdf as default breakout room presentation when no current presentation is set to the parent room. 2016-10-14 16:33:17 +01:00
Ghazi Triki
0e72d7523d Make breakout rooms use the selected slide of the current presentation as default presentation. 2016-09-28 22:19:48 +01:00
Pedro Beschorner Marin
49d5f9c41c Refactored redis recording events 2016-09-21 16:32:11 +00:00
jfederico
3058564ae1 bbb-web: Fixed issue with registeredUser map not cleaned up 2016-08-29 13:53:50 -04:00
jfederico
aac104c77d bbb-web: Set defaultMaxUsers=0 in bigbluebutton.properties 2016-08-09 15:24:46 -04:00
jfederico
34ad74646a bbb-web: Added code for updating recording metadata 2016-07-11 15:57:11 -04:00
Richard Alam
58c239bc43 Merge branch 'master' into merge-bbb-1.1-dev-java8-with-master 
Conflicts:
	akka-bbb-apps/build.sbt
	akka-bbb-apps/src/main/java/org/bigbluebutton/core/api/IBigBlueButtonInGW.java
	akka-bbb-apps/src/main/resources/application.conf
	akka-bbb-apps/src/main/scala/org/bigbluebutton/Boot.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonActor.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonInGW.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/MeetingActor.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/MeetingModel.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/MessageSenderActor.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/RecorderActor.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/WhiteboardApp.scala
	akka-bbb-fsesl/build.sbt
	akka-bbb-fsesl/src/main/java/org/bigbluebutton/freeswitch/pubsub/receivers/RedisMessageReceiver.java
	akka-bbb-fsesl/src/main/java/org/bigbluebutton/freeswitch/voice/freeswitch/ConnectionManager.java
	akka-bbb-fsesl/src/main/java/org/bigbluebutton/freeswitch/voice/freeswitch/FreeswitchApplication.java
	bbb-common-message/build.sbt
	bbb-common-message/src/main/java/org/bigbluebutton/common/messages/Constants.java
	bbb-common-message/src/main/java/org/bigbluebutton/common/messages/MessagingConstants.java
	bbb-common-message/src/main/java/org/bigbluebutton/common/messages/Util.java
	bigbluebutton-apps/build.gradle
	bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/pubsub/redis/RedisPubSubMessageHandler.java
	bigbluebutton-apps/src/main/webapp/WEB-INF/red5-web.xml
	bigbluebutton-client/build.xml
	bigbluebutton-client/resources/config.xml.template
	bigbluebutton-client/resources/prod/BigBlueButton.html
	bigbluebutton-client/src/org/bigbluebutton/common/Images.as
	bigbluebutton-client/src/org/bigbluebutton/main/maps/ApplicationEventMap.mxml
	bigbluebutton-client/src/org/bigbluebutton/main/model/users/Conference.as
	bigbluebutton-client/src/org/bigbluebutton/modules/deskshare/utils/JavaCheck.as
	bigbluebutton-client/src/org/bigbluebutton/modules/users/services/MessageReceiver.as
	bigbluebutton-web/build.gradle
	bigbluebutton-web/grails-app/conf/spring/resources.xml
	bigbluebutton-web/grails-app/controllers/org/bigbluebutton/web/controllers/ApiController.groovy
	bigbluebutton-web/src/java/org/bigbluebutton/api/MeetingService.java
	bigbluebutton-web/src/java/org/bigbluebutton/api/domain/Meeting.java
	bigbluebutton-web/src/java/org/bigbluebutton/api/messaging/MeetingMessageHandler.java
	bigbluebutton-web/src/java/org/bigbluebutton/api/messaging/RedisMessagingService.java
	record-and-playback/core/scripts/bigbluebutton.yml
 2016-05-16 11:35:36 -04:00
Richard Alam
7ae9b7b204 Merge branch 'merge-webrtc-ds' of https://github.com/antobinary/bigbluebutton into antobinary-merge-webrtc-ds 
Conflicts:
	akka-bbb-apps/build.sbt
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/UsersApp.scala
	akka-bbb-fsesl/build.sbt
	akka-bbb-fsesl/src/main/java/org/bigbluebutton/freeswitch/voice/freeswitch/ESLEventListener.java
	akka-bbb-fsesl/src/main/scala/org/bigbluebutton/freeswitch/VoiceConferenceService.scala
	bbb-common-message/build.sbt
	bbb-common-message/src/main/java/org/bigbluebutton/common/messages/Constants.java
	bbb-common-message/src/main/java/org/bigbluebutton/common/messages/Util.java
	bigbluebutton-apps/build.gradle
	bigbluebutton-web/grails-app/conf/spring/resources.xml
	bigbluebutton-web/src/java/org/bigbluebutton/api/MeetingService.java
 2016-05-20 20:27:52 +00:00
jfederico
4ce332ecce bbb-web: Fix for race condition that causes the maxParticipants filter to fail (changed the format to error parameter) 
[{"message":"You did not pass a checksum parameter.","key":"MissingParam"},{"message":"You did not pass a meetingID parameter.","key":"MissingParam"}]
 2016-05-18 15:39:34 -04:00
Anton Georgiev
228dfb4061 Merge branch 'mod-verto-1' of github.com:antobinary/bigbluebutton into merge-webrtc-ds 
Conflicts:
	akka-bbb-apps/build.sbt
	akka-bbb-apps/src/main/resources/application.conf
	akka-bbb-apps/src/main/scala/org/bigbluebutton/SystemConfiguration.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/MessageSenderActor.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/UsersApp.scala
	akka-bbb-fsesl/build.sbt
	bbb-common-message/build.sbt
	bbb-fsesl-client/build.sbt
	bbb-fsesl-client/src/main/java/org/freeswitch/esl/client/inbound/Client.java
	bigbluebutton-apps/build.gradle
	bigbluebutton-client/build.xml
	bigbluebutton-client/src/org/bigbluebutton/modules/deskshare/utils/BrowserCheck.as
	bigbluebutton-client/src/org/bigbluebutton/modules/deskshare/utils/JavaCheck.as
	bigbluebutton-client/src/org/bigbluebutton/modules/deskshare/view/components/DesktopPublishWindow.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/users/services/MessageReceiver.as
	bigbluebutton-html5/app/client/NotificationControl.coffee
	bigbluebutton-html5/app/client/globals.coffee
	bigbluebutton-html5/app/client/lib/bbb_api_bridge.coffee
	bigbluebutton-html5/app/client/main.coffee
	bigbluebutton-html5/app/client/main.html
	bigbluebutton-html5/app/client/stylesheets/whiteboard.less
	bigbluebutton-html5/app/client/views/chat/chat_bar.coffee
	bigbluebutton-html5/app/client/views/modals/settings.coffee
	bigbluebutton-html5/app/client/views/modals/settings.html
	bigbluebutton-html5/app/client/views/users/user_item.coffee
	bigbluebutton-html5/app/client/views/whiteboard/whiteboard.coffee
	bigbluebutton-html5/app/client/views/whiteboard/whiteboard.html
	bigbluebutton-html5/app/collections/collections.coffee
	bigbluebutton-html5/app/config.coffee
	bigbluebutton-html5/app/lib/router.coffee
	bigbluebutton-html5/app/server/collection_methods/meetings.coffee
	bigbluebutton-html5/app/server/collection_methods/users.coffee
	bigbluebutton-html5/app/server/publish.coffee
	bigbluebutton-html5/app/server/server.coffee
	bigbluebutton-web/src/java/org/bigbluebutton/api/MeetingService.java
	record-and-playback/presentation/scripts/process/presentation.rb
	record-and-playback/presentation/scripts/publish/presentation.rb
 2016-05-18 15:14:04 +00:00
jfederico
f075895792 bbb-web: Fix for race condition that causes the maxParticipants filter to fail (implemented cleaner) 2016-05-17 10:55:37 -04:00
Richard Alam
b86f32b8c1 Sync with upstream repository 
Merge branch 'master' of github.com:bigbluebutton/bigbluebutton
 2016-04-26 20:01:20 -04:00