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
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
a9b88182d8
change bbb-web to allow join without requesting config.xml
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
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
Anton Georgiev
a6c693c93d
add clientType in User and show it in api getMeeting*
2018-06-22 19:19:46 +00:00
Richard Alam
fc3605f301
- merging latest v20-release branch
2018-06-21 07:38:19 -07:00
Richard Alam
788ca15440
Implement end meeting callback url
...
To use, add meta_endcallbackurl parameter on the create api call.
2018-06-20 13:13:44 -07:00
Richard Alam
83ac942452
Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into 21-and-20-merge-working-branch
2018-06-08 17:23:49 -07:00
Richard Alam
5df4bef903
- toggle presentation downloads
2018-06-07 12:13:00 -07:00
Richard Alam
a2eaa9babd
Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into 21-and-20-merge-working-branch
...
- some conflicts have been fixed.
The following needs working on:
both modified: ../bigbluebutton-client/src/org/bigbluebutton/modules/chat/services/ChatCopy.as
both modified: ../bigbluebutton-client/src/org/bigbluebutton/modules/chat/services/ChatSaver.as
both modified: ../bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatTab.mxml
both modified: ../bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatWindowEventHandler.as
both modified: ../bigbluebutton-client/src/org/bigbluebutton/modules/users/services/MessageReceiver.as
both modified: ../bigbluebutton-client/src/org/bigbluebutton/modules/users/services/MessageSender.as
both modified: ../bigbluebutton-client/src/org/bigbluebutton/modules/users/views/MediaItemRenderer.mxml
Parking as need to work on something else.
2018-06-06 08:23:13 -07:00
Richard Alam
bd9414e3a9
Merge branch 'v2.0.x-release' of github.com:bigbluebutton/bigbluebutton into upload-vtt
2018-05-31 11:22:06 -07:00
Richard Alam
2bb3b59b1b
- handle put track api request
2018-05-29 07:19:19 -07:00
Richard Alam
2d175cda62
- handle get text tracks call
2018-05-28 07:17:55 -07:00
Richard Alam
3e78309877
- handle get text tracks api call
2018-05-25 12:52:16 -07:00
Richard Alam
4c673d83a9
- setup caption endpoint
2018-05-24 14:33:56 -07:00
Anton Georgiev
e4a6f31abc
revert special api changes made for html5 client
2018-05-24 18:42:59 +00:00
Richard Alam
0361f1c5db
- add some kind of check to uploaded file
...
NOTE: This doesn't fix issue with uploading file with FF 60 on Windows 10.
2018-05-19 10:01:22 -07:00
Richard Alam
b352ee2c95
- change log timestamp format so they are all the same
2018-05-15 10:50:40 -07:00
Ghazi Triki
54ae79d533
Add new feature to breakout rooms that allows to freely join them.
2018-05-07 16:03:53 +01:00
Richard Alam
384df10746
- generate png files for uploaded presentation
2018-04-10 13:06:08 -07:00
Richard Alam
e981a874c3
- query for guest wait status
2018-02-26 10:51:02 -08:00
Richard Alam
2bb1f23da5
- fix exception when redirect=false and guest has to wait for approval
2018-02-23 15:06:24 -08:00
prlanzarin
750d537618
Updated bbb-web apiVersion to 2.0
2018-02-09 03:22:11 +00:00
Ghazi Triki
a2feb9bf5b
Merge remote-tracking branch 'bigbluebutton/v2.0.x-release' into master-merge-2.0
...
# Conflicts:
# akka-bbb-apps/src/main/scala/org/bigbluebutton/core/domain/MeetingStatus.scala
# akka-bbb-apps/src/main/scala/org/bigbluebutton/core/running/MeetingActor.scala
# bbb-common-web/src/main/scala/org/bigbluebutton/api2/BbbWebApiGWApp.scala
# bigbluebutton-client/branding/default/style/css/V2Theme.css
# bigbluebutton-client/branding/default/style/css/assets/swf/v2_skin.fla
# bigbluebutton-client/branding/default/style/css/assets/swf/v2_skin.swf
# bigbluebutton-client/locale/en_US/bbbResources.properties
# bigbluebutton-client/src/org/bigbluebutton/main/model/users/JoinService.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/MainToolbar.mxml
# bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/AddChatTabBox.mxml
# bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatMessageRenderer.mxml
# bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatWindowEventHandler.as
# bigbluebutton-client/src/org/bigbluebutton/modules/users/services/MessageReceiver.as
# bigbluebutton-client/src/org/bigbluebutton/modules/users/views/MediaItemRenderer.mxml
# bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/maps/VideoEventMap.mxml
# bigbluebutton-html5/private/config/development/server/log.yaml
2018-01-23 12:27:42 +01:00
Ghazi Triki
8f47e7b7de
Remove webcamsOnlyForModerator from enter API response.
2018-01-09 18:14:58 +01:00
Richard Alam
7637cedd4b
Merge branch 'v2.0.x-release' of github.com:bigbluebutton/bigbluebutton into synch-with-v2.0
2017-12-21 12:48:20 -08:00
Richard Alam
78afb91562
- implement muteOnstart by passing on create API or using bigbluebutton.properties in bbb-web instead of setting it in config.xml
2017-12-21 10:40:44 -08:00
Richard Alam
d09abe92e4
- allow to pass custom copyright text using create API
2017-12-20 14:28:01 -08:00
Richard Alam
f5502a1a2a
- allow passing of custom param (logo) to override default logo
2017-12-20 11:06:00 -08:00
Richard Alam
8223a08029
- hardcode logoutTimer to zero as we don't use this feature in the release
...
- substitute keyworks in moderatorOnlyMessage
2017-12-18 12:52:33 -08:00
Ghazi Triki
aa91cf6562
Code quality improve for bbb-common-web project.
2017-12-18 20:54:18 +01:00
Richard Alam
beed7a1058
- make client logout timer configurable in bigbluebutton.properties
2017-12-15 14:59:00 -08:00
Richard Alam
715a0177fd
Merge branch 'v2.0.x-release' of github.com:bigbluebutton/bigbluebutton into synch-with-v2.0
2017-12-08 11:26:09 -08:00
Anton Georgiev
446f539e89
add bool join parameter joinViaHtml5 -- to prefer html5 over flash client
2017-12-04 15:29:25 -05:00
Anton Georgiev
d6e8396407
add configuration to join via html5 for attendee or mod
2017-11-30 15:19:03 -05:00
Richard Alam
5bf8258074
- make max file uploaded presentation
2017-11-27 14:03:50 -08:00
Richard Alam
9329e9316b
- determine guest status properly for moderators
2017-11-15 12:39:06 -08:00
Richard Alam
3056622283
- setup polling of guest while waiting for approval from moderator
2017-10-31 12:50:54 -07:00
Richard Alam
0036b5734d
- create guest lobby html page
2017-10-30 14:21:09 -07:00
Richard Alam
9f28f240a5
- hardcode default presentation window for pre-uploaded presentations and for creation of breakout rooms
2017-10-30 13:05:06 -07:00
Fred Dixon
f72fe51c1c
Update bigbluebutton.properties
...
Reverted serverURL to previous value
2017-10-29 11:15:34 -04:00
Fred Dixon
ec87a575f7
Update bigbluebutton.properties
...
Revert serverURL to previous value
2017-10-29 11:12:25 -04:00
Anton Georgiev
ff1aac2698
hardcode podId for first pod (for default.pdf)
2017-10-24 16:54:55 -04:00
Richard Alam
f0cbfcaf1d
Merge branch 'upgrade-to-red5-oct-10-2017' into upgrade-master-to-latest-red5
2017-10-11 05:31:51 -07:00
Anton Georgiev
9cdf0897c3
welcome msg - drop location of phone icon from msg
2017-10-05 16:46:28 -04:00
Richard Alam
3a9c4bb8ff
Merge branch 'implement-multi-chat' into riadvice-information-bar
2017-10-03 14:05:34 -07:00
Richard Alam
a3e37dffa5
Merge branch 'information-bar' of https://github.com/riadvice/bigbluebutton
2017-10-03 14:04:12 -07:00
Richard Alam
6ce535b0d2
- change default policy to always accept
2017-10-03 14:03:16 -07:00
Ghazi Triki
e96d6ae726
Add new API options to display a banner in the client.
2017-10-03 21:49:06 +01:00
Anton Georgiev
d521b19623
Merge branch 'implement-multi-chat' of github.com:ritzalam/bigbluebutton into pods_vol3
2017-10-03 11:13:48 -04:00
Anton Georgiev
23dadc5477
work on separating pods - client/conversion/apps
2017-09-29 18:20:33 -04:00
Richard Alam
fe44a79298
- send guest waiting message to client
2017-09-27 12:48:30 -07:00
Richard Alam
84cfda3459
Merge branch 'bbb-2x-mconf' of github.com:bigbluebutton/bigbluebutton into implement-guest-policy
2017-09-27 11:32:13 -07:00
Richard Alam
9d9df0eee0
- lower timeout timer for validation
...
- change location of preschecker
2017-09-26 14:07:51 -07:00
Richard Alam
a124b2d0e8
- call presentation checker from bbb-web
2017-09-26 12:23:39 -07:00
Richard Alam
4804d69a62
- reject user on enter api if guest has been denied
2017-09-25 14:29:02 -07:00
Richard Alam
e062e42cd0
- implement redirect of client to guest waiting
2017-09-25 14:12:54 -07:00
Richard Alam
df255c154b
- init guest status when joining
2017-09-22 14:53:37 -07:00
Richard Alam
4717a53182
- start implementing guest policy
2017-09-22 14:24:08 -07:00
Ghazi Triki
9b997392f0
Added new logoutTImer feature.
2017-09-21 20:12:59 +01:00
Anton Georgiev
20fe6c0d46
cleanup
2017-09-18 14:38:03 -04:00
Anton Georgiev
871498dd0d
Split POST upload request into two stages at nginx
...
Subrequest goes to different endpoint on bbb-web to ensure
that the content length (passed in header) is taken under
consideration prior to uploading file
2017-09-18 14:25:00 -04:00
Anton Georgiev
f8087e0af3
store, check, exprire upload authz tokens in bbb-web
2017-09-13 10:39:28 -04:00
Richard Alam
b14b04576d
- publish/unpublish recording
...
- get recordings
2017-09-03 13:44:43 -07:00
Richard Alam
cdb39d469e
- process get recordings api call
2017-09-03 10:52:18 -07:00
Richard Alam
e8127fdb61
- do not include recordings with bad metadata.xml in the response for recording api calls
2017-08-31 08:06:15 -07:00
Fred Dixon
c7f2459331
Merge pull request #4297 from bigbluebutton/ffdixon-patch-4
...
Update bigbluebutton.properties
2017-08-22 17:58:43 -04:00
Fred Dixon
889161a783
Update bigbluebutton.properties
...
Change wording of headset icon to phone icon.
2017-08-22 17:57:47 -04:00
Richard Alam
34f66ea1e3
- oops forgot to commit oooffice wiring
2017-08-17 14:27:16 -07:00
Richard Alam
f2a42bf791
Merge pull request #3929 from riadvice/document-conversion
...
Update document conversion threshold values with lower values
2017-08-11 11:20:29 -04:00
Richard Alam
3fe435668d
- set also the status response
2017-08-08 14:06:53 -07:00
Richard Alam
fae9dfdf14
- return the following response when api service is unavailable.
...
<response>
<returncode>503</returncode>
<reason>API Service Unavailable</reason>
</response>
2017-08-08 13:50:08 -07:00
Richard Alam
3b44d0eac2
- fix issue where late joiners displays the wrong slide
2017-08-01 14:50:44 -07:00
Anton Georgiev
3d75d9cac3
Merge pull request #4091 from JaeeunCho/changed_stunturn_api
...
bbb_web - modified stun/turn api
2017-07-17 15:54:10 -04:00
Richard Alam
bf1031374a
- pass timeout expire when last user leaves from bbb-web to akka-apps
2017-07-16 08:11:48 -07:00
Richard Alam
0f39d99ce5
- implement meeting expiry
2017-07-15 19:10:04 -07:00
Richard Alam
a0467f319c
Merge branch 'bbb-2x-mconf' into work-on-meeting-lifcycle
2017-07-15 09:30:02 -07:00
JaeeunCho
0a73c4ec40
bbb_web - modified stun/turn api
2017-07-14 09:13:09 -07:00
Richard Alam
269d00791b
- change DESKSHARE to SCREENSHARE
2017-07-12 07:43:44 -07:00
Richard Alam
f1bfac77f4
- put back to http and ip for values in bbb.properties
2017-07-11 17:29:09 -07:00
Richard Alam
b04519ef0f
FreeSWITCH webrtc screenshare
...
- use webrtc screenshare using FS Verto
- publish screenshare as rtmp to red5
- flash clients view screenshare from red5 rtmp
Fix mute/unmute/talking of user in voice conference
2017-07-11 13:31:56 -07:00
Richard Alam
8ca0d6c9fe
- wire up new message path
2017-07-03 07:44:13 -07:00
Richard Alam
d0343b40d2
- delay processing of pre-uploaded presentation to make sure that meeting has been created before
...
presentation conversion has completed.
2017-06-19 13:04:07 -07:00
Richard Alam
c0cc7138b3
- add new user joined voice event message
2017-06-12 11:39:53 -07:00
Richard Alam
6f8f821beb
Merge pull request #3983 from antobinary/2.0
...
Drop requirement for session[sessionToken]Send sessionToken in enterAPI redirect=false
2017-06-05 18:37:51 -04:00
Richard Alam
561c5d88e5
- add instructions on how to convert old message to new message
2017-06-05 07:36:55 -07:00
Anton Georgiev
e59f5ac3ff
drop requirement for session[sessionToken]; send sessionToken in enterAPI redirect=false
2017-06-02 13:54:13 -04:00
Richard Alam
5fed6779d4
- enable logging of akka system in bbb-web
2017-06-02 09:35:24 -07:00
Richard Alam
e56a758c5f
- send create message from bbb-web
2017-05-24 15:19:03 -07:00
Ghazi Triki
a5482b506d
Revert text object conversion threshold to 2000
2017-05-22 10:27:11 +02:00
Richard Alam
82371a41de
- try to start system
2017-05-19 19:27:09 -07:00
Richard Alam
6b14d31853
- wire up bbb-web
2017-05-19 19:13:25 -07:00
Ghazi Triki
f5366fbc88
Update document conversion threshold values with lower values.
2017-05-11 17:03:24 +01:00
Richard Alam
b55beeb8fa
- wire up redis publisher
2017-05-10 14:37:14 -07:00
Richard Alam
76a6d99ca3
- move java classes from bbb-web into bbb-common-web
2017-05-10 13:22:50 -07:00
Pedro Beschorner Marin
66a12c9c7a
Moving the meeting life cycle management from bbb-web to akka-apps
2017-05-03 17:02:16 +00:00
Richard Alam
61d7b18345
- remove reconnect number in userId
2017-04-28 14:21:59 -07:00
Richard Alam
e89c832c8a
Merge branch 'master' into bbb-2x-mconf
2017-04-25 07:40:30 -07:00
Richard Alam
69ba485fcc
Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into bbb-2x-mconf
2017-04-21 08:12:56 -07:00
Ghazi Triki
8142031afe
Faster PDF pages counting by replacing "pdf2swf" command with "pdfinfo".
2017-04-20 18:02:31 +01:00
Ghazi Triki
3ff28e3e9d
Rename GhostscriptPageExtractor to PageExtractorImp.
2017-04-19 19:10:14 +01:00
Ghazi Triki
466c931b92
Remove usage of GhostScript and replace it by pdftocairo and pdfseparate.
2017-04-19 16:30:46 +01:00
Richard Alam
a9590976c2
- allow setting default guest policy for meeting
2017-04-18 19:45:32 +00:00
Richard Alam
b8de0c9231
- add authorized role to registered user
2017-04-17 21:23:17 +00:00
Ghazi Triki
a2644c430c
Improve the document conversion fallback logic by merging the pdf page extraction and image conversion using 'convert' to a single step page to image conversion using 'gs'. Anti-aliasing for text and shapes is also improved.
2017-04-13 18:29:33 +01:00
Pedro Beschorner Marin
f59e42bb02
Merge remote-tracking branch 'bigbluebutton/master' into merging-into-bbb-1.1
2017-04-04 20:42:15 +00:00
Pedro Beschorner Marin
84fd8d4101
Branding back to BigBlueButton and adding back some of the client images we removed. This need to be reviewed to avoid having all this unused images!
2017-04-03 17:06:16 +00:00
Pedro Beschorner Marin
49855b4c80
Removed some callback API methods from bigbluebutton web that were missed on merge
2017-03-31 12:18:33 +00:00
Richard Alam
8122f984ea
- convert "success" to upper case to match previous API. Maybe users are matching with uppercase.
2017-03-28 21:04:52 +00:00
Pedro Beschorner Marin
0ab207c997
Merge remote-tracking branch 'mconf/mconf'
2017-03-21 19:47:11 +00:00
Pedro Beschorner Marin
c74cc682c4
Merge remote-tracking branch 'mconf/mconf'
2017-03-20 19:45:59 +00:00
Richard Alam
058a4044d6
- publish/unpublish recording
2017-03-15 14:29:10 +00:00
Richard Alam
72c42f9d70
- build get recordings api response
2017-03-13 21:43:39 +00:00
Felipe Cecagno
21170265e2
implement the ability to add artificial remote ICE candidates to the SDP, so we can better handle servers behind NAT (and other situations); extend the /api/stun call in order to retrieve the list of remote ICE candidates from a XML file
2017-03-12 21:45:08 -03:00
Richard Alam
adffa8d673
- build getMeetings and getMeetingInfo responses using freemarker
2017-03-09 20:32:14 +00:00
Richard Alam
217b70bce2
Merge pull request #3711 from ritzalam/synchronize-create-meeting
...
Synchronize create meeting
2017-03-07 13:41:11 -05:00
Richard Alam
1a2bd4d74d
- add delay to processing of presentation to make sure that meeting has already been
...
created. This makes sure that the meeting is able to handle the presentation
processing events.
2017-03-06 20:05:26 +00:00
Fred Dixon
c28c78a405
Minor updates for release -- bumped the API version
2017-03-06 13:57:54 -06:00
Richard Alam
3ec0167812
- synchronize create meeting to prevent race condition where 2 meetings
...
with different voice bridge gets created.
2017-03-06 19:20:23 +00:00
Richard Alam
19f29e8bec
Merge pull request #3616 from riadvice/detect-heavy-to-convert-pptx
...
Avoid converting some pptx files with certain properties and inform the user.
2017-02-06 13:22:39 -05:00
Ghazi Triki
dfbf8c8c0a
Avoid converting some pptx files with certain properties and inform the user.
2017-01-30 19:50:10 +01:00
Pedro Beschorner Marin
32cab1bcab
Escaping Java's properties file instructions
2017-01-27 12:58:45 +00:00
Ghazi Triki
4c4d768883
Added new "webcamsOnlyForModerator" parameter for create meeting API.
2017-01-02 16:56:32 +01:00
Fred Dixon
21b953bc7c
Removed carriage returns from bigbluebutton.properties
2016-11-28 17:21:36 -06:00
Richard Alam
fa16d266b9
- add more logging to track issues
2016-11-10 22:35:06 +00:00
Ghazi Triki
1c45633028
Lower SWF conversion threshold from 2500 to 2000 for text objects.
2016-10-26 14:36:27 +01:00
Richard Alam
662218a96f
- getmeetinginfo is throwing exception
2016-10-25 20:47:04 +00:00
Ghazi Triki
e187634c2a
Using blank-presentation.pdf as default breakout room presentation when no current presentation is set to the parent room.
2016-10-14 16:33:17 +01:00