BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
28,577 Commits 13 Branches 260 Tags 1.1 GiB
228bad03d5
Commit Graph

397 Commits

Author SHA1 Message Date
Richard Alam
0877d8379a Format conference numbers 
- add dashes to conference numbers so it is easier to read
 2020-04-28 18:27:54 -07:00
Ghazi Triki
b21ca8355a Return 404 error when the file download is not allowed. 2020-04-25 19:51:17 +03:00
Erik E. Lorenz
535016dddc Don't create duplicate telvoice/webvoice meetings 2020-04-24 17:29:26 +02:00
Erik E. Lorenz
69164169a8 Add telVoice query functions to MeetingService 
* getNotEndedMeetingWithTelVoice()
* getNotEndedMeetingWithWebVoice()
 2020-04-24 17:25:51 +02:00
Mitsutaka Sato
b256b55c3e Fix calcGuestStatus 2020-04-22 15:10:42 +12:00
Ghazi Triki
78c649650e Strip HTML tags from name and fullName API params. 2020-04-03 20:00:33 +03:00
Anton Georgiev
8129468300 Merge branch 'v2.2.x-release' of github.com:bigbluebutton/bigbluebutton into merging 2020-03-04 23:36:21 +00:00
Richard Alam
4f453c4026 - add option to skip office pre-check 2020-03-02 09:40:01 -08:00
Richard Alam
92970a612d - downscale large pages 2020-03-01 08:22:43 -08:00
Richard Alam
f8437fb19d Merge branch 'v2.2.x-release' of https://github.com/bigbluebutton/bigbluebutton into pres-url-on-page-convert 2020-03-01 05:38:04 -08:00
Anton Georgiev
3754d0ab6f Merge branch 'v2.2.x-release' of github.com:bigbluebutton/bigbluebutton into merge-2.2-into-master-feb-28-2020 2020-02-28 17:47:06 -05:00
Richard Alam
c0372e3a97 Merge branch 'blank-presentation' of https://github.com/riadvice/bigbluebutton into riadvice-blank-presentation 2020-02-28 13:32:02 -08:00
Ghazi Triki
64d08d69c7 Updated java projects dependencies versions. 2020-02-28 10:44:28 +01:00
Richard Alam
eb48875f7e - remove unused file 2020-02-27 13:40:57 -08:00
Richard Alam
859c6a2220 - clean up 
- addjust timeouts
 2020-02-27 13:37:42 -08:00
Richard Alam
518fb12341 - send end completion for image presentation 2020-02-26 14:46:58 -08:00
Richard Alam
5428e86448 - try to process multiple presentations in parallel 2020-02-26 14:36:04 -08:00
Richard Alam
70b93bdcc8 - cleanup 2020-02-26 08:13:03 -08:00
Richard Alam
fb222e0a7f - include page extraction into conversion step 2020-02-25 14:58:34 -08:00
Richard Alam
f4a4b8be5d - downscale large pdf page 2020-02-25 14:18:56 -08:00
Richard Alam
bba17c3a03 - handle pages on page converted messages instead on conversion completed message 2020-02-24 15:00:20 -08:00
Richard Alam
f521f97382 - explode pdf so we can process each page 2020-02-22 09:33:32 -08:00
Ghazi Triki
0c96050fde Improvements to conversion default fall-back files and process. 2020-02-22 18:26:50 +01:00
Richard Alam
ddb8f53852 - run conversion in a completion service 2020-02-21 12:57:40 -08:00
Richard Alam
0c9c9878c8 - figure out filename when converting one pdf page to png 2020-02-20 15:12:32 -08:00
Richard Alam
3864fef3ea - generate proper png and thumb filenames 2020-02-20 13:42:37 -08:00
Richard Alam
7099df132d - handle new messages in akka apps 2020-02-19 15:04:19 -08:00
Richard Alam
96cdf30af7 - do proper page conversion steps 2020-02-19 12:29:01 -08:00
Richard Alam
db4dc4aff0 - add urls on presentation page conversion message 2020-02-18 14:03:08 -08:00
Richard Alam
45f8def0ca - send message when office to pdf conversion failed 2020-02-15 09:13:45 -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
Tiago D J
e23db63992
Update PresentationUrlDownloadService.java 2020-02-08 01:24:29 -03:00
Richard Alam
4fc677a0b4 Breakout rooms shouldn't call the end meeting callback url 
- add check if the meeting that ended isn't a breakout room and if there is an end-meeting-callback-url.
 2020-02-06 14:50:25 -08:00
Pedro Beschorner Marin
397041efcc Removes waiting guests that stop polling for their status 2020-01-15 12:03:52 -03:00
Pedro Beschorner Marin
b11113c165 Remove meeting inactivity monitor 2019-12-11 17:11:57 -03:00
Anton Georgiev
b3a37d42f7
Merge pull request #8375 from ritzalam/fix-handling-of-redirect-for-callback-2.2-beta-17-based 
- since the endcallbackurl is passed as meta parameter, we expect it…
 2019-11-28 16:39:25 -05:00
Ghazi Triki
cd944d4770 Add missing PdfConversionInvalidErrorEvtMsg event to be sent to the web client. 2019-10-21 13:33:40 +01:00
Ghazi Triki
ba109530ae Disallow converting PDF files that have at least one big weighted page. 2019-10-16 08:37:03 +01:00
Chad Pilkey
027c28c320 add lock setting option to hide viewers from each other 2019-08-09 16:45:26 -07:00
Richard Alam
f434cc34a2 - since the endcallbackurl is passed as meta parameter, we expect it to be a working 
url and not a redirect.
 2019-07-19 07:59:31 -07:00
