Merge branch 'master' into release-3.3

johndoh · johndoh · commit dd13a92a9d89 · 2022-06-18T08:17:57.000+01:00
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,6 +1,10 @@
 Roundcube Webmail ContextMenu
 =============================
 
+Version 3.3.1 (2022-06-18, rc-1.5)
+=================================================
+ * Add placeholder for undeleted icon
+
 Version 3.3 (2021-10-19, rc-1.5)
 =================================================
  * Support Dark Mode in Elastic
diff --git a/composer.json b/composer.json
@@ -5,7 +5,7 @@
   "homepage": "https://github.com/johndoh/roundcube-contextmenu/",
   "license": "GPL-3.0-or-later",
   "type": "roundcube-plugin",
-  "version": "3.3",
+  "version": "3.3.1",
   "authors": [
     {
       "name": "Philip Weir",
diff --git a/contextmenu.php b/contextmenu.php
@@ -28,7 +28,7 @@
  */
 class contextmenu extends rcube_plugin
 {
-    public $task = '^((?!login).)*$';
+    public $task = '?(?!login$|logout$|cli$).*';
     private $rcube;
 
     public function init()
diff --git a/localization/ar.inc b/localization/ar.inc
@@ -0,0 +1,8 @@
+<?php
+/* Author: Eyad Tamer */
+
+$labels = [];
+$labels['collapseall'] = 'تصغير كل المجلدات';
+$labels['expandall'] = 'قم بتوسيع كافة المجلدات';
+
+$messages = [];
diff --git a/skins/classic/contextmenu.css b/skins/classic/contextmenu.css
@@ -132,6 +132,11 @@ div.contextmenu ul.iconized li a.unflaggedlink span.icon
   background-position: 7px -153px;
 }
 
+div.contextmenu ul.iconized li a.undeletedlink span.icon
+{
+  background-position: 7px -1000px;
+}
+
 div.contextmenu ul.iconized li a.messagemenu span.icon,
 div.contextmenu ul.iconized li a.contactmenu span.icon,
 div.contextmenu ul.iconized li a.keymenu span.icon

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`	`"homepage": "https://github.com/johndoh/roundcube-contextmenu/",`
`6`	`6`	`"license": "GPL-3.0-or-later",`
`7`	`7`	`"type": "roundcube-plugin",`
`8`		`- "version": "3.3",`
	`8`	`+ "version": "3.3.1",`
`9`	`9`	`"authors": [`
`10`	`10`	`{`
`11`	`11`	`"name": "Philip Weir",`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@`
`28`	`28`	`*/`
`29`	`29`	`class contextmenu extends rcube_plugin`
`30`	`30`	`{`
`31`		`- public $task = '^((?!login).)*$';`
	`31`	`+ public $task = '?(?!login$\|logout$\|cli$).*';`
`32`	`32`	`private $rcube;`
`33`	`33`
`34`	`34`	`public function init()`