BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
30,556 Commits 13 Branches 260 Tags 1.1 GiB
241ab5f233
Commit Graph

1534 Commits

Author SHA1 Message Date
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
Ghazi Triki
48ca58ea3e Fix API variables formatting for meeting endTime and duration. 2019-03-25 13:41:14 +01:00
Fred Dixon
4e6da349d2
Update link for tutorial videos for HTML5 2019-03-22 15:05:50 -04:00
Richard Alam
3cda13b145 Merge branch 'flash-deprecation' of https://github.com/riadvice/bigbluebutton into riadvice-flash-deprecation 2019-03-16 07:54:16 -07:00
Anton Georgiev
3290458649 updated .gitignore for bbb-web and bbb-html5 2019-03-14 16:43:48 +00:00
Ghazi Triki
04b8ae7366 Add commons-compress dependency to pres-checker project. 2019-03-13 15:57:14 +01: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
361776a2fe - signout api throwing exception when it cannot find the user session 2019-02-12 14:12:46 -08:00
Richard Alam
e85e48c64a - fix json response format for stuns and enter api 2019-02-11 14:38:15 -08:00
Fred Dixon
e26df7cf06
Merge pull request #6754 from riadvice/fix-stun-turn 
Fix API stuns call
 2019-02-10 22:57:08 -08:00
Ghazi Triki
b2a4b1efbe Fix API stuns call. 2019-02-11 07:56:13 +01:00
Richard Alam
7185eae79b - make easy to collect data from logs 2019-02-09 19:09:32 -08:00
Richard Alam
2408951946 - put log into single line 2019-02-09 09:43:29 -08:00
Richard Alam
4c5bd2df7e - set the bbb-web port to 8090 2019-02-09 08:36:27 -08:00
Richard Alam
7c76930feb Merge branch 'authenticate-sfu-pad-connections' of https://github.com/pedrobmarin/bigbluebutton into pedrobmarin-authenticate-sfu-pad-connections 2019-02-09 08:27:12 -08:00
Ghazi Triki
99aa2b5fcc Use the right bigbluebutton user for recording directories. 2019-02-08 17:53:57 +01:00
Richard Alam
df289e241d - update doc to build and run bbb-web during development 2019-02-07 08:05:50 -08:00
Ghazi Triki
e30a37db26 Add settings.gradle for pres-checker project. 2019-02-06 16:09:59 +01:00
Pedro Beschorner Marin
b5427737d7 Includes a minimal authentication step before SFU connections 2019-02-06 09:37:05 -02:00
Richard Alam
7bf7adf145 - run on a different port (8090) 2019-02-05 14:18:27 -08:00
Richard Alam
d92d7f1703 - add location of bigbluebutton.properties 2019-02-05 13:54:45 -08:00
Richard Alam
5783da21a2 - add instructions on how to run the app 2019-02-05 13:52:28 -08:00
Richard Alam
86761ee154
Upgrade gradle and grails 
Add instructions to upgrade gradle and grails.
 2019-02-05 16:17:12 -05:00
Richard Alam
2a786cd452 - separate building and running as most of the times, we don't need to re-run bringing in jars and configs. 2019-01-25 12:25:16 -08:00
Richard Alam
2e7989683e Merge branch 'grails-gradle-update' of github.com:riadvice/bigbluebutton into grails-gradle-update 2019-01-25 12:13:45 -08:00
Richard Alam
f6b690b36c - add max file upload limit 2019-01-25 12:11:18 -08:00
Ghazi Triki
99b65fbc69 Added README.md to bigbluebutton-web. 2019-01-25 17:24:06 +01: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
Ghazi Triki
9cf304ec80 Updated bigbluebutton-web/build.sh to match gradle 3 commands. 2019-01-25 08:18:53 +01: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
d5091ef61b Added unit test for join API. 2019-01-24 08:42:14 +01:00
Ghazi Triki
cbcf9315a0 Improved response handling in ApiControllerSpec and added unit test for join. 2019-01-22 11:50:33 +01:00
Ghazi Triki
a11ce7732e Implemented unit tests for create API. 2019-01-21 21:58:16 +01:00
Ghazi Triki
8a985e8785 Implemented the first unit test for API version. 2019-01-17 18:29:44 +01:00
Ghazi Triki
68e6468c34 Fix guestWaitHandler in ApiController.groovy 2019-01-17 14:21:22 +01:00
Ghazi Triki
5aa3b04008 Fix log file name. 2019-01-17 13:58:14 +01:00
Ghazi Triki
5fc13c3447 Load freemaker templates whether the application runs within a JAR file or outside of it. 2019-01-17 11:39:50 +01:00
Ghazi Triki
728491ae8d Use logback.xml for bigbluebutton-web. 2019-01-15 14:37:45 +01:00
Ghazi Triki
de17942501 Fix mapping for swf files. 2019-01-15 11:36:49 +01:00
Ghazi Triki
d38f55b30a Improve groovy code formatting. 2019-01-15 11:03:07 +01:00
Ghazi Triki
dcb0544897 Update XML and JSON responses for ApiController. 2019-01-14 14:29:19 +01:00
Ghazi Triki
302a05528e Fix API XML responses. 2019-01-10 21:18:15 +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
47dffd5f3a add parenthesis to improve readability 2019-01-08 21:47:08 +00: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
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
Richard Alam
0a14991955 - add redis password to bbb-web 2018-11-30 07:52:16 -08: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
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
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
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
a6c693c93d add clientType in User and show it in api getMeeting* 2018-06-22 19:19:46 +00: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
228540d638
Change bbb-web dev port 
Change port so as not to conflict with Kurento
 2018-05-31 16:54:32 -04:00
