26382 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Anton Georgiev	722ffa5d07	disable private chat initiation in breakouts	2020-04-30 17:50:34 -04:00
Anton Georgiev	63f7da5241	include Meteor connection ID in logs	2020-04-30 16:40:45 -04:00
Anton Georgiev	117d172b0d	Merge pull request #9343 from KDSBrowne/2.2-update-hideOverlay-css ... Fix media overlay blocking whiteboard when drawing	2020-04-29 16:41:07 -04:00
KDSBrowne	174660a27c	fully hide media ovelay / fix whiteboard drawing with no cams	2020-04-29 20:23:29 +00:00
Anton Georgiev	06f6331433	Merge pull request #8725 from capilkey/fix-typing-indicator-spacing ... Fix the spacing in the typing indicator	2020-04-29 12:48:08 -04:00
Anton Georgiev	c5f3109b74	Merge pull request #9341 from KDSBrowne/issue-9337 ... Add logger and upload failure error messages	2020-04-29 12:46:40 -04:00
KDSBrowne	9d9528798f	Add client logger and error code messages	2020-04-29 16:34:37 +00:00
Anton Georgiev	1548f5785a	Merge pull request #9340 from pedrobmarin/upstream-fix-note-id ... Fix note id length	2020-04-29 12:28:14 -04:00
Pedro Beschorner Marin	d97f413ef6	Fix note id	2020-04-29 13:08:10 -03:00
Fred Dixon	d8cb8573e3	Merge pull request #9336 from bigbluebutton/bump-2.2.8 ... Update bigbluebutton-release to 2.2.8	2020-04-29 09:16:07 -04:00
Fred Dixon	429eb61047	Update bigbluebutton-release	2020-04-29 09:15:49 -04:00
Anton Georgiev	df35c6f7f7	Merge pull request #9334 from antobinary/recover-presentation-token-denied ... Switch setPresenterInPodReqMsg to in-file function, not method	2020-04-29 08:39:08 -04:00
Anton Georgiev	dc0c2f7b21	switch setPresenterInPodReqMsg to in-file function, not method	2020-04-29 08:00:32 -04:00
Richard Alam	d99d780d68	Merge pull request #9311 from ritzalam/insert-dash-in-conf-num ... Format conference numbers	2020-04-29 06:34:43 -04:00
Tiago D J	8f6e87b5ab	Merge pull request #9315 from jfsiebel/enforce-extract-credentials ... Enforce extractCredentials	2020-04-29 01:46:24 -03:00
Joao Siebel	7eb935f244	Enforce extractCredentials	2020-04-29 01:41:16 -03:00
Fred Dixon	d40beef9f3	Merge pull request #9314 from bigbluebutton/Bump-release-to-2.2.7 ... Update bigbluebutton-release	2020-04-28 23:50:20 -04:00
Fred Dixon	4ac33f09bc	Update bigbluebutton-release	2020-04-28 23:49:59 -04:00
Fred Dixon	f1c41d5d43	Merge pull request #9313 from tdjac0bs/validate_auth_token_refactor ... Refactor connection definition of userId to wait for validateAuthToken	2020-04-28 23:37:28 -04:00
Tiago Jacobs	4bfd924c64	Refactor connection definition of userId to wait for validateAuthToken	2020-04-29 00:33:45 -03:00
Tiago D J	d06d0f8aa4	Merge pull request #9312 from ritzalam/remove-disconnect-on-auth-failed ... Do not send disconnect message	2020-04-28 23:31:39 -03:00
Richard Alam	292f673f5e	Do not send disconnect message ... Do not send disconnect message when validate token fails as meteor will disconnect the client itself.	2020-04-28 19:29:21 -07:00
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
Anton Georgiev	1a2d0ae11b	Merge pull request #9081 from ubahnverleih/shortcut-help-osx ... fixes shortcut help on mac browsers	2020-04-28 09:30:25 -04:00
Anton Georgiev	be1a7ad2be	Merge pull request #9298 from KDSBrowne/2.2-fix-chat-lock ... Improving on chat lock settings	2020-04-28 09:29:34 -04:00
KDSBrowne	7dcdfb1913	fix private chat lock not applying to already opened chats	2020-04-28 13:24:44 +00:00
Anton Georgiev	a0e02932c6	Merge pull request #9289 from KDSBrowne/issue-9287 ... Fix exception in presentation when minimized and poll published	2020-04-27 13:57:04 -04:00
KDSBrowne	de7e2780c7	Fix exception in presentation when publishing poll while minimized	2020-04-27 17:25:22 +00:00
Anton Georgiev	a65e00bcc8	Merge pull request #9284 from pedrobmarin/notes-events ... Included Etherpad's data as events to be stored	2020-04-27 10:30:18 -04:00
Pedro Beschorner Marin	beda54fb09	Included Etherpad's data as events to be stored	2020-04-27 10:48:52 -03:00
Richard Alam	db26d517a0	Merge pull request #9259 from riadvice/fix-file-download ... Return 404 error when the file download is not allowed.	2020-04-25 12:56:31 -04:00
Ghazi Triki	b21ca8355a	Return 404 error when the file download is not allowed.	2020-04-25 19:51:17 +03:00
Richard Alam	ddb1b19887	Merge pull request #9245 from ritzalam/make-bbb-web-localhost ... Bind to localhost	2020-04-24 18:07:46 -04:00
Richard Alam	e805e7a3d2	Bind to localhost ... Made a mistake of defining param twice	2020-04-24 15:05:17 -07:00
Richard Alam	7be4718b7f	Merge pull request #9244 from ritzalam/make-bbb-web-localhost ... Bind to localhost	2020-04-24 17:30:58 -04:00
Richard Alam	b30a8093d1	Bind to localhost ... Make bbb-web bind to localhost	2020-04-24 14:29:36 -07:00
Richard Alam	a63f7df4bb	Merge pull request #9241 from ritzalam/increase-length-of-voice-conf ... Increase voice conf length	2020-04-24 12:40:48 -04:00
Richard Alam	ac78fd5913	- revert back value for wsUrl	2020-04-24 09:39:21 -07:00
Richard Alam	e968780e53	- comment out printlns	2020-04-24 09:37:25 -07:00
Richard Alam	79096d0c55	Increase voice conf length ... We need to increase the length of the voice conference. If we have lots of meetings running, there is a high chance of collision. Need corresponding changes to FreeSWITCH dialplan. In bbb_echo_test.xml, change to `expression="^echo(\d{5,11})$"`. In bbb_conference.xml, change to `expression="^(\d{5,11})$"`.	2020-04-24 09:22:46 -07:00
Richard Alam	d678b2a8cf	Merge pull request #9236 from ritzalam/do-not-ban-when-ejecting-self ... Do not ban users ejecting self from meeting	2020-04-24 10:22:15 -04:00
Richard Alam	309ac30899	- comment out debug printlns	2020-04-24 07:20:42 -07:00
Richard Alam	58fed45754	Do not ban users ejecting self from meeting ... Some users join with multiple browsers. When user is ejecting self from one browser, do not eject all sessions for that user and do not prevent them from rejoining.	2020-04-24 07:14:50 -07:00
Richard Alam	43d9c3da98	Merge pull request #9230 from ritzalam/track-ejected-dialin-users ... Keep track of banned dial-in callers	2020-04-24 09:44:53 -04:00
Richard Alam	cca49e4546	Keep track of banned dial-in callers ... When a dial-in caller is ejected from the meeting, keep track of the callerid number. When the same callerid number rejoins the conference, eject the caller.	2020-04-23 19:12:16 -07:00
Anton Georgiev	b4f5d00f29	Merge pull request #9218 from antobinary/2020-04-23-locales ... Pulled HTML5 locales April 23, 2020; Added Norwegian	2020-04-23 10:22:48 -04:00
Anton Georgiev	89fb118d00	Pulled HTML5 locales April 23, 2020; Added Norwegian	2020-04-23 10:17:43 -04:00
Richard Alam	a6185e359c	Merge pull request #9188 from ritzalam/track-ejected-user ... Prevent ejected users from rejoining	2020-04-22 09:19:56 -04:00
Richard Alam	c40f1727d3	Prevent ejected users from rejoining ... - track ejected user based on external userid. If user rejoins with the same external userid, fail the validate token.	2020-04-21 19:26:09 -07:00
Fred Dixon	f6f4f8321b	Merge pull request #9102 from miztaka/catalyst-fix-pentest-download ... Set content-type for presentation download	2020-04-18 17:47:47 -04:00