Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Moving naming schema settings up in the config panel #101

Merged
merged 1 commit into from
Jun 11, 2020
Merged

Moving naming schema settings up in the config panel #101

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
50 changes: 25 additions & 25 deletions plugin.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,31 +33,6 @@
"type": "bool",
"help_text": "(Experimental) When true, Jitsi video is embedded as a floating window inside Mattermost."
},
{
"key": "JitsiJWT",
"display_name": "Use JWT Authentication for Jitsi",
"type": "bool",
"help_text": "(Optional) If your Jitsi server uses JSON Web Tokens (JWT) for authentication, set this value to true."
},
{
"key": "JitsiAppID",
"display_name": "App ID for JWT Authentication",
"type": "text",
"help_text": "(Optional) The App ID used for authentication by the Jitsi server and JWT token generator."
},
{
"key": "JitsiAppSecret",
"display_name": "App Secret for JWT Authentication",
"type": "text",
"help_text": "(Optional) The App Secret used for authentication by the Jitsi server and JWT token generator."
},
{
"key": "JitsiLinkValidTime",
"display_name": "Meeting Link Expiry Time (minutes)",
"type": "number",
"help_text": "(Optional) The number of minutes from when the meeting link is created to when it becomes invalid. Minimum is 1 minute. Only applies if using JWT authentication for your Jitsi server.",
"default": 30
},
{
"key": "JitsiNamingScheme",
"display_name": "Jitsi Meeting Names",
Expand All @@ -82,6 +57,31 @@
"value": "ask"
}
]
},
{
"key": "JitsiJWT",
"display_name": "Use JWT Authentication for Jitsi",
"type": "bool",
"help_text": "(Optional) If your Jitsi server uses JSON Web Tokens (JWT) for authentication, set this value to true."
},
{
"key": "JitsiAppID",
"display_name": "App ID for JWT Authentication",
"type": "text",
"help_text": "(Optional) The App ID used for authentication by the Jitsi server and JWT token generator."
},
{
"key": "JitsiAppSecret",
"display_name": "App Secret for JWT Authentication",
"type": "text",
"help_text": "(Optional) The App Secret used for authentication by the Jitsi server and JWT token generator."
},
{
"key": "JitsiLinkValidTime",
"display_name": "Meeting Link Expiry Time (minutes)",
"type": "number",
"help_text": "(Optional) The number of minutes from when the meeting link is created to when it becomes invalid. Minimum is 1 minute. Only applies if using JWT authentication for your Jitsi server.",
"default": 30
}
]
}
Expand Down
52 changes: 26 additions & 26 deletions server/manifest.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

52 changes: 26 additions & 26 deletions webapp/src/manifest.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,32 @@ const manifest = JSON.parse(`
"placeholder": "",
"default": null
},
{
"key": "JitsiNamingScheme",
"display_name": "Jitsi Meeting Names",
"type": "radio",
"help_text": "Select how meeting names are generated.",
"placeholder": "",
"default": "words",
"options": [
{
"display_name": "Random English words in title case (e.g. PlayfulDragonsObserveCuriously)",
"value": "words"
},
{
"display_name": "UUID (universally unique identifier)",
"value": "uuid"
},
{
"display_name": "Mattermost context specific names. Combination of team name, channel name and random text in public and private channels; personal meeting name in direct and group messages channels.",
"value": "mattermost"
},
{
"display_name": "Allow user to select meeting name",
"value": "ask"
}
]
},
{
"key": "JitsiJWT",
"display_name": "Use JWT Authentication for Jitsi",
Expand Down Expand Up @@ -73,32 +99,6 @@ const manifest = JSON.parse(`
"help_text": "(Optional) The number of minutes from when the meeting link is created to when it becomes invalid. Minimum is 1 minute. Only applies if using JWT authentication for your Jitsi server.",
"placeholder": "",
"default": 30
},
{
"key": "JitsiNamingScheme",
"display_name": "Jitsi Meeting Names",
"type": "radio",
"help_text": "Select how meeting names are generated.",
"placeholder": "",
"default": "words",
"options": [
{
"display_name": "Random English words in title case (e.g. PlayfulDragonsObserveCuriously)",
"value": "words"
},
{
"display_name": "UUID (universally unique identifier)",
"value": "uuid"
},
{
"display_name": "Mattermost context specific names. Combination of team name, channel name and random text in public and private channels; personal meeting name in direct and group messages channels.",
"value": "mattermost"
},
{
"display_name": "Allow user to select meeting name",
"value": "ask"
}
]
}
]
}
Expand Down