BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
24,369 Commits 13 Branches 260 Tags 1.1 GiB
7f051b2845
Commit Graph

506 Commits

Author SHA1 Message Date
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
Ghazi Triki
b6e8dfee95 Update RecordingController to work in the current version of grails. 2019-05-01 18:43:30 +01:00
Ghazi Triki
cd3edb4491 Read generated caption files description using getRecordingTextTracks API. 2019-04-22 20:30:00 +01: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
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
Pedro Beschorner Marin
b5427737d7 Includes a minimal authentication step before SFU connections 2019-02-06 09:37:05 -02: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
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
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
79ecdf56e8 BBB-web: add allowRequestsWithoutSession=false to handle stripped JSESSIONID 2019-01-08 19:54:08 +00:00
Chad Pilkey
0fe8e3a38a
Lock enter and stuns to valid session+token 2018-11-22 14:39:25 -05:00
Ghazi Triki
a52e907593 Fix API calls. 2018-11-02 20:57:54 +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
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
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
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
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
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
a9b88182d8 change bbb-web to allow join without requesting config.xml 2018-08-24 17:15:47 -03:00
Anton Georgiev
78847f89ad attempt to pull 2.0 into 2.2 2018-07-31 16:18:23 +00:00
Anton Georgiev
b4b4f32929 pass key->value pairs in "customdata" array 2018-07-24 22:34:53 +00: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