Anton Georgiev
75e935d771
Merge pull request #11809 from gustavotrott/develop
...
Enhancements to presentation OfficeToPDF conversion
2021-03-30 12:27:25 -04:00
Gustavo Trott
58a05acce6
Implements max concurrent office2pdf conversions and set conversion timeout from config
2021-03-30 11:26:03 -03:00
Philipp Memmel
c3ff88cd78
config overlay for bbb-web turn server config
2021-03-30 11:57:37 +02:00
Pedro Beschorner Marin
beb694c74a
Improve guest lobby feedback
...
Included a message and a redirect for the cases where the guest is
not allowed to join or the meeting has expired/ended.
2021-03-29 22:17:59 -03:00
Gustavo Trott
e5a235efa5
Removes jodconverter configs that is not used anymore
2021-03-25 14:34:52 -03:00
Gustavo Trott
a69baba177
Removes jodconverter from project dependencies
2021-03-24 15:00:05 -03:00
Gustavo Trott
e9d5eca664
Replaces the presentation Office to Pdf converter using shellScript instead of jodconverter
2021-03-22 15:32:22 -03:00
Anton Georgiev
6c7da44940
replaced keepEvents with defaultKeepEvents and meetingKeepEvents
2021-03-18 02:31:47 +00:00
Pedro Beschorner Marin
0365018e92
Add guest lobby messages
...
Moderators are able to send a message to the meeting's guest lobby. This new
event reaches bbb-web and is sent to the guest user with her/his status response
while polling. All guest users that are waiting for acceptance will be able to
read this message.
enableGuestLobbyMessage is disabled by default.
2021-03-09 11:02:25 -03:00
Anton Georgiev
f814d5f8cd
Merge pull request #11470 from schrd/grails-config
...
add overlay config for bbb-web
2021-03-05 16:53:57 -05:00
Anton Georgiev
228bad03d5
Merge branch 'v2.2.x-release' of github.com:bigbluebutton/bigbluebutton into march4-merge
2021-03-04 21:25:47 +00:00
Anton Georgiev
eba2d0ab58
Merge pull request #11535 from pedrobmarin/etherpad-patch
...
Rework padIds and turn bbb-web pad aware
2021-03-02 14:48:34 -05:00
Daniel Schreiber
e6f83df3f6
add overlay config for bbb-web
...
operators can define their own config for bbb-web which will not be
overwritten by packages.
bbb-conf is changed accordingly to write configuration values to
``/etc/bigbluebutton/bbb-web.properties`
2021-02-25 14:08:05 +01:00
Anton Georgiev
55e8de4357
Merge branch 'v2.2.x-release' of github.com:bigbluebutton/bigbluebutton into feb18-merge
2021-02-18 20:33:19 +00:00
Anton Georgiev
f43560d535
Support for backend vs frontend nodejs instances bbb-html5
2021-02-16 03:19:31 +00:00
Pedro Beschorner Marin
09b39a8d63
Add extra pad validation
...
Associate pads with meetings so session validation is restricted to the
meeting's valid session tokens.
Meteor will dispatch new redis events on shared notes and closed captions
pads creation. This event will go through apps and reach web to populate
a new meeting's pad collection that contains all valid pad id's for that
session. Nginx will use this collection to check if the user's session token
belongs to the pad's authorized users.
Besides these modifications, an extra change will be needed at notes.nginx.
Location /pad/p/ needs to change it's auth_request:
from /bigbluebutton/connection/checkAuthorization;
to /bigbluebutton/connection/validatePad;
2021-02-10 13:37:04 -03:00
Ghazi Triki
5f683809cd
Make sure checksum validation is done first in join API and display an error without redirection in failure case.
2021-02-09 19:03:54 +01:00
Anton Georgiev
363c801338
Merge pull request #11215 from pedrobmarin/guest-draft
...
Disable authenticated guests
2021-02-05 16:13:46 -05:00
Jacob Burroughs
f4ecf4c7ed
Restore allowRequestsWithoutSession to resources.xml
...
Otherwise that property is not read from the bigbluebutton.properties file.
It was removed in an overzealous deletion in
418fdb1a31
2021-02-01 09:43:50 -06:00
Pedro Beschorner Marin
e595d31f80
Set default guest configuration
...
Changes to the current (v2.2) default configuration of the guest feature.
The ideal is to keep the simplified guest feature as default (`authenticatedGuests=false`)
but we also need to be in sync with Greenlight settings to make this happen.
Greenlight will have to re-add the `guest=true` param on user's join API call when ASK_MODERATOR
is set as guest's policy.
2021-01-23 21:58:34 -03:00
Pedro Beschorner Marin
0bbef12ac7
Authenticated guests feature controlled at bbb-web properties
2021-01-23 21:48:02 -03:00
Anton Georgiev
3135c6bb22
Handle guestWait url for multiple nodejs instanceIds
2021-01-05 15:38:21 +00:00
Anton Georgiev
55fe528e35
Change bigbluebutton.properties client url param
2020-12-16 15:49:20 +00:00
Anton Georgiev
8b65f9e15b
Set bbb-html5 loadbalancing to be round robin
2020-12-15 01:55:57 +00:00
Anton Georgiev
0be8773e4c
Loadbalance bbb-html5 in bbb-web based on CPU
2020-12-11 21:36:06 +00:00
Anton Georgiev
418fdb1a31
remove obsolete attendeesJoinViaHTML5Client moderatorsJoinViaHTML5Client
2020-12-09 19:11:50 +00:00
basisbit
34ad640ea7
Fix voice bridge compare
...
Cherry-picked https://github.com/bigbluebutton/bigbluebutton/pull/9855
Co-Authored-By: Pedro Beschorner Marin <pedrobmarin@gmail.com>
2020-12-09 14:55:47 +01:00
basisbit
7ba6bd9f7a
Fix voiceBridge collision
...
Cherry-picked the commits from https://github.com/bigbluebutton/bigbluebutton/pull/9251
The added code checks if a meetingID is unique and makes sure no two meetings use the same VoiceBridge. Also see Issue # 9024
2020-12-09 13:58:26 +01:00
Anton Georgiev
3faabd1821
Merge 2.2.29 and 2.2.30 into 2.3.x
2020-11-24 15:13:09 +00:00
Anton Georgiev
23f2df11d5
code changes to allow for meetings' redis events to be processed on different html5 nodejs pids
2020-11-18 20:34:02 +00:00
Anton Georgiev
ecbf575dcf
Merge pull request #10819 from bigbluebutton/join-api-sanitize
...
Sanitize parameters of API's. Fixes #10818
2020-11-13 10:55:38 -05:00
Tiago Daniel Jacobs
e59bcd0c33
Sanitize all received parameters
2020-11-13 06:54:32 +00:00
Tiago Daniel Jacobs
52e3eea552
Split error message from session token ( making it easier to translate - and more secure/ )
2020-11-13 06:13:48 +00:00
Tiago Daniel Jacobs
5c911ddeec
Sanitize fullName parameter of join API. Fixes #10818
2020-11-13 05:59:31 +00:00
Your Name
b4ecf53c80
Remove unwanted debug logging: This pushed the whole binary of every PDF uploaded into the logs.
2020-11-08 16:56:26 +01:00
Fred Dixon
d0bc77c3db
Updating stun: for bbb-web to use Google's stun server
2020-10-23 11:26:41 -03:00
Fred Dixon
f0867bed76
Fix typo
2020-10-21 22:10:44 -05:00
Fred Dixon
3da71359f1
Updating stun: for bbb-web to use Google's stun server
2020-10-21 22:08:59 -05:00
Anton Georgiev
0c7ead1916
Merge branch 'v2.2.x-release' of github.com:bigbluebutton/bigbluebutton into oct16-merge
2020-10-21 14:48:02 +00:00
Pedro Beschorner Marin
2fb26ff0cf
Patch of improvements for bbb-web
...
This patch includes two improvements made for bbb-web. It tries to better isolate
the sessionToken's handling and session's validation, including logs for each one of
these steps; and removes maxParticipats control from registered users (that are no
longer removed from bbb-web collections) binding it to joined users or users that
reached the enter API call. The following adds more details about this last one:
User's regular flow to join a meeting goes around an API join call -> redis register event ->
redirect to client page -> API enter call -> redis join event. When the guest policy is ASK_MODERATOR,
non-moderators are registered and redirected to a guest lobby that polls for her/his guest status and
only enters the meeting after a moderator approval.
Using registered users as control to check how many participants are in a meeting is problematic because
non-approved guests are counted as participants and bbb-web has to find out when to ditch registered users
records to make a seat in a meeting available again. In other words, a meeting with maxParicipants
of 5 can get it's joins locked with a moderator and 4 waiting guests or bbb-web can wrongly drop a registered
user record on a reconnection inducing weird 401 responses from the API.
This change proposes to control maxParticipants both at join and enter API calls monitoring the number
of redis joined users. This also includes an extra buffer to capture users that called the enter API but
still don't have an user joined event.
User left events are now handled different holding the user data before removing from the joined users collection
and only releasing after verifying that the user didn't reconnected.
Both user left timeout `usersTimeout` and entered user timeout `enteredUsersTimeout` can be configured at properties.
2020-09-28 09:59:52 -03:00
Pedro Beschorner Marin
a98c4b68b5
Add secure tag to bbb-web JSESSIONID cookie
...
Revert this to make whatever you want when running bbb-web without https
2020-09-22 16:11:53 -03:00
Anton Georgiev
124b2d9b51
Merge branch 'develop' into move-guest-wait
2020-09-21 16:28:59 -04:00
Anton Georgiev
918f58b343
Moved the default avatar.png to be part of bigbluebutton-html5/
2020-09-21 12:24:12 +00:00
Anton Georgiev
d5450af5df
Merge pull request #10458 from pedrobmarin/avatar-image
...
Support for avatar images
2020-09-21 08:22:04 -04:00
Anton Georgiev
377dc27a8d
Merge branch 'v2.2.x-release' of github.com:bigbluebutton/bigbluebutton into 09-16-merge
2020-09-17 14:37:28 +00:00
Pedro Beschorner Marin
e2adf24546
Support for avatar images
...
Use the former Flash client avatarURL join param to replace the name
initials avatar from the user list, chat, waiting guests and connection
status list.
It is possible to define a defaultAvatarURL at bbb-web and enable/disable it
2020-09-15 16:50:10 -03:00
Richard Alam
9e6a40280e
- set html5 as default client
...
- add meetingEndedURL and endWhenNoModerator create param
- meetingEndedURL is complete
- endWhenNoModerator is partially implemented. Will be continued in another PR.
2020-09-05 08:43:12 -07:00
Anton Georgiev
14f464087f
Merge pull request #8417 from pedrobmarin/backend-cleanup
...
Backend cleanup
2020-08-28 15:37:00 -04:00
Anton Georgiev
5be5aed1d9
Merge branch 'v2.2.x-release' of github.com:bigbluebutton/bigbluebutton into merge-2020-08-12
2020-08-12 17:12:58 +00:00
Anton Georgiev
614e4dd68f
Remove event: from welcomeMessage link
...
Obsolete in html5 and also was breaking the message sanitizer
2020-07-29 17:24:08 -04:00
Anton Georgiev
0d6faa0b57
only allow for https uri in welcome and modOnly messages
2020-07-29 16:08:47 -04:00
Anton Georgiev
c6669d1d7a
Merge branch 'develop' into move-guest-wait
2020-07-28 13:50:04 -04:00
Tiago Jacobs
153c59307d
Improvements on bbb-libreoffice
2020-07-24 02:42:51 -03:00
Jesus Federico
56403c31a0
enable post_events by default by setting keepEvents=true ( #10097 )
2020-07-20 08:11:02 -04:00
Tainan Felipe
1c8677d7d8
Move guest wait from bbb-client to bbb-html
2020-07-02 17:14:49 -03:00
Pedro Beschorner Marin
de40885768
Define API's voice bridge error
2020-06-16 17:01:57 -03:00
Anton Georgiev
56e16d79a3
Merge pull request #9251 from elor/fix-voicebridge-collision
...
Fix voiceBridge collision (Issue #9024 )
2020-05-28 16:17:59 -04:00
Anton Georgiev
c9e996de21
Merge branch 'v2.2.x-release' of github.com:bigbluebutton/bigbluebutton into merge-2.2-into-develop
2020-05-25 17:32:24 +00:00
Anton Georgiev
201fa2902e
Only provide modOnlyMessage to moderators. Promoted mod requires refresh to see it
2020-05-20 15:56:44 -04:00
Anton Georgiev
cc79c4b6ae
merge 2.2.10 into 2.3
2020-05-05 19:52:44 +00:00
Richard Alam
f876ce01c2
Rework presentation download and upload
...
- verify presentation and meeting id formats
- construct presentation file path making sure that they are valid
- add "downloadable" flag to check if presentation can be downloaded or not
- collect presentation upload errors so we can send to the client in the future
2020-05-01 14:16:42 -07:00
Ghazi Triki
84ba925014
Improve the file download in the browser.
2020-04-30 15:41:06 +01:00
Anton Georgiev
4f786f7f03
Merge pull request #9257 from lkiesow/https-links
...
Switch To HTTPS Links
2020-04-27 13:58:25 -04:00
Ghazi Triki
b21ca8355a
Return 404 error when the file download is not allowed.
2020-04-25 19:51:17 +03:00
Lars Kiesow
6e6f9cbb51
Switch To HTTPS Links
...
This patch switches to HTTPS for the links configured for and displayed
in the client.
2020-04-25 18:28:53 +02:00
Erik E. Lorenz
868374516e
Check for existing voicebridge in ApiController
2020-04-25 09:35:29 +02:00
Erik E. Lorenz
bccf3664db
Guarantee unique meeting TelVoice (API create)
2020-04-25 08:51:37 +02:00
Mitsutaka Sato
79361bd485
Set content-type for presentation download, to prevent vulnerable files from being executed
2020-04-16 11:39:49 +12:00
Ghazi Triki
78c649650e
Strip HTML tags from name and fullName API params.
2020-04-03 20:00:33 +03:00
Anton Georgiev
8129468300
Merge branch 'v2.2.x-release' of github.com:bigbluebutton/bigbluebutton into merging
2020-03-04 23:36:21 +00:00
Richard Alam
251b3c20dd
- move location of presentation page blank files
2020-03-04 10:05:36 -08:00
Richard Alam
6c841ce772
- cleanup
2020-03-02 09:42:43 -08:00
Richard Alam
4f453c4026
- add option to skip office pre-check
2020-03-02 09:40:01 -08:00
Richard Alam
673cbb9cac
- downscale pdf page larger than 2MB
2020-03-01 08:24:20 -08:00
Anton Georgiev
3754d0ab6f
Merge branch 'v2.2.x-release' of github.com:bigbluebutton/bigbluebutton into merge-2.2-into-master-feb-28-2020
2020-02-28 17:47:06 -05:00
Richard Alam
c0372e3a97
Merge branch 'blank-presentation' of https://github.com/riadvice/bigbluebutton into riadvice-blank-presentation
2020-02-28 13:32:02 -08:00
Richard Alam
e2a4bf3bb2
Turn off png generation
...
Turn off png generation as we don't use it.
2020-02-27 16:57:13 -05:00
Richard Alam
859c6a2220
- clean up
...
- addjust timeouts
2020-02-27 13:37:42 -08:00
Richard Alam
3a5b990e4a
- turn off png generation
...
- setup number of processing threads
2020-02-27 13:30:55 -08:00
Richard Alam
5428e86448
- try to process multiple presentations in parallel
2020-02-26 14:36:04 -08:00
Richard Alam
f4a4b8be5d
- downscale large pdf page
2020-02-25 14:18:56 -08:00
Ghazi Triki
0c96050fde
Improvements to conversion default fall-back files and process.
2020-02-22 18:26:50 +01:00
Richard Alam
db4dc4aff0
- add urls on presentation page conversion message
2020-02-18 14:03:08 -08:00
Anton Georgiev
60e3e7986c
Merge pull request #8499 from pedrobmarin/waiting-guests-clean
...
Removes waiting guests that stop polling for their status
2020-01-29 17:40:19 -05:00
Pedro Beschorner Marin
397041efcc
Removes waiting guests that stop polling for their status
2020-01-15 12:03:52 -03:00
Pedro Beschorner Marin
ec7785ff22
Check for maxParticipants before registering an user
2019-12-18 16:12:30 -03:00
Pedro Beschorner Marin
b11113c165
Remove meeting inactivity monitor
2019-12-11 17:11:57 -03:00
Ghazi Triki
ba109530ae
Disallow converting PDF files that have at least one big weighted page.
2019-10-16 08:37:03 +01:00
Chad Pilkey
027c28c320
add lock setting option to hide viewers from each other
2019-08-09 16:45:26 -07:00
Pedro Beschorner Marin
517e252901
Fix on getting caption file content type
2019-07-17 18:47:31 +00:00
Fred Dixon
2bd95f7596
Set default URL to http for testing
2019-06-23 17:23:35 -05:00
Richard Alam
ff6c5e4d7c
Merge pull request #7639 from riadvice/html5-conversion-progress
...
Display SVG conversion progress
2019-06-17 12:35:17 -04:00
Ghazi Triki
2f571eab10
Display SVG conversion progress.
2019-06-17 18:49:25 +03:00
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
Fred Dixon
4e6da349d2
Update link for tutorial videos for HTML5
2019-03-22 15:05:50 -04: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
Pedro Beschorner Marin
b5427737d7
Includes a minimal authentication step before SFU connections
2019-02-06 09:37:05 -02:00
Richard Alam
f6b690b36c
- add max file upload limit
2019-01-25 12:11:18 -08: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
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
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
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
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
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
Ghazi Triki
5e002d845e
Store breakout room sequence in akka-apps and bbb-web.
2016-10-13 12:53:53 +01:00
Ghazi Triki
054037c6d6
Revert replacing the deprecated shaHex DigestUtils by sha1Hex and updated API controller.
2016-10-13 09:04:41 +01:00
Ghazi Triki
f7be426305
Breakout rooms refactoring: generated uniques external ID and internal ID.
2016-10-11 20:50:51 +01:00
Ghazi Triki
12021467f5
Unify uploaded presentation file naming across bigbluebutton-web.
2016-10-01 19:40:19 +01:00
Fred Dixon
6c2259d8ff
Merge pull request #3399 from riadvice/breakout-rooms-use-current-presentation
...
Breakout rooms use current presentation - part 2
2016-10-01 12:24:08 -04:00
Fred Dixon
ce4ef05c21
Merge pull request #3388 from jfederico/extension_preview_for_thumbnails_on_recordings
...
Extension preview for thumbnails on recordings
2016-09-30 17:17:48 -04:00
Ghazi Triki
a9acf9e3e5
Use apache commongs FilenameUtils.getExtension to extract the extension from the file name.
2016-09-29 18:47:11 +01:00
Ghazi Triki
0e72d7523d
Make breakout rooms use the selected slide of the current presentation as default presentation.
2016-09-28 22:19:48 +01:00
jfederico
039d85fe5c
bbb-web: Added internalMeetingID to xml response from create and getMeetings
2016-09-27 15:27:28 -04:00
Pedro Beschorner Marin
49d5f9c41c
Refactored redis recording events
2016-09-21 16:32:11 +00:00
jfederico
3058564ae1
bbb-web: Fixed issue with registeredUser map not cleaned up
2016-08-29 13:53:50 -04:00
jfederico
aac104c77d
bbb-web: Set defaultMaxUsers=0 in bigbluebutton.properties
2016-08-09 15:24:46 -04:00
jfederico
b88328ea4e
bbb-web: Removed debugging log used on development
2016-08-03 17:32:10 -04:00
jfederico
a41646e4c4
bbb-web: Fix for issue #2960
2016-08-03 15:35:20 -04:00
Richard Alam
1081564997
Merge pull request #3249 from riadvice/improve-meeting-retrieval
...
Improve meeting retrieval in MeetingService
2016-08-02 13:28:21 -04:00
Ghazi Triki
962ef49302
Rewritter MeetingService "getMeeting" method to make the difference between normal and breakout rooms.
2016-08-02 17:15:39 +01:00
jfederico
7c0b0a3856
bbb-web: Log error message on invalid
2016-07-28 15:46:44 -04:00
jfederico
3763b0da24
bbb-web: Fix for issue #3148
2016-07-22 16:01:28 -04:00
jfederico
623071005e
bbb-web: Simplified action updateRecordings by removing support for force parameter
2016-07-22 11:34:00 -04:00
jfederico
ac60cad84a
bbb-web: Added parameter to updateRecording "force=[true|false]"
...
when force=false or not included
if meta_parameter exists and passed meta_parameter='' update to blank
if meta_parameter does not exists and passed meta_parameter!='' do nothing
when force=true
if meta_parameter exists and passed meta_parameter='' delete
if meta_parameter does not exists and passed meta_parameter!='' add it
2016-07-11 17:57:27 -04:00
jfederico
34ad74646a
bbb-web: Added code for updating recording metadata
2016-07-11 15:57:11 -04:00
jfederico
a518a3a092
Reverted changes to error rendering response from join
2016-06-30 17:52:10 -04:00
jfederico
da32546095
Restored changes for making maxPartiipants filter and html responses work on join requests
2016-06-27 11:22:10 -04:00
Richard Alam
785ee34453
Flex 4 UI
...
- build using gradle
- launch from outside flex builder
2016-05-26 19:07:27 +00:00
Richard Alam
a615ed7583
- rearrange new flex client source to conform with gradlefx convention
2016-05-25 20:14:13 +00:00
Richard Alam
aafc420d53
Merge branch 'breakout-rooms-porto-algre-2015' of github.com:riadvice/bigbluebutton into merge-bbb-1.1-dev-java8-with-master
...
Conflicts:
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/LiveMeeting.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/MeetingModel.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/MessageSenderActor.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/BreakoutRoomApp.scala
bigbluebutton-client/src/org/bigbluebutton/main/views/MainApplicationShell.mxml
bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatView.mxml
bigbluebutton-client/src/org/bigbluebutton/modules/users/views/UsersWindow.mxml
bigbluebutton-web/grails-app/controllers/org/bigbluebutton/web/controllers/ApiController.groovy
bigbluebutton-web/src/java/org/bigbluebutton/api/MeetingService.java
2016-05-24 20:17:47 +00:00
Richard Alam
58c239bc43
Merge branch 'master' into merge-bbb-1.1-dev-java8-with-master
...
Conflicts:
akka-bbb-apps/build.sbt
akka-bbb-apps/src/main/java/org/bigbluebutton/core/api/IBigBlueButtonInGW.java
akka-bbb-apps/src/main/resources/application.conf
akka-bbb-apps/src/main/scala/org/bigbluebutton/Boot.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonActor.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonInGW.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/MeetingActor.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/MeetingModel.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/MessageSenderActor.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/RecorderActor.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/api/InMessages.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/api/OutMessages.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/api/ValueObjects.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/WhiteboardApp.scala
akka-bbb-fsesl/build.sbt
akka-bbb-fsesl/src/main/java/org/bigbluebutton/freeswitch/pubsub/receivers/RedisMessageReceiver.java
akka-bbb-fsesl/src/main/java/org/bigbluebutton/freeswitch/voice/freeswitch/ConnectionManager.java
akka-bbb-fsesl/src/main/java/org/bigbluebutton/freeswitch/voice/freeswitch/FreeswitchApplication.java
bbb-common-message/build.sbt
bbb-common-message/src/main/java/org/bigbluebutton/common/messages/Constants.java
bbb-common-message/src/main/java/org/bigbluebutton/common/messages/MessagingConstants.java
bbb-common-message/src/main/java/org/bigbluebutton/common/messages/Util.java
bigbluebutton-apps/build.gradle
bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/pubsub/redis/RedisPubSubMessageHandler.java
bigbluebutton-apps/src/main/webapp/WEB-INF/red5-web.xml
bigbluebutton-client/build.xml
bigbluebutton-client/resources/config.xml.template
bigbluebutton-client/resources/prod/BigBlueButton.html
bigbluebutton-client/src/org/bigbluebutton/common/Images.as
bigbluebutton-client/src/org/bigbluebutton/main/maps/ApplicationEventMap.mxml
bigbluebutton-client/src/org/bigbluebutton/main/model/users/Conference.as
bigbluebutton-client/src/org/bigbluebutton/modules/deskshare/utils/JavaCheck.as
bigbluebutton-client/src/org/bigbluebutton/modules/users/services/MessageReceiver.as
bigbluebutton-web/build.gradle
bigbluebutton-web/grails-app/conf/spring/resources.xml
bigbluebutton-web/grails-app/controllers/org/bigbluebutton/web/controllers/ApiController.groovy
bigbluebutton-web/src/java/org/bigbluebutton/api/MeetingService.java
bigbluebutton-web/src/java/org/bigbluebutton/api/domain/Meeting.java
bigbluebutton-web/src/java/org/bigbluebutton/api/messaging/MeetingMessageHandler.java
bigbluebutton-web/src/java/org/bigbluebutton/api/messaging/RedisMessagingService.java
record-and-playback/core/scripts/bigbluebutton.yml
2016-05-16 11:35:36 -04:00
Richard Alam
7ae9b7b204
Merge branch 'merge-webrtc-ds' of https://github.com/antobinary/bigbluebutton into antobinary-merge-webrtc-ds
...
Conflicts:
akka-bbb-apps/build.sbt
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/UsersApp.scala
akka-bbb-fsesl/build.sbt
akka-bbb-fsesl/src/main/java/org/bigbluebutton/freeswitch/voice/freeswitch/ESLEventListener.java
akka-bbb-fsesl/src/main/scala/org/bigbluebutton/freeswitch/VoiceConferenceService.scala
bbb-common-message/build.sbt
bbb-common-message/src/main/java/org/bigbluebutton/common/messages/Constants.java
bbb-common-message/src/main/java/org/bigbluebutton/common/messages/Util.java
bigbluebutton-apps/build.gradle
bigbluebutton-web/grails-app/conf/spring/resources.xml
bigbluebutton-web/src/java/org/bigbluebutton/api/MeetingService.java
2016-05-20 20:27:52 +00:00
Richard Alam
433f09f72d
Merge branch 'dfengBBB' of https://github.com/dfeng99/bigbluebutton into dfeng99-dfengBBB
...
Conflicts:
bbb-common-message/build.sbt
bigbluebutton-web/src/java/org/bigbluebutton/api/MeetingService.java
2016-05-20 15:40:50 +00:00
jfederico
470971d598
bbb-web: Verified that all error messages from join are displayed in html
2016-05-19 16:12:30 -04:00
jfederico
c65cea3804
bbb-web: Adjustments for the new error management
...
- Removed old error managment from join
- Refactored method respondWitErrors so it may responde with html or xml
- Added validation for ignoring masUsers filter if maxUsers=0
2016-05-19 11:41:46 -04:00
jfederico
4ce332ecce
bbb-web: Fix for race condition that causes the maxParticipants filter to fail (changed the format to error parameter)
...
[{"message":"You did not pass a checksum parameter.","key":"MissingParam"},{"message":"You did not pass a meetingID parameter.","key":"MissingParam"}]
2016-05-18 15:39:34 -04:00
Anton Georgiev
228dfb4061
Merge branch 'mod-verto-1' of github.com:antobinary/bigbluebutton into merge-webrtc-ds
...
Conflicts:
akka-bbb-apps/build.sbt
akka-bbb-apps/src/main/resources/application.conf
akka-bbb-apps/src/main/scala/org/bigbluebutton/SystemConfiguration.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/MessageSenderActor.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/UsersApp.scala
akka-bbb-fsesl/build.sbt
bbb-common-message/build.sbt
bbb-fsesl-client/build.sbt
bbb-fsesl-client/src/main/java/org/freeswitch/esl/client/inbound/Client.java
bigbluebutton-apps/build.gradle
bigbluebutton-client/build.xml
bigbluebutton-client/src/org/bigbluebutton/modules/deskshare/utils/BrowserCheck.as
bigbluebutton-client/src/org/bigbluebutton/modules/deskshare/utils/JavaCheck.as
bigbluebutton-client/src/org/bigbluebutton/modules/deskshare/view/components/DesktopPublishWindow.mxml
bigbluebutton-client/src/org/bigbluebutton/modules/users/services/MessageReceiver.as
bigbluebutton-html5/app/client/NotificationControl.coffee
bigbluebutton-html5/app/client/globals.coffee
bigbluebutton-html5/app/client/lib/bbb_api_bridge.coffee
bigbluebutton-html5/app/client/main.coffee
bigbluebutton-html5/app/client/main.html
bigbluebutton-html5/app/client/stylesheets/whiteboard.less
bigbluebutton-html5/app/client/views/chat/chat_bar.coffee
bigbluebutton-html5/app/client/views/modals/settings.coffee
bigbluebutton-html5/app/client/views/modals/settings.html
bigbluebutton-html5/app/client/views/users/user_item.coffee
bigbluebutton-html5/app/client/views/whiteboard/whiteboard.coffee
bigbluebutton-html5/app/client/views/whiteboard/whiteboard.html
bigbluebutton-html5/app/collections/collections.coffee
bigbluebutton-html5/app/config.coffee
bigbluebutton-html5/app/lib/router.coffee
bigbluebutton-html5/app/server/collection_methods/meetings.coffee
bigbluebutton-html5/app/server/collection_methods/users.coffee
bigbluebutton-html5/app/server/publish.coffee
bigbluebutton-html5/app/server/server.coffee
bigbluebutton-web/src/java/org/bigbluebutton/api/MeetingService.java
record-and-playback/presentation/scripts/process/presentation.rb
record-and-playback/presentation/scripts/publish/presentation.rb
2016-05-18 15:14:04 +00:00
jfederico
f075895792
bbb-web: Fix for race condition that causes the maxParticipants filter to fail (implemented cleaner)
2016-05-17 10:55:37 -04:00
jfederico
9b48a68d7d
bbb-web: Fix for race condition that causes the maxParticipants filter to fail (tracking the joins)
2016-05-12 15:03:38 -04:00
jfederico
54d2c0fcb3
bbb-web: Implemented maxUsers/maxParticipants filter in Join
2016-05-10 15:15:46 -04:00
Ghaz Triki
f1ffbc525f
Making MeetingService able to find a meeting using an exact match of its internal ID, by adding a new signature to the getMeeting method.
2016-05-05 10:04:05 +01:00
jfederico
5d06841432
Fix for issue #3110
2016-05-04 17:31:07 -04:00
Richard Alam
b86f32b8c1
Sync with upstream repository
...
Merge branch 'master' of github.com:bigbluebutton/bigbluebutton
2016-04-26 20:01:20 -04:00
Richard Alam
0323b7203a
Add logging on why cannot find user session
...
We need to know which part of the code failed to get the user's session.
2016-04-26 14:41:22 -04:00
David Feng
67c14f9056
This enable avatar to be display in other participants video window
2016-04-20 14:08:13 +08:00
Fred Dixon
7dc0871a28
Change from 1.0.0-Beta to 1.0.0-RC
2016-04-13 17:14:40 -04:00
Richard Alam
7d5c9d63e4
Upgrade to Java 8
...
Upgrade to Java 8 and merge screenshare feature.
Conflicts:
bigbluebutton-client/.actionScriptProperties
2016-03-21 20:19:48 +00:00
Richard Alam
7fe44355d4
Merging breakout rooms with the master branch
...
Merge breakout rooms feature with master branch. This
also includes closed captioning feature.
Conflicts:
bigbluebutton-client/src/org/bigbluebutton/main/views/MainApplicationShell.mxml
bigbluebutton-web/.classpath
bigbluebutton-web/.settings/org.eclipse.jdt.core.prefs
bigbluebutton-web/grails-app/controllers/org/bigbluebutton/web/controllers/ApiController.groovy
bigbluebutton-web/src/java/org/bigbluebutton/api/MeetingService.java
2016-03-21 17:52:23 +00:00
Anton Georgiev
e834637b5a
upgrade grails from 2.3.6 to 2.5.2
2016-03-08 21:43:35 +00:00
Ghaz Triki
45362941ce
Use first sessionToken implementation in API.
2016-03-02 21:16:26 +01:00
Ghaz Triki
871843d4ec
Fix session token redirection merge.
2016-03-02 12:39:57 +01:00
Felipe Cecagno
e4da408c08
Merge branch 'mconf' into bigbluebutton/bigbluebutton@master
...
Conflicts:
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/UsersApp.scala
bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/service/PresentationService.java
bigbluebutton-client/locale/en_US/bbbResources.properties
bigbluebutton-client/resources/prod/bbb-deskshare-applet-0.9.0.jar
bigbluebutton-client/resources/prod/bbb-deskshare-applet-unsigned-0.9.0.jar
bigbluebutton-client/src/org/bigbluebutton/main/views/MainApplicationShell.mxml
bigbluebutton-client/src/org/bigbluebutton/modules/layout/services/MessageReceiver.as
bigbluebutton-client/src/org/bigbluebutton/modules/users/views/StatusItemRenderer.mxml
bigbluebutton-config/web/index.html
bigbluebutton-web/grails-app/controllers/org/bigbluebutton/web/controllers/ApiController.groovy
bigbluebutton-web/src/groovy/org/bigbluebutton/api/RecordingServiceHelperImp.groovy
bigbluebutton-web/src/java/org/bigbluebutton/api/MeetingService.java
bigbluebutton-web/src/java/org/bigbluebutton/api/ParamsProcessorUtil.java
bigbluebutton-web/src/java/org/bigbluebutton/api/RecordingService.java
bigbluebutton-web/src/java/org/bigbluebutton/api/RecordingServiceHelper.java
bigbluebutton-web/src/java/org/bigbluebutton/api/domain/Recording.java
bigbluebutton-web/web-app/WEB-INF/freemarker/get-recordings.ftl
record-and-playback/presentation/playback/presentation/0.9.0/playback.html
record-and-playback/presentation/scripts/publish/presentation.rb
2016-03-02 01:19:09 -03:00
Felipe Cecagno
66392e0a6b
Merge remote-tracking branch 'mconf/mconf-live0.7.4' into mconf
...
Conflicts:
bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonActor.scala
bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/CollectorActor.scala
bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/MeetingActor.scala
bigbluebutton-apps/src/main/scala/org/bigbluebutton/freeswitch/FreeswitchConferenceActor.scala
bigbluebutton-client/resources/prod/bbb-deskshare-applet-0.9.0.jar
bigbluebutton-client/resources/prod/bbb-deskshare-applet-unsigned-0.9.0.jar
bigbluebutton-web/grails-app/controllers/org/bigbluebutton/web/controllers/ApiController.groovy
2016-03-02 00:19:30 -03:00
Ghaz Triki
990e786340
Merge branch 'master' into breakout-rooms-porto-algre-2015
...
# Conflicts:
# bigbluebutton-client/src/org/bigbluebutton/main/views/MainApplicationShell.mxml
# bigbluebutton-web/.classpath
# bigbluebutton-web/.settings/org.eclipse.jdt.core.prefs
# bigbluebutton-web/grails-app/controllers/org/bigbluebutton/web/controllers/ApiController.groovy
# bigbluebutton-web/src/java/org/bigbluebutton/api/MeetingService.java
2016-02-28 21:34:33 +01:00
Anton Georgiev
cdf1ee0729
add a request/reply for stun/turn info
2016-02-17 18:36:17 +00:00
Richard Alam
c31857b9da
Merge pull request #3001 from bigbluebutton/getRecordings-merged-enhancements
...
Get recordings merged enhancements
2016-02-04 17:01:03 -05:00
Richard Alam
1e0be140a2
Change API version to 1.0
2016-02-04 14:43:59 -05:00
Felipe Cecagno
a64a9c5940
remove unnecessary logs; order getRecordings response by recordId, and metadata by meta key
2016-02-03 19:09:16 -02:00
Pedro Beschorner Marin
00d378831e
FreeMarker template in a separated file
2016-02-03 13:51:42 -02:00
Pedro Beschorner Marin
497930b06d
Creating getRecordings XML response with FreeMarker
2016-02-03 13:51:36 -02:00
jfederico
84e4221c47
bigbluebutton-web: Extended filterRecordingsByMetadata in order to support wildcards
2016-02-01 15:08:51 -05:00
jfederico
f23158ccd7
bigbluebutton-web: Fixed issue with recordings not publishing/unpublishing
2016-01-29 13:36:24 -05:00
jfederico
e12d3fa639
Cleaned up ApiController after merge
2016-01-29 10:24:30 -05:00