Skip to content

Commit

Permalink
Merge branch 'release/2.11.1' into support/2.11.0
Browse files Browse the repository at this point in the history
  • Loading branch information
btry committed Feb 3, 2021
2 parents a9dd24b + 9f73cbc commit d53b6dd
Show file tree
Hide file tree
Showing 7 changed files with 53 additions and 29 deletions.
18 changes: 18 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,21 @@
## [2.11.1](https://github.com/pluginsglpi/formcreator/compare/v2.11.0...v2.11.1) (2021-02-03)


### Bug Fixes

* **dropdownfield:** add security token for GLPI 9.5.3 ([44b5244](https://github.com/pluginsglpi/formcreator/commit/44b5244d39bca5f0aafbaff409c6d98af6f6974d))
* inappropriate css loading ([bbde619](https://github.com/pluginsglpi/formcreator/commit/bbde619559c94cf3147ef4b1dd9b16768c6b4e34))
* **dropdownfield:** fix SQL error when translations are enabled ([0272721](https://github.com/pluginsglpi/formcreator/commit/0272721d5a0e8e38f45a6c842a2b79c707bd18b0))
* **dropdownfield:** wrong IDOR token construct ([1689ecb](https://github.com/pluginsglpi/formcreator/commit/1689ecb4b73afe8c3dfea02b6641e5ab49c51ad3))
* **filefield:** mandatory fails when file is uploaded ([58c2dd1](https://github.com/pluginsglpi/formcreator/commit/58c2dd19fe8f1f0b3f619cb88774e5b4d382ae2e))
* **form:** error message when anonymous form submitted ([a9dd24b](https://github.com/pluginsglpi/formcreator/commit/a9dd24bbeddf712978be0cfa3b63efc93f29d3e1))
* **install:** broken upgrade of target_actors ([40db225](https://github.com/pluginsglpi/formcreator/commit/40db225929f9763cdd2cf8bb2399972d49418fc2))
* **notificationtargetformanswer:** tags not fully rendered ([9c2620f](https://github.com/pluginsglpi/formcreator/commit/9c2620fc555859268be55e8c05c23aed091829ca))
* **question:** prevent bad request ([ac9f693](https://github.com/pluginsglpi/formcreator/commit/ac9f693a14add919412cc7a76c11c25348fa788d))
* **targetticket:** dropdowns for SLA/OLA ([9e5bd85](https://github.com/pluginsglpi/formcreator/commit/9e5bd8563381334edfad02fd265cab1b24ac2a88))



# [2.11.0](https://github.com/pluginsglpi/formcreator/compare/v2.11.0-beta.1...v2.11.0) (2021-01-26)


Expand Down
12 changes: 6 additions & 6 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file modified locales/pt_BR.mo
Binary file not shown.
43 changes: 22 additions & 21 deletions locales/pt_BR.po
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
# Pedro de Oliveira Lira <[email protected]>, 2020
# Eduardo Spinola <[email protected]>, 2020
# Jean Vergaças <[email protected]>, 2021
# Pablo Pierre Ferreira <[email protected]>, 2021
#
#, fuzzy
msgid ""
Expand All @@ -24,7 +25,7 @@ msgstr ""
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2021-01-26 12:55+0100\n"
"PO-Revision-Date: 2020-01-14 14:51+0000\n"
"Last-Translator: Jean Vergaças <jvergacas@gmail.com>, 2021\n"
"Last-Translator: Pablo Pierre Ferreira <pablo.terdulino@gmail.com>, 2021\n"
"Language-Team: Portuguese (Brazil) (https://www.transifex.com/teclib/teams/28042/pt_BR/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
Expand All @@ -40,7 +41,7 @@ msgstr[1] "Categorias dos Formulários"

#: hook.php:527
msgid "Cancel my ticket"
msgstr ""
msgstr "Cancelar meu chamado"

#: setup.php:233 inc/form.class.php:108 inc/formlist.class.php:55
#: inc/formlist.class.php:56
Expand Down Expand Up @@ -207,7 +208,7 @@ msgstr ""

#: inc/abstracttarget.class.php:219
msgid "Specific SLA"
msgstr ""
msgstr "SLA Específico"

#: inc/abstracttarget.class.php:220 inc/abstracttarget.class.php:228
#: inc/abstracttarget.class.php:236 inc/abstracttarget.class.php:244
Expand All @@ -223,7 +224,7 @@ msgstr ""

#: inc/abstracttarget.class.php:227
msgid "Specific OLA"
msgstr ""
msgstr "OLA Específico"

#: inc/abstracttarget.class.php:234
msgid "Urgency from template or Medium"
Expand Down Expand Up @@ -319,7 +320,7 @@ msgstr "Um alvo deve ser associado a um formulário existente."

#: inc/abstracttarget.class.php:1546
msgid "Name is required."
msgstr ""
msgstr "Um nome é necessário"

#: inc/abstracttarget.class.php:1573 inc/form.class.php:1348
msgid "The name cannot be empty!"
Expand Down Expand Up @@ -356,7 +357,7 @@ msgstr "Cancelar"

#: inc/abstracttarget.class.php:2029 inc/target_actor.class.php:64
msgid "Form author"
msgstr ""
msgstr "Por autor"

#: inc/abstracttarget.class.php:2032 inc/target_actor.class.php:65
msgid "Form validator"
Expand Down Expand Up @@ -401,8 +402,8 @@ msgstr ""
#: inc/condition.class.php:63
msgid "Condition"
msgid_plural "Conditions"
msgstr[0] ""
msgstr[1] ""
msgstr[0] "Confições"
msgstr[1] "Condições"

#: inc/condition.class.php:102
msgid "is visible"
Expand Down Expand Up @@ -481,7 +482,7 @@ msgstr ""

#: inc/entityconfig.class.php:163
msgid "Knowledge base"
msgstr ""
msgstr "Base de conhecimento"

#: inc/form.class.php:60 inc/form.class.php:348
msgid "Public access"
Expand Down Expand Up @@ -601,7 +602,7 @@ msgstr "Todos os formulários (validador)"

#: inc/form.class.php:1264 inc/form.class.php:1265
msgid "Are you a robot ?"
msgstr ""
msgstr "Você é um robô ?"

#: inc/form.class.php:1306
msgid "Validation"
Expand Down Expand Up @@ -747,11 +748,11 @@ msgstr "Link para o formulário"

#: inc/form_profile.class.php:113
msgid "Please activate the form to view the link"
msgstr ""
msgstr "Por favor, ative o formulário para visualizar o link"

#: inc/form_profile.class.php:121
msgid "Enable captcha"
msgstr ""
msgstr "Habilitar captcha"

#: inc/formanswer.class.php:62
msgid "Waiting"
Expand Down Expand Up @@ -870,7 +871,7 @@ msgstr[1] ""

#: inc/linker.class.php:78
msgid "Importing"
msgstr ""
msgstr "Importando"

#: inc/notificationtargetformanswer.class.php:43
msgid "The form as been saved"
Expand Down Expand Up @@ -1085,7 +1086,7 @@ msgstr "Mudar título"

#: inc/targetchange.class.php:408 inc/targetticket.class.php:222
msgid "Condition to create the target"
msgstr ""
msgstr "Condições de exibição do destino"

#: inc/targetticket.class.php:51 inc/targetticket.class.php:138
msgid "Target ticket"
Expand Down Expand Up @@ -1164,7 +1165,7 @@ msgstr "Minhas requisições de suporte"

#: inc/wizard.class.php:113 inc/wizard.class.php:114
msgid "Knowledge Base"
msgstr ""
msgstr "Base de conhecimento"

#: inc/wizard.class.php:121 inc/wizard.class.php:122
msgid "Book an asset"
Expand Down Expand Up @@ -1245,11 +1246,11 @@ msgstr "Um campo de descrição necessita de uma descrição:"

#: inc/field/dropdownfield.class.php:90
msgid "SLA"
msgstr ""
msgstr "SLA"

#: inc/field/dropdownfield.class.php:91
msgid "OLA"
msgstr ""
msgstr "OLA"

#: inc/field/dropdownfield.class.php:124
msgid "Show ticket categories"
Expand All @@ -1269,15 +1270,15 @@ msgstr "Mudar categorias"

#: inc/field/dropdownfield.class.php:159
msgid "Type"
msgstr ""
msgstr "Tipo"

#: inc/field/dropdownfield.class.php:164
msgid "Time to own"
msgstr ""
msgstr "Tempo para atribuição"

#: inc/field/dropdownfield.class.php:165
msgid "Time to resolve"
msgstr ""
msgstr "Tempo para solução"

#: inc/field/dropdownfield.class.php:445
#: inc/field/ldapselectfield.class.php:197
Expand All @@ -1289,7 +1290,7 @@ msgstr "Um campo obrigatório está vazio:"

#: inc/field/dropdownfield.class.php:472
msgid "Invalid value for "
msgstr ""
msgstr "Valor inválido para"

#: inc/field/dropdownfield.class.php:484
#, php-format
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,5 @@
}
},
"dependencies": [],
"version": "2.11.0"
"version": "2.11.1"
}
5 changes: 5 additions & 0 deletions plugin.xml
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,11 @@ Features
<author>Teclib'</author>
</authors>
<versions>
<version>
<num>2.11.1</num>
<compatibility>9.5.x</compatibility>
<download_url>https://github.com/pluginsGLPI/formcreator/releases/download/v2.11.1/glpi-formcreator-2.11.1.tar.bz2</download_url>
</version>
<version>
<num>2.11.0</num>
<compatibility>9.5.x</compatibility>
Expand Down
2 changes: 1 addition & 1 deletion setup.php
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@

global $CFG_GLPI;
// Version of the plugin
define('PLUGIN_FORMCREATOR_VERSION', '2.11.0');
define('PLUGIN_FORMCREATOR_VERSION', '2.11.1');
// Schema version of this version
define('PLUGIN_FORMCREATOR_SCHEMA_VERSION', '2.11');
// is or is not an official release of the plugin
Expand Down

0 comments on commit d53b6dd

Please sign in to comment.