Resolve "merge the lighttpd from the debian package"

Closes #5776

See merge request fusiondirectory/fd!244

(cherry picked from commit d11c5f8e)

91f3b9a9  fix(lighttpd) merge the lighttpd from the debian package

Resolve "update locales for 1.2.1"

See merge request fusiondirectory/fd!243

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

Resolve "Make a changelog for 1.2.1"

See merge request fusiondirectory/fd!240

Added latest fixes

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

Merge branch '5774-add-artifcats-to-build' into '1.3-dev'

See merge request fusiondirectory/fd!232

Resolve "Add artifcats to build"

Closes #5774

See merge request fusiondirectory/fd!231

(cherry picked from commit 3b3879e4)

4a0e953f  fix(gitlab-ci): Use changelog.md for script in build tarball too

Resolve "Add artifcats to build"

See merge request fusiondirectory/fd!230

Use changelog.md for tarball release

Signed-off-by: Jonathan Swaelens <swaelens.jonathan@opensides.be>

Resolve "Several ImageAttribute on the same page does not work" in fixes

See merge request fusiondirectory/fd!227

issue #5815

Resolve "Pass the gitlab-ci update-transiflex only on the main branches"

See merge request fusiondirectory/fd!223

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

Resolve "remove the -tag from all stage except from the tarballs stage"

See merge request fusiondirectory/fd!218

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

Merge branch 'revert-5f944c7a' into '1.3-dev'

See merge request fusiondirectory/fd!216

Merge branch '5731-pass-the-gitlab-ci-update-transiflex-only-on-the-main-branches' into '1.3-dev'

See merge request fusiondirectory/fd!215

(cherry picked from commit ac3c226d)

81021641 Revert "Merge branch…

Resolve "Restructure gitlab-ci"

See merge request fusiondirectory/fd!209

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

Revert "Merge branch 'cherry-pick-3031ef5e' into '1.2-fixes'"

See merge request fusiondirectory/fd!214

This reverts merge request !213

Merge branch '5780-update-php-codesniffer-gitlab-ci-so-that-it-stop-on-error' into '1.3-dev'

See merge request fusiondirectory/fd!213

Resolve "Update php-codesniffer gitlab-ci so that it stop on error"

Closes #5780

See merge request fusiondirectory/fd!149

(cherry picked from commit 3031ef5e)

f3e9714f  fix(gitlab-ci) Update php-codesniffer gitlab-ci

Merge branch…

See merge request fusiondirectory/fd!212

Merge branch '5781-il-nous-faut-jessie-et-stretch-pour-le-lint-php-dans-la-ci-de-fusiondirectory' into '1.3-dev'

Resolve "Il nous faut jessie et stretch pour le lint php dans la ci  de fusiondirectory"

Closes #5781

See merge request fusiondirectory/fd!150

(cherry picked from commit c96470f6)

4c9d3b79  feat(gitlab-ci): Add stage for php lint in jessie and stretch
eb00d0fa  fix(gitlab-ci): Change the names of the gitlab-ci job
ac386d55  fix(gitlab-ci): Set phpcs stage after the php lint stages
0f534ac5  fix(gitlab-ci): Add correct docker image name
c5aeb5ce  fix(gitlab-ci): Fix cli-stretch image for php lint
568d77cc  feat(gitlab-ci): Sort the stages for gitlab-ci
fb4bfcd6  feat(gitlab-ci): Modify the name stage for codestyle

Merge branch '5774-add-artifcats-to-build' into '1.3-dev'

See merge request fusiondirectory/fd!211

Resolve "Add artifcats to build"

Closes #5774

See merge request fusiondirectory/fd!169

(cherry picked from commit c1b30898)

52adb9e1  feat(gitlab-ci): Add release tarballs in CI

Merge branch '5774-add-artifcats-to-build' into '1.3-dev'

See merge request fusiondirectory/fd!210

Resolve "Add artifcats to build"

See merge request fusiondirectory/fd!146

(cherry picked from commit 3e6c181b)

c559655c  feature(artifacts): Add artifcats to build
c82a45b7  feat(gitlab-ci): Change the path section for artifacts
cdea3dba  fix(gitlab-ci): Set the good path for the artifact

Merge branch '5790-locking-fails-with-multiple-ssh-keys' into fixes

See merge request fusiondirectory/fd!204

Resolve "Locking fails with multiple SSH Keys"

See merge request fusiondirectory/fd!161

(cherry picked from commit f65c70a1)

edb76c92  fix(ssh) Fix SSH locking with multiple keys

 fix(simpleplugin) Throw Exceptions when attributes are set to non-compatible types

See merge request fusiondirectory/fd!198

At least useful for webservice

issue #5807

Merge branch '5808-multibyte-functions-should-be-used-to-truncate-strings' into fixes

See merge request fusiondirectory/fd!196

Resolve "multibyte functions should be used to truncate strings"

See merge request fusiondirectory/fd!194

(cherry picked from commit c1bac018)

a24e21e8  fix(users) Use mb_substr instead of substr

Merge branch '5800-in-certain-occasion-like-cancel-an-apply-… into fixes

See merge request fusiondirectory/fd!195

Merge branch '5800-in-certain-occasion-like-cancel-an-apply-template-end-of-a-delete-or-move-i-got-an-ldap-error' into '1.3-dev'

Resolve "In certain occasion, like cancel an apply template, end of a delete or move i got an ldap error"

See merge request fusiondirectory/fd!191

(cherry picked from commit dce6f964)

8ee44b68  fix(simpleplugin) Return proper error when no DN could be computed

 fix(upgrade): Move UPGRADE to UPGRADE.md

See merge request fusiondirectory/fd!190

cherry pick by hand of #5806



because cherry-pick from 1.3-dev to 1.2-fixes was not working

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