Skip to content

Commit

Permalink
Merge branch 'release/2.10.0' into support/2.10.0
Browse files Browse the repository at this point in the history
  • Loading branch information
btry committed Jun 24, 2020
2 parents 4565197 + 1bb874d commit 426a16b
Show file tree
Hide file tree
Showing 4 changed files with 68 additions and 2 deletions.
61 changes: 61 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,64 @@
<a name="2.10.0"></a>
# [2.10.0](https://github.com/pluginsglpi/formcreator/compare/v2.10.0-rc.1...v2.10.0) (2020-06-23)


### Bug Fixes

* **category:** entity restriction not applied ([333fefe](https://github.com/pluginsglpi/formcreator/commit/333fefe))
* **dropdownfield:** empty dropdown ([324bd74](https://github.com/pluginsglpi/formcreator/commit/324bd74))
* **form:** bad expression to acess form name ([d7dda48](https://github.com/pluginsglpi/formcreator/commit/d7dda48))
* **form:** duplication exception ([#1818](https://github.com/pluginsglpi/formcreator/issues/1818)) ([c66e518](https://github.com/pluginsglpi/formcreator/commit/c66e518))
* **form:** export versin number as string ([475e190](https://github.com/pluginsglpi/formcreator/commit/475e190))
* **form:** php warning in import ([db49e89](https://github.com/pluginsglpi/formcreator/commit/db49e89))
* **formanswer:** view of textarea with rich text ([c175396](https://github.com/pluginsglpi/formcreator/commit/c175396))
* **import:** more explicit error message ([8bb3c3d](https://github.com/pluginsglpi/formcreator/commit/8bb3c3d))
* **issue:** cancel ticket with simplified service catalog ([b46b64f](https://github.com/pluginsglpi/formcreator/commit/b46b64f))
* **item_targetticket:** bad relation expression for SQL ([4565197](https://github.com/pluginsglpi/formcreator/commit/4565197))
* **question:** delete all conditions of a question being deleted ([8ba3031](https://github.com/pluginsglpi/formcreator/commit/8ba3031))
* **target_actor:** bad key for users, groups or suppliers ([6e05962](https://github.com/pluginsglpi/formcreator/commit/6e05962))
* **target_actor:** make string localazable ([bc4befe](https://github.com/pluginsglpi/formcreator/commit/bc4befe))
* **target_actor:** tell the ID of missing actor ([81a6c01](https://github.com/pluginsglpi/formcreator/commit/81a6c01))
* **targettichet,targetchange:** question tags not updated on duplication ([22f765d](https://github.com/pluginsglpi/formcreator/commit/22f765d))
* bad redirection ([3ba9748](https://github.com/pluginsglpi/formcreator/commit/3ba9748))
* other bad redirections ([6869b64](https://github.com/pluginsglpi/formcreator/commit/6869b64))


### Features

* **glpiselectfield:** support for new passive DC equipment ([41e59c1](https://github.com/pluginsglpi/formcreator/commit/41e59c1))



## [2.10.0](https://github.com/pluginsglpi/formcreator/compare/v2.10.0-rc.1..v2.10.0) (2020-06-23)


### Bug Fixes

* bad redirection ([3ba9748f](https://github.com/pluginsglpi/formcreator/commit/3ba9748f))
* other bad redirections ([6869b646](https://github.com/pluginsglpi/formcreator/commit/6869b646))
* **category:** entity restriction not applied ([333fefe0](https://github.com/pluginsglpi/formcreator/commit/333fefe0))
* **dropdownfield:** empty dropdown ([324bd74f](https://github.com/pluginsglpi/formcreator/commit/324bd74f))
* **form:** bad expression to acess form name ([d7dda48b](https://github.com/pluginsglpi/formcreator/commit/d7dda48b))
* **form:** duplication exception (#1818) ([c66e5187](https://github.com/pluginsglpi/formcreator/commit/c66e5187))
* **form:** export versin number as string ([475e1902](https://github.com/pluginsglpi/formcreator/commit/475e1902))
* **form:** php warning in import ([db49e89a](https://github.com/pluginsglpi/formcreator/commit/db49e89a))
* **formanswer:** view of textarea with rich text ([c1753960](https://github.com/pluginsglpi/formcreator/commit/c1753960))
* **import:** more explicit error message ([8bb3c3d7](https://github.com/pluginsglpi/formcreator/commit/8bb3c3d7))
* **issue:** cancel ticket with simplified service catalog ([b46b64f5](https://github.com/pluginsglpi/formcreator/commit/b46b64f5))
* **item_targetticket:** bad relation expression for SQL ([45651977](https://github.com/pluginsglpi/formcreator/commit/45651977))
* **question:** delete all conditions of a question being deleted ([8ba30316](https://github.com/pluginsglpi/formcreator/commit/8ba30316))
* **target_actor:** bad key for users, groups or suppliers ([6e059627](https://github.com/pluginsglpi/formcreator/commit/6e059627))
* **target_actor:** make string localazable ([bc4befed](https://github.com/pluginsglpi/formcreator/commit/bc4befed))
* **target_actor:** tell the ID of missing actor ([81a6c01d](https://github.com/pluginsglpi/formcreator/commit/81a6c01d))
* **targettichet,targetchange:** question tags not updated on duplication ([22f765d8](https://github.com/pluginsglpi/formcreator/commit/22f765d8))


### Features

* **glpiselectfield:** support for new passive DC equipment ([41e59c10](https://github.com/pluginsglpi/formcreator/commit/41e59c10))



<a name="2.10.0-rc.1"></a>
# [2.10.0-rc.1](https://github.com/pluginsglpi/formcreator/compare/v2.10.0-beta.1...v2.10.rc.1) (2020-06-10)

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.10.0-rc.1"
"version": "2.10.0"
}
5 changes: 5 additions & 0 deletions plugin.xml
Original file line number Diff line number Diff line change
Expand Up @@ -314,6 +314,11 @@ Features
<compatibility>9.4</compatibility>
<compatibility>9.5</compatibility>
</version>
<version>
<num>2.10.0</num>
<compatibility>9.4</compatibility>
<compatibility>9.5</compatibility>
</version>
</versions>
<langs>
<lang>ca_ES</lang>
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.10.0-rc.1');
define('PLUGIN_FORMCREATOR_VERSION', '2.10.0');
// Schema version of this version
define('PLUGIN_FORMCREATOR_SCHEMA_VERSION', '2.10');
// is or is not an official release of the plugin
Expand Down

0 comments on commit 426a16b

Please sign in to comment.