Commit Graph

1432 Commits

Author SHA1 Message Date
Richard Alam
67ca66c842
Merge pull request #7565 from pedrobmarin/401-guest-false
Avoid checking for authentication
2019-06-14 11:03:53 -04:00
Richard Alam
e3dee6d7a2 - turn on svg generation by default while swf is turned off by default 2019-06-07 13:37:24 -07: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
6e7ece7a9f - minor cleanup 2019-06-06 15:16:43 -07:00
Richard Alam
a46d0b9680 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into captions-text-tracks-intermediate-branch 2019-06-06 15:04:53 -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
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
Pedro Beschorner Marin
a32037baa3 Avoid checking for authentication 2019-06-03 18:06:11 -03:00
Richard Alam
8db3903942 - add checksum check on put recordings text track api 2019-06-03 12:59:37 -07:00
Richard Alam
08f0c2b4e7 - make changes to align closer to spec document 2019-06-03 11:59:20 -07:00
Fred Dixon
63c36cb5d3
Set bigbluebutton.web.serverURL to http by default 2019-06-02 21:30:29 -04: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
Ghazi Triki
05cc75eabf Validate kind in putRecordingTextTrack. 2019-05-21 17:58:31 +03:00
Ghazi Triki
6667360cfe Validate locale in putRecordingTextTrack. 2019-05-21 17:41:09 +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
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
Ghazi Triki
1974f903ea Fix downloaded file encoding. 2019-05-09 17:35:10 +01: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
Ghazi Triki
b469f8c642 Update error format for Create API returns if none of the passwords parameters are provided. 2019-05-09 07:26:20 +01: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
0c46ef2ae6 Revert "Change RecordingController.groovy EOL" and delete unused import. 2019-05-07 18:32:07 +01:00
Ghazi Triki
7f051b2845 Change RecordingController.groovy EOL 2019-05-07 18:30:18 +01:00
Ghazi Triki
f1a83c4022 Update RecordingController.groovy indentation to two spaces instead of four. 2019-05-07 18:28:47 +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
b6e8dfee95 Update RecordingController to work in the current version of grails. 2019-05-01 18:43:30 +01:00
Ghazi Triki
eef047d4e3 Implement getRecordingTextTracks. 2019-05-01 16:14:10 +01:00
Richard Alam
bf7898225b - minor cleanup 2019-04-30 12:30:59 -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
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
86a10b6c77 - handle when forced to join html5 using bigbluebutton.properties and need to wait for approval 2019-03-28 11:41:32 -07:00
Richard Alam
cbd68df5ee - flag the user to join using html5 2019-03-28 11:27:47 -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
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
7d9adaee30 - return breakout rooms options on enter api 2019-03-26 12:15:10 -07:00
Richard Alam
a63f7dccc3 - allow passing of breakout and lock settings params on create API 2019-03-26 10:57:50 -07:00
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