Resolve "cancel button has no effect (apply template)"

See merge request fusiondirectory/fd!412

issue #5797

Resolve "hash_equals is not available in PHP 5.4"

See merge request fusiondirectory/fd!398

issue #5890

Merge branch '5878-increment-fusiondirectory-version-for-the-1-2-2-fixes-version' into '1.2.2-fixes'

Resolve "increment FusionDirectory version for the 1.2.2-fixes version"

See merge request fusiondirectory/fd!377

Signed-off-by: Benoit Mortier <benoit.mortier@opensides.be>

Merge 1.2.1 fixes into master

See merge request fusiondirectory/fd!374

Resolve "update the UPGRADE.md for 1.2.2"

See merge request fusiondirectory/fd!373

Fixed also old debian extra urls repositories

Signed-off-by: Benoit Mortier <benoit.mortier@opensides.be>

Resolve "Update manpages for 1.2.2"

See merge request fusiondirectory/fd!372

Signed-off-by: Benoit Mortier <benoit.mortier@opensides.be>

Resolve "Update AUTHORS.md for 1.2.2"

See merge request fusiondirectory/fd!371

Signed-off-by: Benoit Mortier <benoit.mortier@opensides.be>

Resolve "Create a changelog for 1.2.2"

See merge request fusiondirectory/fd!369

Signed-off-by: Benoit Mortier <benoit.mortier@opensides.be>

Resolve "rewrote AUTHORS in markdown"

See merge request fusiondirectory/fd!367

Signed-off-by: Benoit Mortier <benoit.mortier@opensides.be>

Resolve "Increment FusionDirectory version for 1.2.2"

See merge request fusiondirectory/fd!363

Signed-off-by: Benoit Mortier <benoit.mortier@opensides.be>

Resolve "Updates the locales for 1.2.2"

See merge request fusiondirectory/fd!361

Signed-off-by: Benoit Mortier <benoit.mortier@opensides.be>

Resolve "HTML is not escaped in departments descriptions" in 1.2.1-fixes

See merge request fusiondirectory/fd!359

issue #5868

Merge branch '5864-name-field-for-countries-should-be-limited-to-two-characters' into '1.2.1-fixes'

See merge request fusiondirectory/fd!352

Resolve "Name field for countries should be limited to two characters"

See merge request fusiondirectory/fd!350

(cherry picked from commit eef5e5ad)

89af097f  fix(country) Country c field is not a name but a two-letter country code

Merge branch '5789-ldif-import-can-trigger-php-errors-on-empty-file' into '1.2.1-fixes'

See merge request fusiondirectory/fd!343

Merge branch '5824-ldif-generation-does-not-respect-tls-setting' into '1.2.1-fixes'

See merge request fusiondirectory/fd!344

Merge branch '5816-blacklist-is-not-reset-correctly-for-userattribute' into '1.2.1-fixes'

See merge request fusiondirectory/fd!342

Merge branch '5730-php-error-htmlentities-expects-parameter-… into '1.2.1-fixes'

See merge request fusiondirectory/fd!341

Resolve "LDIF import can trigger PHP errors on empty file"

Closes #5789

See merge request fusiondirectory/fd!160

(cherry picked from commit f4c6e744)

f052e1c9  fix(ldap) Return number of entry imported and avoid PHP errors

Resolve "LDIF generation does not respect STARTTLS setting"

See merge request fusiondirectory/fd!251

(cherry picked from commit d7485a64)

d9f45f54  fix(ldap) Use STARTTLS in LDIF export if needed

Resolve "Blacklist is not reset correctly for UserAttribute"

See merge request fusiondirectory/fd!233

(cherry picked from commit c9d6d88b)

73eca226  fix(UserAttribute) Reset blacklist and whitlist to avoid problems

Merge branch '5730-php-error-htmlentities-expects-parameter-1-to-be-string-array-given-usr-share-fusiondirectory-include-simpleplugin-class_attribute-inc-line-563' into '1.3-dev'

Resolve "PHP error: htmlentities() expects parameter 1 to be string, array given (/usr/share/fusiondirectory/include/simpleplugin/class_Attribute.inc, line 563)"

See merge request fusiondirectory/fd!72

(cherry picked from commit 87ca56dd)

054d5f34  fix(simpleplugin): Fix PHP error in readonly mode

Merge branch '5843-security-insecure-generation-of-random-tokens' into '1.2.1-fixes'

See merge request fusiondirectory/fd!326

Resolve "Security: Insecure Generation of Random Tokens"

See merge request fusiondirectory/fd!325

(cherry picked from commit 2faf258b)

9af5ac62  fix(core) Give using unpack for bytes conversion

Merge branch '5843-security-insecure-generation-of-random-tokens' into '1.2.1-fixes'

See merge request fusiondirectory/fd!323

Resolve "Security: Insecure Generation of Random Tokens"

See merge request fusiondirectory/fd!322

(cherry picked from commit 697eff83)

4abf4588  fix(core) Avoid crash on 32-bits systems for random_int fallback

Merge branch '5843-security-insecure-generation-of-random-tokens' into '1.2.1-fixes'

See merge request fusiondirectory/fd!320

Resolve "Security: Insecure Generation of Random Tokens"

See merge request fusiondirectory/fd!319

(cherry picked from commit 6d0aba68)

a8f4d2eb  fix(core) Fix 2 problems in random_int fallback

Merge branch '5851-creating-a-user-from-a-template-with…' into '1.2.1-fixes'

See merge request fusiondirectory/fd!317