Merge branch 'master' into plugin-2fa

plugins/README.md

@@ -1,3 +1,4 @@
+PHP
 
 class Plugin extends \RainLoop\Plugins\AbstractPlugin
 
@@ -196,7 +197,7 @@ $Plugin->addHook('hook.name', 'functionName');
 		string $sAction
 		array &$aResponseItem
 
-### filter.message-html'
+### filter.message-html
 ### filter.message-plain
 	params:
 		\RainLoop\Model\Account $oAccount
@@ -277,6 +278,10 @@ $Plugin->addHook('hook.name', 'functionName');
 	params:
 		string $sAction
 
+### json.attachments
+	params:
+		\SnappyMail\AttachmentsAction $oData
+
 ### json.suggestions-input-parameters
 	params:
 		string &$sQuery

plugins/change-password/index.php

@@ -6,9 +6,9 @@ class ChangePasswordPlugin extends \RainLoop\Plugins\AbstractPlugin
 {
 	const
 		NAME     = 'Change Password',
-		VERSION  = '2.1',
-		RELEASE  = '2021-03-18',
-		REQUIRED = '2.4.0',
+		VERSION  = '2.2',
+		RELEASE  = '2021-07-20',
+		REQUIRED = '2.5.0',
 		CATEGORY = 'Security',
 		DESCRIPTION = 'This plugin allows you to change passwords of email accounts';
 
@@ -23,6 +23,7 @@ class ChangePasswordPlugin extends \RainLoop\Plugins\AbstractPlugin
 	{
 		$this->UseLangs(true); // start use langs folder
 
+		$this->addCss('style.less');
 		$this->addJs('js/ChangePasswordUserSettings.js'); // add js file
 		$this->addJsonHook('ChangePassword', 'ChangePassword');
 		$this->addTemplate('templates/SettingsChangePassword.html');

plugins/change-password/style.less

@@ -0,0 +1,5 @@
+.form-horizontal.change-password .control-group {
+	.control-label {
+		width: 160px;
+	}
+}

plugins/change-password/templates/SettingsChangePassword.html

@@ -1,5 +1,5 @@
 <div class="b-settings-general g-ui-user-select-none">
-	<div class="form-horizontal long-label">
+	<div class="form-horizontal change-password">
 		<div class="legend" data-i18n="SETTINGS_CHANGE_PASSWORD/LEGEND_CHANGE_PASSWORD"></div>
 		<div class="row">
 			<div class="span6">