Merge branch 'dev' into dev-customer_menu_fix

.github/ISSUE_TEMPLATE/bug.md

@@ -8,23 +8,23 @@ assignees: ''
 
 <!--
   You are amazing! 🚀
-  Thanks for reporting to Znuny Community project!
+  Thanks for reporting to the Znuny Community project!
   Please, DO NOT DELETE ANY TEXT from this template! (unless instructed).
 -->
 
-<!-- ❗If you believe your issue is security related please follow the [security guidelines](https://github.com/znuny/Znuny/blob/rel-6_0/SECURITY.md).❗ -->
+<!-- ❗If you believe your issue is security related please follow the [security guidelines](https://github.com/znuny/Znuny/blob/dev/SECURITY.md).❗ -->
 
 ### Environment
 
-- OS:           <!-- [e.g. Windows, MacOS, Linux] -->
-- Browser:      <!-- [e. g. Chrome, Firefox, Safari] -->
-- Znuny version: <!-- [e. g. 6.0.15] -->
+- Server OS: <!-- [e.g. Windows, MacOS, Linux] -->
+- Browser: <!-- [e. g. Chrome, Firefox, Safari] -->
+- Znuny version: <!-- [e. g. 7.0.12] -->
 
-### Expected behaviour
+### Expected behavior
 
 <!-- A clear and concise description of what you expected to happen. -->
 
-### Actual behaviour
+### Actual behavior
 
 <!-- A clear and concise description of what happened (the issue/bug/problem). -->
 

.github/workflows/ci/dependencies.sh

@@ -15,4 +15,4 @@ apt-get install -y libapache2-mod-perl2 \
   libmail-imapclient-perl libtemplate-perl libdatetime-perl \
   libmoo-perl liblocale-po-perl libhash-merge-perl \
   libxml2-utils libical-parser-perl libexpat1-dev \
-  apache2 gnupg2 mariadb-client cpanminus make gcc git npm gettext
+  apache2 gnupg2 mariadb-client cpanminus make gcc git npm gettext gnupg

.gitignore

@@ -1066,3 +1066,8 @@ var/httpd/htdocs/js/Survey.Agent.SurveyZoom.js
 var/httpd/htdocs/skins/Agent/default/css/Survey.Agent.Default.css
 var/httpd/htdocs/skins/Customer/default/css/Survey.Customer.Default.css
 var/packagesetup/Survey.pm
+
+.idea
+./.idea
+/.idea
+

.mailmap

@@ -56,6 +56,7 @@ Moritz Lenz <[email protected]> Moritz Lenz <[email protected]>
 Niklas Schmitt <[email protected]> Niklas <[email protected]>
 Nils Leideck <[email protected]> Nils Leideck <[email protected]>
 Nils Leideck <[email protected]> nilei <[email protected]>
+Oleksandr Mostovyi <[email protected]> Oleksandr Mostovyi <[email protected]>
 Paul Folkers <[email protected]> Paul Folkers (Sector Nord AG) <[email protected]>
 Paul Folkers <[email protected]> paulfolkers <[email protected]>
 Paul Folkers <[email protected]> paulfolkers <[email protected]>
@@ -81,7 +82,8 @@ Sławomir Niedbała <[email protected]> Slawomir Niedbala <sniedbal
 Sławomir Niedbała <[email protected]> Slawomir <[email protected]>
 Sławomir Niedbała <[email protected]> Slawomir <[email protected]>
 Sławomir Niedbała <[email protected]> Sławomir Niedbała <[email protected]>
-Tim Puettmanns <[email protected]> tipue <[email protected]>
+Tim Püttmanns <[email protected]> Tim Puettmanns <[email protected]>
+Tim Püttmanns <[email protected]> tipue <[email protected]>
 Thorsten Eckel <[email protected]> Thorsten <[email protected]>
 Thorsten Eckel <[email protected]> Thorsten Eckel <[email protected]>
 Thorsten Eckel <[email protected]> Thorsten Eckel <[email protected]>

AUTHORS.md

@@ -59,13 +59,15 @@ The following persons contributed to Znuny:
 * MarcPahnke <[email protected]>
 * Marco Buchholz <[email protected]>
 * Marco Ferrante <[email protected]>
+* Marcos Silverio <[email protected]>
 * Markus Esche <[email protected]>
 * Markus Raulf <[email protected]>
 * Martha Pascual <[email protected]>
 * Martin Edenhofer <[email protected]>
 * Martin Gross <[email protected]>
 * Martin Gruner <[email protected]>
 * Mathias Bräunling <[email protected]>
+* Matthias Bethke <[email protected]>
 * Michael Tänzer <[email protected]>
 * Michiel Beijen <[email protected]>
 * Milan Rakic <[email protected]>
@@ -78,6 +80,7 @@ The following persons contributed to Znuny:
 * Nils Leideck <[email protected]>
 * Norihiro Tanaka <[email protected]>
 * Oberson Dylan <[email protected]>
+* Oleksandr Mostovyi <[email protected]>
 * Oliver Tappe <[email protected]>
 * Olivier Sallou <[email protected]>
 * Patrick Brischler <[email protected]>
@@ -110,14 +113,15 @@ The following persons contributed to Znuny:
 * Thomas Raith <[email protected]>
 * Thomas Wouters <[email protected]>
 * Thorsten Eckel <[email protected]>
-* Tim Puettmanns <[email protected]>
+* Tim Püttmanns <[email protected]>
 * Timo Gurr <[email protected]>
 * Torsten Thau <[email protected]>
 * Udo Bretz <[email protected]>
 * Uwe Dieckmann <[email protected]>
 * Walter Souto <[email protected]>
 * Wojciech Kuchta <[email protected]>
 * Yuri Myasoedov <[email protected]>
+* Ziggy Trotter <[email protected]>
 * Znuny Weblate <[email protected]>
 * Zoran Ilibasic <[email protected]>
 * akmet <[email protected]>