272 Commits

Author	SHA1	Message	Date
Pedro Beschorner Marin	87435c515c	Merge remote-tracking branch 'master' into set-lock-settings-on-meeting-create	2019-04-12 13:58:58 -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	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
Pedro Beschorner Marin	5ecfbce82a	Information about the ended tag creation order	2019-01-24 19:13:22 -02: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	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	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	79ecdf56e8	BBB-web: add allowRequestsWithoutSession=false to handle stripped JSESSIONID	2019-01-08 19:54:08 +00:00
zhu	b7c64cdc6d	Fix convert jpg with orientation metadata	2018-12-24 19:03:51 +08:00
Ghazi Triki	0bad0747be	Update scala, sbt and akka version to the latest.	2018-12-16 20:18:37 +01:00
Richard Alam	367a621ebf	Merge pull request #6360 from pedrobmarin/rebased-redis-recording ... Includes publish/unpublish/delete API calls as Redis events	2018-12-13 11:25:05 -05: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	9569704254	Exclude red5 dependencies from akka and web projects.	2018-12-10 20:32:08 +01:00
Pedro Beschorner Marin	948576887e	Includes publish/unpublish/delete API calls as Redis events	2018-12-10 10:14:02 -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
Pedro Beschorner Marin	d411cd78f4	Display recordings raw size and playbacks sizes at getRecordings API call	2018-12-07 10:54:42 -02:00
Ghazi Triki	114cba670f	Improved redis connection logging.	2018-12-06 21:35:51 +01:00
Ghazi Triki	fd959f9e14	Remove rediscala library and replace it by a lettuce implementation.	2018-12-05 20:21:06 +01:00
Tiago D J	7bc7804276	Update PdfToSwfSlidesGenerationService.java	2018-11-29 19:31:38 -02:00
Tiago D J	03cd3e42e7	Fixes presentation slide conversion timeout ... Fixes #6311	2018-11-29 15:49:14 -02:00
Ghazi Triki	5b8a9a0ace	Add password to redis scala classes.	2018-11-23 11:38:28 -02:00
Ghazi Triki	d8588da28a	Add support for redis password.	2018-11-22 16:02:55 -02:00