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
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