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

[NEW] Screen Lock settings - mobile client #17523

Merged
merged 3 commits into from
May 6, 2020
Merged

[NEW] Screen Lock settings - mobile client #17523

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
65be699
[NEW] Screen Lock settings - mobile client
djorkaeffalexandre May 4, 2020
844ef88
Add setting description
djorkaeffalexandre May 6, 2020
d22bfb0
Merge branch 'develop' of https://github.com/RocketChat/Rocket.Chat i…
djorkaeffalexandre May 6, 2020
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
7 changes: 7 additions & 0 deletions app/lib/server/startup/settings.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1166,6 +1166,13 @@ settings.addGroup('Meta', function() {
});
});

settings.addGroup('Mobile', function() {
this.section('Screen_Lock', function() {
this.add('Force_Screen_Lock', false, { type: 'boolean', i18nDescription: 'Force_Screen_Lock_description', public: true });
this.add('Force_Screen_Lock_After', 1800, { type: 'int', i18nDescription: 'Force_Screen_Lock_After_description', enableQuery: { _id: 'Force_Screen_Lock', value: true }, public: true });
});
});

settings.addGroup('Push', function() {
this.add('Push_enable', true, {
type: 'boolean',
Expand Down
5 changes: 5 additions & 0 deletions packages/rocketchat-i18n/i18n/en.i18n.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1584,6 +1584,10 @@
"FileUpload_Webdav_Upload_Folder_Path_Description": "WebDAV folder path which the files should be uploaded to",
"FileUpload_Webdav_Server_URL": "WebDAV Server Access URL",
"Force_Disable_OpLog_For_Cache": "Force Disable OpLog for Cache",
"Force_Screen_Lock": "Force screen lock",
"Force_Screen_Lock_description": "When enabled, you'll force your users to use a PIN/BIOMETRY/FACEID to unlock the app.",
"Force_Screen_Lock_After": "Force screen lock after",
"Force_Screen_Lock_After_description": "The time to request password again after the finish of the latest session, in seconds.",
"FileUpload_Webdav_Username": "WebDAV Username",
"Force_Disable_OpLog_For_Cache_Description": "Will not use OpLog to sync cache even when it's available",
"FileUpload_Webdav_Password": "WebDAV Password",
Expand Down Expand Up @@ -2990,6 +2994,7 @@
"Scan_QR_code": "Using an authenticator app like Google Authenticator, Authy or Duo, scan the QR code. It will display a 6 digit code which you need to enter below.",
"Scan_QR_code_alternative_s": "If you can't scan the QR code, you may enter code manually instead: __code__",
"Scope": "Scope",
"Screen_Lock": "Screen Lock",
"Screen_Share": "Screen Share",
"Script_Enabled": "Script Enabled",
"Search": "Search",
Expand Down
5 changes: 5 additions & 0 deletions packages/rocketchat-i18n/i18n/pt-BR.i18n.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1473,6 +1473,10 @@
"FileUpload_Webdav_Upload_Folder_Path_Description": "Caminho da pasta WebDAV para o qual os arquivos devem ser enviados",
"FileUpload_Webdav_Server_URL": "URL de acesso ao servidor WebDAV",
"Force_Disable_OpLog_For_Cache": "Force Desactivar OpLog para Cache",
"Force_Screen_Lock": "Forçar bloqueio de tela",
"Force_Screen_Lock_description": "Quando ativado, você forçará seus usuários a usar um PIN/BIOMETRIA/FACEID para desbloquear o aplicativo.",
"Force_Screen_Lock_After": "Forçar bloqueio de tela após",
"Force_Screen_Lock_After_description": "O tempo para solicitar a senha novamente após o término da última sessão, em segundos.",
"FileUpload_Webdav_Username": "Nome de usuário do WebDAV",
"Force_Disable_OpLog_For_Cache_Description": "Não usará o OpLog para sincronizar o cache mesmo quando estiver disponível",
"FileUpload_Webdav_Password": "Senha do WebDAV",
Expand Down Expand Up @@ -2709,6 +2713,7 @@
"Scan_QR_code": "Usando um aplicativo autenticador como o Google Authenticator, Authy ou Duo, analise o código QR. Ele exibirá um código de 6 dígitos que você precisa inserir abaixo.",
"Scan_QR_code_alternative_s": "Se você não pode digitalizar o código QR, pode digitar o código manualmente em vez disso: __code__",
"Scope": "Escopo",
"Screen_Lock": "Bloqueio de Tela",
"Screen_Share": "Compartilhamento de Tela",
"Script_Enabled": "Script Ativado",
"Search": "Pesquisar",
Expand Down