Skip to content

Commit

Permalink
Merge branch 'release/2.12.6' into support/2.12.0
Browse files Browse the repository at this point in the history
  • Loading branch information
btry committed Nov 22, 2022
2 parents 16451d9 + c2901a8 commit 0a43ab8
Show file tree
Hide file tree
Showing 6 changed files with 50 additions and 15 deletions.
30 changes: 30 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,33 @@
<a name="2.12.6"></a>
## [2.12.6](https://github.com/pluginsglpi/formcreator/compare/v2.12.5..2.12.6) (2022-05-19)


### Bug Fixes

* **abstracttarget:** retrieve sub itemtype from question ([eccf3d1a](https://github.com/pluginsglpi/formcreator/commit/eccf3d1a))
* **condition:** empty sql IN statement ([8e4d0491](https://github.com/pluginsglpi/formcreator/commit/8e4d0491))
* **dropdownfield,glpiselectfield:** shiw item ID only on user preference ([53dc3aeb](https://github.com/pluginsglpi/formcreator/commit/53dc3aeb))
* **form:** lightbulb always gray in darker theme ([76a42bb4](https://github.com/pluginsglpi/formcreator/commit/76a42bb4))
* **glpiselectfield:** bad WHERE criteria with entities ([154a3531](https://github.com/pluginsglpi/formcreator/commit/154a3531))
* **glpiselectfield:** comparison with regex ([e6986b04](https://github.com/pluginsglpi/formcreator/commit/e6986b04))
* **issue:** performance problem in sync issue query ([0e1761c9](https://github.com/pluginsglpi/formcreator/commit/0e1761c9))
* **issue:** performance problem in sync issue query ([74b38ec0](https://github.com/pluginsglpi/formcreator/commit/74b38ec0))
* **issue:** requester replaced by author on ticket update ([a8580a79](https://github.com/pluginsglpi/formcreator/commit/a8580a79))
* **issue:** sync issues problem when a ticket has several validators (backport 2.12) (#2971) ([e3011590](https://github.com/pluginsglpi/formcreator/commit/e3011590))
* **radiosfield:** accessibility from keyboard ([e528aae7](https://github.com/pluginsglpi/formcreator/commit/e528aae7))
* **targetticket:** assign group actor from object ([42aaadd4](https://github.com/pluginsglpi/formcreator/commit/42aaadd4))
* **textareafield:** compatibility with GLPI 9.10 ([a325a948](https://github.com/pluginsglpi/formcreator/commit/a325a948))
* **textareafield:** compatibility with GLPI 9.5.10 ([7f2ff1a9](https://github.com/pluginsglpi/formcreator/commit/7f2ff1a9))
* **textfield:** remove invalid '\r\n' tokens (#3065) ([da9d8dca](https://github.com/pluginsglpi/formcreator/commit/da9d8dca))
* **wizard:** bad label when searching KB items ([f469d048](https://github.com/pluginsglpi/formcreator/commit/f469d048))


### Features

* **ldapselectfield:** lazy loading ([1afc6753](https://github.com/pluginsglpi/formcreator/commit/1afc6753))



<a name="v2.12.5"></a>
## [v2.12.5](https://github.com/pluginsglpi/formcreator/compare/v2.12.4..v2.12.5) (2022-02-23)

Expand Down
Binary file modified locales/tr_TR.mo
Binary file not shown.
24 changes: 12 additions & 12 deletions locales/tr_TR.po
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ msgstr[1] "Formlar"

#: hook.php:590
msgid "Cancel my ticket"
msgstr "Çağrı kaydımı iptal et"
msgstr "Destek kaydımı iptal et"

#: setup.php:274 inc/form.class.php:111 inc/formlist.class.php:55
#: inc/formlist.class.php:56
Expand Down Expand Up @@ -201,7 +201,7 @@ msgstr "sorunun yanıtına eşit olan"

#: inc/abstracttarget.class.php:233
msgid "calculated from the ticket creation date"
msgstr "çağrı oluşturma zamanından hesaplanan"
msgstr "destek kaydı oluşturma zamanından hesaplanan"

#: inc/abstracttarget.class.php:234
msgid "calculated from the answer to the question"
Expand Down Expand Up @@ -300,7 +300,7 @@ msgstr "Önem düzeyi"

#: inc/abstracttarget.class.php:1263
msgid "Ticket tags"
msgstr "Çağrı etiketleri"
msgstr "Destek kaydı etiketleri"

#: inc/abstracttarget.class.php:1311
msgid "Tags"
Expand Down Expand Up @@ -961,11 +961,11 @@ msgstr[1] "Sorunlar"

#: inc/issue.class.php:53
msgid "Update issue data from tickets and form answers"
msgstr "Sorun verileri çağrı kaydı ve form yanıtlarından güncellensin"
msgstr "Sorun verileri destek kaydı ve form yanıtlarından güncellensin"

#: inc/issue.class.php:612
msgid "Ticket approver"
msgstr "Çağrı kaydını onaylayan"
msgstr "Destek kaydını onaylayan"

#: inc/issue.class.php:730
msgid "Not validated"
Expand Down Expand Up @@ -1234,8 +1234,8 @@ msgstr "Hedefin oluşturulacağı koşul"
#: inc/targetticket.class.php:52 inc/targetticket.class.php:182
msgid "Target ticket"
msgid_plural "Target tickets"
msgstr[0] "Hedef çağrı"
msgstr[1] "Hedef çağrılar"
msgstr[0] "Hedef destek kaydı"
msgstr[1] "Hedef destek kayıtları"

#: inc/targetticket.class.php:94
msgid "None"
Expand All @@ -1255,23 +1255,23 @@ msgstr "Belirli tür"

#: inc/targetticket.class.php:125 inc/targetticket.class.php:185
msgid "Ticket title"
msgstr "Çağrı başlığı"
msgstr "Destek kaydı başlığı"

#: inc/targetticket.class.php:255
msgid "Add validation message as first ticket followup"
msgstr "İlk çağrı izlemesine değerlendirme iletisi eklensin"
msgstr "İlk destek kaydı izlemesine değerlendirme iletisi eklensin"

#: inc/targetticket.class.php:309
msgid "Link to an other ticket"
msgstr "Başka bir çağrıya bağlantı"
msgstr "Başka bir destek kaydıyla bağlantı"

#: inc/targetticket.class.php:318
msgid "An other destination of this form"
msgstr "Bu form için farklı bir hedef"

#: inc/targetticket.class.php:319
msgid "An existing ticket"
msgstr "Var olan bir çağrı"
msgstr "Var olan bir destek kaydı"

#: inc/targetticket.class.php:628
msgid "Invalid link type"
Expand Down Expand Up @@ -1425,7 +1425,7 @@ msgstr "ODA"

#: inc/field/dropdownfield.class.php:138
msgid "Show ticket categories"
msgstr "Çağrı kategorilerini görüntüle"
msgstr "Destek kaydı kategorilerini görüntüle"

#: inc/field/dropdownfield.class.php:143 inc/field/dropdownfield.class.php:145
msgid "Request categories"
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,5 @@
"tag": true
}
},
"version": "2.12.5"
"version": "2.12.6"
}
5 changes: 5 additions & 0 deletions plugin.xml
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,11 @@ Features
<compatibility>~10.0</compatibility>
<download_url>https://github.com/pluginsGLPI/formcreator/releases/download/2.13.0-alpha.1/glpi-formcreator-2.13.0-alpha.1.tar.bz2</download_url>
</version>
<version>
<num>2.12.6</num>
<compatibility>~9.5.5</compatibility>
<download_url>https://github.com/pluginsGLPI/formcreator/releases/download/v2.12.6/glpi-formcreator-2.12.6.tar.bz2</download_url>
</version>
<version>
<num>2.12.5</num>
<compatibility>~9.5.5</compatibility>
Expand Down
4 changes: 2 additions & 2 deletions setup.php
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,11 @@

global $CFG_GLPI;
// Version of the plugin (major.minor.bugfix)
define('PLUGIN_FORMCREATOR_VERSION', '2.12.5');
define('PLUGIN_FORMCREATOR_VERSION', '2.12.6');
// Schema version of this version (major.minor only)
define('PLUGIN_FORMCREATOR_SCHEMA_VERSION', '2.12');
// is or is not an official release of the plugin
define('PLUGIN_FORMCREATOR_IS_OFFICIAL_RELEASE', false);
define('PLUGIN_FORMCREATOR_IS_OFFICIAL_RELEASE', true);

// Minimal GLPI version, inclusive
define ('PLUGIN_FORMCREATOR_GLPI_MIN_VERSION', '9.5');
Expand Down

0 comments on commit 0a43ab8

Please sign in to comment.