Richard Alam
bd9414e3a9 Merge branch 'v2.0.x-release' of github.com:bigbluebutton/bigbluebutton into upload-vtt 2018-05-31 11:22:06 -07:00
Richard Alam
2bb3b59b1b - handle put track api request 2018-05-29 07:19:19 -07:00
Richard Alam
2d175cda62 - handle get text tracks call 2018-05-28 07:17:55 -07:00
Richard Alam
3e78309877 - handle get text tracks api call 2018-05-25 12:52:16 -07:00
Richard Alam
4c673d83a9 - setup caption endpoint 2018-05-24 14:33:56 -07:00
Anton Georgiev
e4a6f31abc revert special api changes made for html5 client 2018-05-24 18:42:59 +00: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
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
384df10746 - generate png files for uploaded presentation 2018-04-10 13:06:08 -07:00
Richard Alam
e981a874c3 - query for guest wait status 2018-02-26 10:51:02 -08:00
Richard Alam
2bb1f23da5 - fix exception when redirect=false and guest has to wait for approval 2018-02-23 15:06:24 -08:00
prlanzarin
750d537618 Updated bbb-web apiVersion to 2.0 2018-02-09 03:22:11 +00: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
Ghazi Triki
8f47e7b7de Remove webcamsOnlyForModerator from enter API response. 2018-01-09 18:14:58 +01: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
d09abe92e4 - allow to pass custom copyright text using create API 2017-12-20 14:28:01 -08:00
Richard Alam
f5502a1a2a - allow passing of custom param (logo) to override default logo 2017-12-20 11:06:00 -08:00
Richard Alam
58d8e70303
Merge pull request #4844 from ritzalam/fix-logouttimer-and-mod-only-msg 
- hardcode logoutTimer to zero as we don't use this feature in the r…
 2017-12-20 07:37:12 -08:00
Richard Alam
8223a08029 - hardcode logoutTimer to zero as we don't use this feature in the release 
- substitute keyworks in moderatorOnlyMessage
 2017-12-18 12:52:33 -08:00