Ghazi Triki
2f571eab10 Display SVG conversion progress. 2019-06-17 18:49:25 +03: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
5d9f72ae21 - add single use token to request for the text track 2019-06-06 14:54:31 -07:00
Richard Alam
a8b6717c94 - put captions into temporary file to remove race condition between start of processing and writing contents of file. 2019-06-06 10:03:54 -07:00
Richard Alam
7577bf5310 - check if lang param is valid 2019-06-06 07:21:54 -07:00
Richard Alam
c92bfbb591 - deploy recording scripts in proper location 
- log upload captions params
 2019-06-04 14:07:10 -04:00
Richard Alam
7fdb920aad - change field names to match json keys 2019-06-03 13:18:27 -07:00
Richard Alam
08f0c2b4e7 - make changes to align closer to spec document 2019-06-03 11:59:20 -07:00
Richard Alam
9d416ee473 Merge branch 'text-tracks' of https://github.com/riadvice/bigbluebutton into riadvice-text-tracks 2019-05-30 12:30:07 -07:00
Ghazi Triki
ddb02f57e7 Validate recordID in putRecordingTextTrack. 2019-05-22 16:18:57 +03:00
Richard Alam
2e3350cc5c
Revert "Create API returns now returns error when no passwords provided for meeting" 2019-05-20 16:39:45 -04:00
Richard Alam
72d559f4ff - when a bad endcallbackurl is sent and causes exception, we are not handling 
it properly that results in the meeting not being removed from the running
   meeting list
 2019-05-16 14:21:04 -07: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
Fred Dixon
b2dc8bd4c6
Merge pull request #7384 from riadvice/mandatory-api-passwords 
Create API returns an error when no password parameter is provided
 2019-05-09 06:28:35 -04:00
Pedro Beschorner Marin
9867aa6b78 Shared notes lock settings first commit 2019-05-08 20:36:36 +00:00
Ghazi Triki
8892389234 Create API returns an error when no password parameter is provided. 2019-05-08 17:35:00 +01:00
Ghazi Triki
17a3af0487 Write playback caption files from the captions file generated for API. 2019-05-07 18:13:09 +01:00
Ghazi Triki
a7c3dd8e80 Fix typo and caption files URL in RecordingMetaXmlHelper.scala 2019-05-07 14:11:50 +01: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
e3a68f9a97 - cleanup 2019-04-30 13:10:51 -07:00
Pedro Beschorner Marin
324681d5b2 Renamed unmuteUsers to allowModsToUnmuteUsers 2019-04-23 12:30:55 -03:00
Ghazi Triki
cd3edb4491 Read generated caption files description using getRecordingTextTracks API. 2019-04-22 20:30:00 +01:00
Pedro Beschorner Marin
50afb24653 Changed from unmute only viewers to unmute anyone 2019-04-17 10:55:01 -03: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
Pedro Beschorner Marin
5f011f2e2e Included unmuteViewers param on create 2019-04-10 17:55:24 -03:00
Richard Alam
b50c22f445 - propagate privateChatEnabled value from parent meeting to breakout room 2019-04-10 13:53:03 -07:00
Richard Alam
f6c0d21fda - pass breakout and lock setting using create meeting message 2019-04-09 14:33:08 -07:00
Richard Alam
a33271bc09 - make akka-apps and bbb-web work with redis password 2019-04-04 14:38:53 -07:00
Richard Alam
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
0f93ce4a38 - store the client url instead of joinviahtml5 info into user session. That 
way we can preserve the client url form the join and don't have to recreate
   in the guestWaitHandler
 2019-03-28 13:46:53 -07:00
Richard Alam
0d217447eb - check if guest user waiting for mod approval is joining via html5 2019-03-28 11:24:02 -07:00
Richard Alam
6774062ca2 - do not make moderators wait no matter what the guest policy is 2019-03-28 10:35:41 -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
81d7c117f7 - enable scalariform for bbb-common-web 2019-03-27 13:36:34 -07:00
Richard Alam
e9fa7d5d49 - a little bit of formatting and comment. 2019-03-27 08:20:54 -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
Ghazi Triki
48ca58ea3e Fix API variables formatting for meeting endTime and duration. 2019-03-25 13:41:14 +01:00
Richard Alam
42982482d8 - fix typo 2019-03-16 08:54:06 -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
Ghazi Triki
5a60f62b41 Copy dial number from the parent room to all breakout rooms. 2019-03-11 22:33:34 +01:00
Ghazi Triki
094ecd0e9f Generate text files in all cases. 2019-03-06 19:21:49 +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
Ghazi Triki
2412c94a9c Generate temporary files names using UUID instead of relying on the original file name. 2019-03-06 15:16:18 +01:00
Chad Pilkey
9a07f0abd2 fixed mapping of inactivity values 2019-02-25 12:48:46 -08:00
Richard Alam
0120a7a114
Merge pull request #6750 from ritzalam/retry-callbacks 
- retry end meeting callback in 30ms, 1min, 2min, and 5min if failing
 2019-02-10 21:38:56 -05:00
Richard Alam
bd3fb3f9f7 - retry end meeting callback in 30ms, 1min, 2min, and 5min if failing 2019-02-10 10:37:01 -08:00
Richard Alam
7185eae79b - make easy to collect data from logs 2019-02-09 19:09:32 -08: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
Richard Alam
3e286f1ed6
Merge pull request #6473 from zhu/patch-3 
Fix convert jpg with orientation metadata
 2019-02-09 12:03:03 -05:00
Pedro Beschorner Marin
a8237d8827 Fixed typo 2019-02-06 09:38:14 -02:00
Pedro Beschorner Marin
b5427737d7 Includes a minimal authentication step before SFU connections 2019-02-06 09:37:05 -02: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