Skip to content

Commit

Permalink
Merge branch 'dev' into dev-opensearch
Browse files Browse the repository at this point in the history
  • Loading branch information
dennykorsukewitz authored Nov 6, 2024
2 parents 3ecb194 + 8a0a156 commit a918d60
Show file tree
Hide file tree
Showing 5,307 changed files with 101,909 additions and 315,114 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
14 changes: 7 additions & 7 deletions .github/ISSUE_TEMPLATE/bug.md
Original file line number Diff line number Diff line change
Expand Up @@ -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). -->

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci/config-mysql.sh
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ echo "Use INITIAL_INSERT_FILE: $INITIAL_INSERT_FILE"
echo "Use SCHEMA_POST_FILE: $SCHEMA_POST_FILE"

echo "Change character set"
mysql -h mariadb -u "${MYSQL_USERNAME}" -p"${MYSQL_PASSWORD}" -e "ALTER DATABASE znuny DEFAULT CHARACTER SET utf8;ALTER DATABASE znuny DEFAULT COLLATE utf8_unicode_ci;" || exit 1
mysql -h mariadb -u "${MYSQL_USERNAME}" -p"${MYSQL_PASSWORD}" -e "ALTER DATABASE znuny DEFAULT CHARACTER SET utf8mb4;ALTER DATABASE znuny DEFAULT COLLATE utf8mb4_unicode_ci;" || exit 1

echo "Create schema"
mysql -h mariadb -u "${MYSQL_USERNAME}" -p"${MYSQL_PASSWORD}" znuny < "$SCHEMA_FILE" || exit 1
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci/dependencies.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
5 changes: 5 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -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