Richard Alam
ffc448f948 - fix issue https://github.com/bigbluebutton/bigbluebutton/issues/4660 2017-12-18 12:16:15 -08:00
Ghazi Triki
aa91cf6562 Code quality improve for bbb-common-web project. 2017-12-18 20:54:18 +01: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
446f539e89 add bool join parameter joinViaHtml5 -- to prefer html5 over flash client 2017-12-04 15:29:25 -05: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
9329e9316b - determine guest status properly for moderators 2017-11-15 12:39:06 -08:00
Richard Alam
3056622283 - setup polling of guest while waiting for approval from moderator 2017-10-31 12:50:54 -07:00
Richard Alam
0036b5734d - create guest lobby html page 2017-10-30 14:21:09 -07:00
Richard Alam
9f28f240a5 - hardcode default presentation window for pre-uploaded presentations and for creation of breakout rooms 2017-10-30 13:05:06 -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
84b12dfa94 Merge branch 'v2.0.x-release' of github.com:bigbluebutton/bigbluebutton into synch-with-v2.0 2017-10-27 07:51:17 -07:00
Ghazi Triki
c1abb17107 Check PPTX file and mark it as invalid if all slides are hidden. 2017-10-26 21:29:04 +01:00
Anton Georgiev
ff1aac2698 hardcode podId for first pod (for default.pdf) 2017-10-24 16:54:55 -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
3a9c4bb8ff Merge branch 'implement-multi-chat' into riadvice-information-bar 2017-10-03 14:05:34 -07:00
Richard Alam
a3e37dffa5 Merge branch 'information-bar' of https://github.com/riadvice/bigbluebutton 2017-10-03 14:04:12 -07:00
Richard Alam
6ce535b0d2 - change default policy to always accept 2017-10-03 14:03:16 -07:00
Ghazi Triki
e96d6ae726 Add new API options to display a banner in the client. 2017-10-03 21:49:06 +01:00
Anton Georgiev
d521b19623 Merge branch 'implement-multi-chat' of github.com:ritzalam/bigbluebutton into pods_vol3 2017-10-03 11:13:48 -04:00
Anton Georgiev
23dadc5477 work on separating pods - client/conversion/apps 2017-09-29 18:20:33 -04:00
Richard Alam
fe44a79298 - send guest waiting message to client 2017-09-27 12:48:30 -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
02e2989ba2 - point to jar dependencies 2017-09-26 14:32:42 -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
0a7a90a67a - add standalone presentation checker 2017-09-26 10:29:06 -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
Richard Alam
df255c154b - init guest status when joining 2017-09-22 14:53:37 -07:00
Richard Alam
4717a53182 - start implementing guest policy 2017-09-22 14:24:08 -07:00
Ghazi Triki
9b997392f0 Added new logoutTImer feature. 2017-09-21 20:12:59 +01:00
Anton Georgiev
20fe6c0d46 cleanup 2017-09-18 14:38:03 -04: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
d92ceee702 add default nginx config for bbb-web 2017-09-18 14:19:27 -04:00
Anton Georgiev
f8087e0af3 store, check, exprire upload authz tokens in bbb-web 2017-09-13 10:39:28 -04:00
Richard Alam
b14b04576d - publish/unpublish recording 
- get recordings
 2017-09-03 13:44:43 -07:00
Richard Alam
cdb39d469e - process get recordings api call 2017-09-03 10:52:18 -07:00
Richard Alam
e8127fdb61 - do not include recordings with bad metadata.xml in the response for recording api calls 2017-08-31 08:06:15 -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
a81f2474e0 - fix end time format of get-meeting-info api response 2017-08-10 14:26:10 -07: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
beb7155121 Merge branch 'recordings-size' of https://github.com/pedrobmarin/bigbluebutton into pedrobmarin-recordings-size 2017-08-02 08:22:02 -07:00
Richard Alam
3b44d0eac2 - fix issue where late joiners displays the wrong slide 2017-08-01 14:50:44 -07:00
Pedro Beschorner Marin
835f7d5371 Removed unused playbacks included with mconf merge 2017-08-01 15:11:49 +00:00
Chad Pilkey
e4350f10a9 remove broken parts of getRecordings response building 2017-07-31 18:13:09 -04:00
Anton Georgiev
3d75d9cac3 Merge pull request #4091 from JaeeunCho/changed_stunturn_api 
bbb_web - modified stun/turn api
 2017-07-17 15:54:10 -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
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
JaeeunCho
0a73c4ec40 bbb_web - modified stun/turn api 2017-07-14 09:13:09 -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
f4a5097289 - add run script for bbb-web 2017-06-20 14:27:54 -07:00
Richard Alam
d0343b40d2 - delay processing of pre-uploaded presentation to make sure that meeting has been created before 
presentation conversion has completed.
 2017-06-19 13:04:07 -07:00
Richard Alam
2ce9b95775 - some util scripts 2017-06-16 10:07:47 -07:00
Richard Alam
c0cc7138b3 - add new user joined voice event message 2017-06-12 11:39:53 -07:00
Richard Alam
6f8f821beb Merge pull request #3983 from antobinary/2.0 
Drop requirement for session[sessionToken]Send sessionToken in enterAPI redirect=false
 2017-06-05 18:37:51 -04:00
