Commit d62a0308 authored by bmortier's avatar bmortier

Merge branch '1.3-dev' into HEAD

Signed-off-by: bmortier's avatarBenoit Mortier <benoit.mortier@opensides.be>
parents 028dc77e ad345621

Too many changes to show.

To preserve performance only 1000 of 1000+ files are displayed.

......@@ -32,7 +32,55 @@ create_php_lint_rapport_stretch:
script:
- find . -type f -name '*.php' -o -name '*.inc' -print0 | xargs -0 -n1 php -l
## Stage transifex
## Stage codestyle
# PHP codesniffer
create_php_code_sniffer_rapport_13:
stage: codestyle
only:
- branches
before_script:
- apt-get update -qq
- apt-get install -y -qq git php-cli php-codesniffer
script:
- git clone https://gitlab.fusiondirectory.org/fusiondirectory/dev-tools.git -b 1.3 ../dev-tools
- find . -type f -name '*.php' -o -name '*.inc' > ./filelist
- phpcs --ignore=class_sieve.inc --standard=../dev-tools/php-codesniffer-rules/FDStandard/ruleset.xml --file-list=./filelist
# Sonar publishing
sonar_publish:
image: sonar-cli:3.1.0.1141
stage: codestyle
only:
- 1.3-dev
script:
- /home/sonar/*/bin/sonar-scanner
-D sonar.projectKey=fusiondirectory-plugins-dev
-D sonar.projectName=FusionDirectory-Plugins-Dev
-D sonar.projectVersion=1.3
-D sonar.sourceEncoding=UTF-8
-D sonar.exclusions='mail/personal/mail/class_sieve.inc'
-D sonar.gitlab.project_id="$CI_PROJECT_PATH"
-D sonar.gitlab.commit_sha="$CI_COMMIT_SHA"
-D sonar.gitlab.ref_name="$CI_COMMIT_REF_NAME"
# Sonar preview
sonar_preview:
image: sonar-cli:3.1.0.1141
stage: codestyle
except:
- 1.3-dev
script:
- /home/sonar/*/bin/sonar-scanner
-D sonar.projectKey=fusiondirectory-plugins-dev
-D sonar.projectName=FusionDirectory-Plugins-Dev
-D sonar.projectVersion=1.3
-D sonar.sourceEncoding=UTF-8
-D sonar.exclusions='mail/personal/mail/class_sieve.inc'
-D sonar.gitlab.project_id="$CI_PROJECT_PATH"
-D sonar.gitlab.commit_sha="$CI_COMMIT_SHA"
-D sonar.gitlab.ref_name="$CI_COMMIT_REF_NAME"
-D sonar.analysis.mode=preview
# fusiondirectory-update-locale
fusiondirectory-update-locale:
......
### Description
<!-- Required -->
<!-- Description of the issue -->
### Source FusionDirectory Version
<!-- Required -->
<!-- FusionDirectory version where the code come from -->
### Destination FusionDirectory Version
<!-- Required -->
<!-- FusionDirectory version where the code sould go -->
### Plugin with the new code
<!-- Required -->
<!-- Name of the plugin -->
### Reason of Backporting code
<!-- Required -->
### What defect does it correct
<!-- Required -->
<!-- Why do we backport this code -->
### Additional Information
<!-- optional -->
<!-- Any additional information, configuration or data that might be necessary to reproduce the issue. -->
### Description
<!-- Required -->
<!-- Description of the issue -->
### Distribution Name and Version
<!-- Required -->
<!-- Debian, Centos -->
### FusionDirectory Version
<!-- Required -->
### Plugin with the defect
<!-- Required -->
<!-- Name of the plugin -->
### PHP version used
<!-- Required -->
### Origin of php packages
<!-- Required -->
<!-- Distribution packages, Out of distribution -->
### Steps to Reproduce
<!-- Required -->
1. [First Step]
2. [Second Step]
3. [and so on...]
**Expected behavior:**
<!-- What you expect to happen-->
**Actual behavior:**
<!-- What actually happens -->
**Reproduces how often:**
<!-- What percentage of the time does it reproduce?-->
### Additional Information
<!-- optional -->
<!-- Any additional information, configuration or data that might be necessary to reproduce the issue. -->
### Requirements
* Filling out the template is required. Any Enhancement request that does not include enough information to be reviewed in a timely manner may be closed at the maintainers' discretion.
* All new code requires tests to ensure against regressions
## Descriptive title for this contribution
<!-- required -->
### Step by step description of this contribution
<!-- Required -->
1. [First Step]
2. [Second Step]
3. [and so on...]
### Schemas needed by this contribution
<!-- Describe if schema changes are needed by this contribution -->
<!-- Describe if new schemas are need for this contribution -->
### Benefits
<!-- Required -->
<!-- What benefits will be realized with this contribution ? -->
### Possible Drawbacks
<!-- optional -->
<!-- What are the possible side-effects or negative impacts of this contribution ? -->
### Actual use cases
<!-- optional -->
<!-- Enter any applicable Issues here -->
### Requirements
* Filling out the template is required. Any Enhancement request that does not include enough information to be reviewed in a timely manner may be closed at the maintainers' discretion.
* All new code requires tests to ensure against regressions
## Descriptive title for this enhancement
<!-- required -->
### Actual behavior
<!-- What actually happens -->
### Expected behavior
<!-- What you expect to happen-->
### Step by step description of new behaviour
<!-- Required -->
1. [First Step]
2. [Second Step]
3. [and so on...]
### Benefits
<!-- optional -->
<!-- What benefits will be realized by the code change? -->
### Possible Drawbacks
<!-- optional -->
<!-- What are the possible side-effects or negative impacts of the code change? -->
### Applicable Issues
<!-- optional -->
<!-- Enter any applicable Issues here -->
### Requirements
* Filling out the template is required. Any pull request that does not include enough information to be reviewed in a timely manner may be closed at the maintainers' discretion.
* All new code requires tests to ensure against regressions
## Title of the Pull Requests
<!-- required -->
### Description of the Change
<!-- required -->
<!-- can be an aglomeration of commits bodies -->
### Benefits
<!-- optional -->
<!-- What benefits will be realized by the code change? -->
### Possible Drawbacks
<!-- optional -->
<!-- What are the possible side-effects or negative impacts of the code change? -->
### Applicable Issues
<!-- optional -->
<!-- Enter any applicable Issues here -->
\ No newline at end of file
......@@ -2,252 +2,258 @@
host = https://www.transifex.com
type = PO