18 changes: 11 additions & 7 deletions .mailmap
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ Moritz Lenz <mlenz@noris.net> Moritz Lenz <moritz@faui2k3.org>
Niklas Schmitt <ns@znuny.com> Niklas <ns@znuny.com>
Nils Leideck <nils.leideck@otrs.com> Nils Leideck <nils.leideck@leidex.net>
Nils Leideck <nils.leideck@otrs.com> nilei <nils.leideck@leidex.net>
Oleksandr Mostovyi <seeusers@gmail.com> Oleksandr Mostovyi <om@mova.club>
Paul Folkers <paul.folkers@sectornord.de> Paul Folkers (Sector Nord AG) <83212096+paulfolkers@users.noreply.github.com>
Paul Folkers <paul.folkers@sectornord.de> paulfolkers <83212096+paulfolkers@users.noreply.github.com>
Paul Folkers <paul.folkers@sectornord.de> paulfolkers <paul.folkers@sectornord.de>
Expand All @@ -75,13 +76,15 @@ Sanjin Vik <svik@s7designcreative.com> Sanjin Vik <svik@s7sdesigncreative.com>
Shawn Beasley <shawn.beasley@znuny.com> Shawn Beasley <shawn.beasley@otrs.com>
Shawn Beasley <shawn.beasley@znuny.com> Shawn Beasley <digitalninja74@gmail.com>
Shawn Beasley <shawn.beasley@znuny.com> Shawn Beasley <shawn.beasley@icloud.com>
Sławomir Niedbała <sniedbala@dev.opgksoftware.com> Slawomir Niedbala <sniedbala@opgksoftware.com>
Sławomir Niedbała <sniedbala@dev.opgksoftware.com> Slawomir Niedbala <sniedbala@opgksoftware.com>
Sławomir Niedbała <sniedbala@dev.opgksoftware.com> Slawomir Niedbala <sniedbala@dev.opgksoftware.com>
Sławomir Niedbała <sniedbala@dev.opgksoftware.com> Slawomir <sniedbala@dev.opgksoftware.com>
Sławomir Niedbała <sniedbala@dev.opgksoftware.com> Slawomir <sniedbala@opgksoftware.com>
Sławomir Niedbała <sniedbala@dev.opgksoftware.com> Sławomir Niedbała <sniedbala@opgksoftware.com>
Tim Puettmanns <tim.puettmanns@maxence.de> tipue <tim.puettmanns@maxence.de>
Sławomir Niedbała <slawnied1234@gmail.com> Sławomir Niedbała <sniedbala@dev.opgksoftware.com>
Sławomir Niedbała <slawnied1234@gmail.com> Slawomir Niedbala <sniedbala@opgksoftware.com>
Sławomir Niedbała <slawnied1234@gmail.com> Slawomir Niedbala <sniedbala@opgksoftware.com>
Sławomir Niedbała <slawnied1234@gmail.com> Slawomir Niedbala <sniedbala@dev.opgksoftware.com>
Sławomir Niedbała <slawnied1234@gmail.com> Slawomir <sniedbala@dev.opgksoftware.com>
Sławomir Niedbała <slawnied1234@gmail.com> Slawomir <sniedbala@opgksoftware.com>
Sławomir Niedbała <slawnied1234@gmail.com> Sławomir Niedbała <sniedbala@opgksoftware.com>
Tim Püttmanns <tim.puettmanns@maxence.de> Tim Puettmanns <tim.puettmanns@maxence.de>
Tim Püttmanns <tim.puettmanns@maxence.de> tipue <tim.puettmanns@maxence.de>
Thorsten Eckel <te@znuny.com> Thorsten <thorsteneckel@posteo.de>
Thorsten Eckel <te@znuny.com> Thorsten Eckel <te@zammad.com>
Thorsten Eckel <te@znuny.com> Thorsten Eckel <thorsten.eckel@otrs.com>
Expand All @@ -99,6 +102,7 @@ tipue <tim.puettmanns@maxence.de> tipue <80031303+tipue-dev@users.noreply.github
Znuny Weblate <do-not-reply@znuny.com> Weblate Admin <operations@znuny.com>
Znuny Weblate <do-not-reply@znuny.com> Weblate <noreply@weblate.org>
Znuny Weblate <do-not-reply@znuny.com> ZnunyWeblate <rk+weblate@znuny.com>
Znuny Weblate <do-not-reply@znuny.com> ZnunyWeblate <operations+weblate@znuny.com>
anonymous <unknown@anonymous> atif <>
anonymous <unknown@anonymous> nicolas <>
anonymous <unknown@anonymous> otrsintern <otrsintern@gmail.com>
Expand Down
16 changes: 14 additions & 2 deletions AUTHORS.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,16 +30,19 @@ The following persons contributed to Znuny:
* Elva Novoa <elva.novoa@otrs.com>
* Emin Yazi <yazi@efflux.de>
* Enrique Matías Sánchez (Quique) <cronopios@gmail.com>
* Falko Saller <2903042+falkos@users.noreply.github.com>
* Felix Niklas <felix.niklas@otrs.com>
* Florian Edlhuber <florian.edlhuber@otrs.com>
* Florian Liebe <florian.liebe@otrs.com>
* Flávio Marta <7440579+CallMeFlanby@users.noreply.github.com>
* Friedrich Delgado <friedel@nomaden.org>
* Gerald Young <gerald.young@noynim.com>
* Henning Oschwald <henning.oschwald@otrs.com>
* Henrik Vetter <hv@znuny.com>
* IB Development Team <dev@ib.pl>
* Igor Djuric <igor.djuric@otrs.com>
* Jan Steinweg <jan.steinweg@otrs.com>
* JannisKleinrensing <71767611+JannisKleinrensing@users.noreply.github.com>
* Jaroslav Balaz <jaroslav.balaz@otrs.com>
* Jens Bothe <jens.bothe@otrs.com>
* Jens Pfeifer <jp@znuny.com>
Expand All @@ -56,14 +59,18 @@ The following persons contributed to Znuny:
* Manuel Hecht <manuel.hecht@otrs.com>
* Marc Bonsels <marc.bonsels@otrs.com>
* Marc Nilius <marc.nilius@otrs.com>
* MarcPahnke <89537707+MarcPahnke@users.noreply.github.com>
* Marco Buchholz <marco.buchholz@otrs.com>
* Marco Ferrante <marco@csita.unige.it>
* Marcos Silverio <marcos.aurelio@infracerta.com.br>
* Markus Esche <markus.esche@otrs.com>
* Markus Raulf <mail@markusraulf.de>
* Martha Pascual <martha.pascual@otrs.com>
* Martin Edenhofer <martin.edenhofer@otrs.com>
* Martin Gross <martin@pc-coholic.de>
* Martin Gruner <martin.gruner@otrs.com>
* Mathias Bräunling <mathias.braeunling@otrs.com>
* Matthias Bethke <mb@znuny.com>
* Michael Tänzer <neo@nhng.de>
* Michiel Beijen <michiel.beijen@otrs.com>
* Milan Rakic <mrakic@s7designcreative.com>
Expand All @@ -76,6 +83,7 @@ The following persons contributed to Znuny:
* Nils Leideck <nils.leideck@otrs.com>
* Norihiro Tanaka <noritnk@kcn.ne.jp>
* Oberson Dylan <dylan.oberson@epfl.ch>
* Oleksandr Mostovyi <seeusers@gmail.com>
* Oliver Tappe <oliver.tappe@otrs.com>
* Olivier Sallou <olivier.sallou@irisa.fr>
* Patrick Brischler <patrick.brischler@otrs.com>
Expand All @@ -99,30 +107,34 @@ The following persons contributed to Znuny:
* Samuel Diniz Casimiro <nedmaj@yahoo.com>
* Sanjin Vik <svik@s7designcreative.com>
* Shawn Beasley <shawn.beasley@znuny.com>
* Sidpatchy <35241490+Sidpatchy@users.noreply.github.com>
* Stefan Bedorf <stefan.bedorf@otrs.com>
* Stefan Rother <stefan.rother@otrs.com>
* Stefan Wintermeyer <stefan@otrs.org>
* Steva Stevic <svik@s7designcreative.com>
* Sławomir Niedbała <sniedbala@dev.opgksoftware.com>
* Sławomir Niedbała <slawnied1234@gmail.com>
* Theo van Hoesel <Th.J.v.Hoesel+GitHub@gmail.com>
* Thomas Raith <thomas.raith@otrs.com>
* Thomas Wouters <thomas@sijn.org>
* Thorsten Eckel <te@znuny.com>
* Tim Puettmanns <tim.puettmanns@maxence.de>
* Tim Püttmanns <tim.puettmanns@maxence.de>
* Timo Gurr <timo.gurr@gmail.com>
* Torsten Thau <Torsten.Thau@cape-it.de>
* Udo Bretz <udo.bretz@otrs.com>
* Uwe Dieckmann <uwe.dieckmann@otrs.com>
* Walter Souto <walter.souto@saude.go.gov.br>
* Wojciech Kuchta <klapi85@gmail.com>
* Yuri Myasoedov <ymyasoedov@yandex.ru>
* Ziggy Trotter <142500923+ZTrotter@users.noreply.github.com>
* Znuny Weblate <do-not-reply@znuny.com>
* Zoran Ilibasic <zilibasic@s7designcreative.com>
* akmet <akmet@users.noreply.github.com>
* anonymous <unknown@anonymous>
* arlecchino <kolbma@users.noreply.github.com>
* b1-luettje <53084931+b1-luettje@users.noreply.github.com>
* djurici <igor.djuric@muehlbauer.de>
* forwwward <hello@forwwward.studio>
* itweserems <153607410+itweserems@users.noreply.github.com>
* jsinagowitz <91074418+jsinagowitz@users.noreply.github.com>
* juanmclavero <juanm.clavero@ibsalut.es>
* meisterheister <35762852+meisterheister@users.noreply.github.com>
Expand Down
Loading

0 comments on commit a918d60

Please sign in to comment.