Richard Alam
561c5d88e5 - add instructions on how to convert old message to new message 2017-06-05 07:36:55 -07:00
Anton Georgiev
e59f5ac3ff drop requirement for session[sessionToken]; send sessionToken in enterAPI redirect=false 2017-06-02 13:54:13 -04:00
Richard Alam
5fed6779d4 - enable logging of akka system in bbb-web 2017-06-02 09:35:24 -07:00
Richard Alam
240176ca32 Merge branch 'bbb-2x-mconf' of github.com:bigbluebutton/bigbluebutton into move-java-classes-from-bbb-web-to-bbb-common-web 2017-05-27 18:30:50 -07:00
Richard Alam
e56a758c5f - send create message from bbb-web 2017-05-24 15:19:03 -07:00
Ghazi Triki
7d283cd154 Merge remote-tracking branch 'bigbluebutton/master' into merge-master-into-2x 
# Conflicts:
#	bigbluebutton-client/resources/config.xml.template
#	bigbluebutton-client/src/org/bigbluebutton/modules/phone/PhoneOptions.as
#	bigbluebutton-client/src/org/bigbluebutton/modules/phone/views/components/ToolbarButton.mxml
#	record-and-playback/core/scripts/rap-process-worker.rb
 2017-05-22 17:35:24 +01: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
jfederico
a4b0cb7436 bbb-web: Fixed issue in getRecordings not responding the meetingID correctly 2017-05-19 15:11:08 +00:00
Ghazi Triki
f5366fbc88 Update document conversion threshold values with lower values. 2017-05-11 17:03:24 +01:00
Richard Alam
9a628da93d - remove bbb-commons-message dependency 2017-05-10 17:21:55 -07: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
d4b6fb1158 Removed bbb-web a domain file that was already moved to bbb-common-web 2017-05-04 15:24:06 +00: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
61d7b18345 - remove reconnect number in userId 2017-04-28 14:21:59 -07:00
Richard Alam
e89c832c8a Merge branch 'master' into bbb-2x-mconf 2017-04-25 07:40:30 -07:00
Richard Alam
011ebd7e81 Merge pull request #3847 from ritzalam/add-catch-all-exception 
Add catch all exception to bbb-web redis subscriber
 2017-04-24 17:51:03 -04:00
Richard Alam
5126e40762 - spell the word correctly 2017-04-24 20:46:43 +00:00
Richard Alam
4c32f130df - minimize logging 2017-04-24 20:43:11 +00:00
Richard Alam
80e3c7eabb Add catch all exception to bbb-web redis subscriber 
On redis-cli, we noticed that BbbWebSub isn't on the "client list". The auto-reconnect on bbb-web
 wasn't triggered as not log was generated in bbb-web.log. Maybe the exception was something we
 did not handle. Try catching all exception on this jedis connection.
 2017-04-24 20:20:39 +00: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
1255e41758 Fallback again to 72 DPI PNG for complex PDF pages. 2017-04-20 13:44:58 +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
106dbb3275 Clean dependencies for bigbluebutton-web. 2017-04-18 17:16:57 +01:00
Richard Alam
b8de0c9231 - add authorized role to registered user 2017-04-17 21:23:17 +00:00
Richard Alam
262c7250c8 Merge branch 'master' with bbb-mconf 2017-04-17 15:57:31 +00:00
Ghazi Triki
bc898c145a More fine tuning for document conversion fall-back. 2017-04-17 15:35:29 +01: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
Ghazi Triki
0ef12cd076 Delete the initially converted swf to be sure that if fallback convertion does not work we get the blank swf loaded. 2017-04-12 18:17:08 +01:00
Richard Alam
7c9c09b5b0 Cleanup 
- remove extra > on meeting name on getRecording API response
 2017-04-11 17:22:54 +00: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
Richard Alam
ced8c23387 - escape all user passed strings 2017-04-03 18:48:28 +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
Richard Alam
c99de6c4db - display length of recording in minutes instead of milliseconds 2017-03-31 19:54:51 +00:00
Pedro Beschorner Marin
49855b4c80 Removed some callback API methods from bigbluebutton web that were missed on merge 2017-03-31 12:18:33 +00:00
Richard Alam
8122f984ea - convert "success" to upper case to match previous API. Maybe users are matching with uppercase. 2017-03-28 21:04:52 +00:00
Richard Alam
fcca81783e - escape image alt attribute as it's breaking xml format in some metadata.xml 2017-03-28 20:16:26 +00:00
Richard Alam
7fdbc5b293 - try fix broken get recording api call 2017-03-28 19:32:01 +00:00
Richard Alam
364f781104 - fix issue where GetRecordings API was failing because support of old metadata.xml broke. 2017-03-27 21:10:24 +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
Richard Alam
b3787c411e - remove control chars from meeting name param on create api request 
- return an error if external meeting id contains comma (,) on create api request
 2017-03-16 20:34:44 +00:00
Richard Alam
058a4044d6 - publish/unpublish recording 2017-03-15 14:29:10 +00:00
Richard Alam
72c42f9d70 - build get recordings api response 2017-03-13 21:43:39 +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