diff --git a/dev/Common/Enums.js b/dev/Common/Enums.js index 0f4aae25e..53e935d3f 100644 --- a/dev/Common/Enums.js +++ b/dev/Common/Enums.js @@ -13,7 +13,6 @@ export const Capa = { AttachmentsActions: 'ATTACHMENTS_ACTIONS', DangerousActions: 'DANGEROUS_ACTIONS', Settings: 'SETTINGS', - Help: 'HELP', Themes: 'THEMES', UserBackground: 'USER_BACKGROUND', Sieve: 'SIEVE', diff --git a/dev/View/User/AbstractSystemDropDown.js b/dev/View/User/AbstractSystemDropDown.js index fc6ed0d89..235d696f3 100644 --- a/dev/View/User/AbstractSystemDropDown.js +++ b/dev/View/User/AbstractSystemDropDown.js @@ -22,7 +22,6 @@ export class AbstractSystemDropDownUserView extends AbstractViewRight { this.allowAccounts = Settings.capa(Capa.AdditionalAccounts); this.allowSettings = Settings.capa(Capa.Settings); - this.allowHelp = Settings.capa(Capa.Help); this.accountEmail = AccountUserStore.email; @@ -63,7 +62,7 @@ export class AbstractSystemDropDownUserView extends AbstractViewRight { } settingsHelp() { - this.allowHelp && showScreenPopup(KeyboardShortcutsHelpPopupView); + showScreenPopup(KeyboardShortcutsHelpPopupView); } addAccountClick() { diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Actions.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Actions.php index 401004f05..94fcfaad9 100644 --- a/snappymail/v/0.0.0/app/libraries/RainLoop/Actions.php +++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Actions.php @@ -1941,10 +1941,6 @@ class Actions } } - if ($oConfig->Get('capa', 'help', true)) { - $aResult[] = Enumerations\Capa::HELP; - } - if ($oConfig->Get('capa', 'attachments_actions', false)) { $aResult[] = Enumerations\Capa::ATTACHMENTS_ACTIONS; } diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Config/Application.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Config/Application.php index cab0261d0..b7866f1ad 100644 --- a/snappymail/v/0.0.0/app/libraries/RainLoop/Config/Application.php +++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Config/Application.php @@ -189,7 +189,6 @@ class Application extends \RainLoop\Config\AbstractConfig 'contacts' => array(true), 'settings' => array(true), 'quota' => array(true), - 'help' => array(true), 'search' => array(true), 'search_adv' => array(true), 'dangerous_actions' => array(true), diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Enumerations/Capa.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Enumerations/Capa.php index d2afa2c96..a8f61045e 100644 --- a/snappymail/v/0.0.0/app/libraries/RainLoop/Enumerations/Capa.php +++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Enumerations/Capa.php @@ -17,7 +17,6 @@ class Capa const SEARCH_ADV = 'SEARCH_ADV'; const SETTINGS = 'SETTINGS'; const QUOTA = 'QUOTA'; - const HELP = 'HELP'; const TEMPLATES = 'TEMPLATES'; const MESSAGE_ACTIONS = 'MESSAGE_ACTIONS'; const ATTACHMENTS_ACTIONS = 'ATTACHMENTS_ACTIONS'; diff --git a/snappymail/v/0.0.0/app/templates/Views/User/SystemDropDown.html b/snappymail/v/0.0.0/app/templates/Views/User/SystemDropDown.html index e1c8a412f..6d57fca2b 100644 --- a/snappymail/v/0.0.0/app/templates/Views/User/SystemDropDown.html +++ b/snappymail/v/0.0.0/app/templates/Views/User/SystemDropDown.html @@ -54,7 +54,7 @@ -