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

1283 Commits

Author SHA1 Message Date
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
fd959f9e14 Remove rediscala library and replace it by a lettuce implementation. 2018-12-05 20:21:06 +01:00
Chad Pilkey
0fe8e3a38a
Lock enter and stuns to valid session+token 2018-11-22 14:39:25 -05:00
Ghazi Triki
d8588da28a Add support for redis password. 2018-11-22 16:02:55 -02:00
Ghazi Triki
35fa440b81 Improve build shell scripts. 2018-11-22 12:53:42 -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
a52e907593 Fix API calls. 2018-11-02 20:57:54 +01:00
Ghazi Triki
2ca74819ce Improve freemaker templates. 2018-11-02 20:57:33 +01:00
Ghazi Triki
0ff63f9cde Remove HTML escaping in freemaker templates, it is automatic since version 2.3.24 and fixed metadata display. 2018-11-01 21:52:53 +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
f895c09362
Merge pull request #6160 from riadvice/fix-multi-pres 
Fix PR #6122
 2018-10-17 15:56:47 -04:00
Ghazi Triki
df7642117e Fix missing parameter for downloadAndProcessDocument method in ApiController.groovy 2018-10-16 18:31:16 +01:00
Richard Alam
ca9fa5dc09 - changing aliases to use meeting_id_2 instead of meeting_id_1 just in case we need to make the URL params different 2018-10-09 09:15:22 -07:00
Richard Alam
f05cb7ddbc Merge branch 'v2.0.x-release' of github.com:bigbluebutton/bigbluebutton into improve-log-on-presentation-conversion 2018-10-09 09:13:03 -07:00
Ghazi Triki
41f5249f4e Updated SVG conversion to simplify complex files. 2018-10-04 23:52:57 +01:00
zhu
6eba10da3a
Merge branch 'v2.0.x-release' into v2.0.x-release 2018-09-28 18:19:56 +08:00
zhu
7e42bb7f02 Fix create meeting with multi presentations will set all of them to current 2018-09-28 18:04:37 +08:00
Ghazi Triki
1493470b13 Add filename attribute for file pre-upload using an URL 2018-09-24 16:41:35 +01:00
Richard Alam
063a81b91f - nginx file to server presentation slides. 
Deploy to /etc/bigbluebutton/nginx
 2018-09-20 14:02:02 -07:00
Richard Alam
74cb07f839 - log error when tomcat still serves slides files 2018-09-20 14:01:19 -07:00
Richard Alam
2fe4f555e8 - log meetingId, presId, and page num of slide that's failing to load 2018-09-19 11:46:30 -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
Ghazi Triki
c44e5aebb8 Merge remote-tracking branch 'bigbluebutton/master' into v2.0.x-code-cleanup 
# Conflicts:
#	bigbluebutton-web/grails-app/controllers/org/bigbluebutton/web/controllers/ApiController.groovy
 2018-09-11 18:07:07 +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
8e9a75d149 - reduce size of the bbb-html5 image 
- fix path of the html5 config file to apply METEOR_SETTINGS
- remove TLS from coturn, in order to keep the ssl certificate on traefik only
- configure stun on bbb-web as well
- allow turn domain/address to be different from the server domain
 2018-08-24 17:15:47 -03:00
Felipe Cecagno
a9b88182d8 change bbb-web to allow join without requesting config.xml 2018-08-24 17:15:47 -03:00
Felipe Cecagno
f6fa7e0945 add another property for redis on bbb-web; set freeswitch ip on webrtc-sfu; add volumes to store media files 2018-08-24 17:15:47 -03: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
Ghazi Triki
2820178b83 Updated JVM projects dependencies and configuration. 2018-08-05 22:37:11 +01:00
Anton Georgiev
78847f89ad attempt to pull 2.0 into 2.2 2018-07-31 16:18:23 +00: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
Anton Georgiev
b4b4f32929 pass key->value pairs in "customdata" array 2018-07-24 22:34:53 +00: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
Ghazi Triki
d383fc98f7 Clean unused parameters in ApiController.groovy 2018-07-11 10:36:01 +01:00
Anton Georgiev
f20569aed7 Merge branch 'java-optimise' of github.com:riadvice/bigbluebutton into merge-bbb-web 2018-07-06 17:40:54 +00:00