Merge branch 'release/3.2.0' into prosody_room_list

This commit is contained in:
John Livingston
2021-06-22 13:47:39 +02:00
12 changed files with 208 additions and 10 deletions

View File

@ -111,6 +111,7 @@ function register ({ registerHook, registerSettingsScript, peertubeHelpers }: Re
case 'chat-type-help-disabled':
return options.formValues['chat-type'] !== ('disabled' as ChatType)
case 'prosody-port':
case 'prosody-peertube-uri':
case 'chat-type-help-builtin-prosody':
case 'prosody-list-rooms':
return options.formValues['chat-type'] !== ('builtin-prosody' as ChatType)