Skip to content
GitLab
Commit 71c831dd authored by Benoit Mortier's avatar Benoit Mortier
Browse files

Merge branch '1.0.18-fixes'

parents 20c0279b 8bce5e35
dev 6104-mail-methods-refactor 6231-give-the-ability-to-the-webservice-to-notice-if-an-attribute-is-monovalued-or-multivalued 6237-add-requiredattrs-array-to-the-webservice-informations 6245-adapt-the-ci-to-the-reorganisation-of-the-dev-tools-and-fixing-the-trigger-downstream-pipelines 6250-supann-configuration-backend-requires-account-life-cycle-section 6280-plugins-update-plugins-to-take-into-consideration-the-new-directory-of-core-structure 6310-tasks-reminder-error-in-the-schema-duplicate-attribute-id 6311-put-the-version-1-5-in-all-yaml-for-fusiondirectory-1-5 6322-template-issue-when-creating-a-template-with-empty-password-error-message-should-not-be-seen-2 6332-zimbra-allows-update-of-data-for-unknown-domain-name-for-specific-individual-aliases 6337-webservice-issue-with-archiving-post-request-not-responding-but-successfully-archiving-user 6341-supann-extract-resources-states-sub-states-from-backend-configuration-to-their-own-objects 6346-lifecycle-adaptation-to-select-supann-resources-and-related-states-via-regex-mechanism master fusiondirectory-1.5 fusiondirectory-1.4 fusiondirectory-1.3.1 fusiondirectory-1.3 fusiondirectory-1.2.3 fusiondirectory-1.2.2 fusiondirectory-1.2.1 fusiondirectory-1.2 fusiondirectory-1.1.1 fusiondirectory-1.1 fusiondirectory-1.0.20 fusiondirectory-1.0.19
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 4 additions and 4 deletions
+4 -4
argonaut/addons/argonaut/deploy-list.xml
+ 1
− 1
View file @ 71c831dd
...@@ -95,7 +95,7 @@ ...@@ -95,7 +95,7 @@
<type>entry</type> <type>entry</type>
<image>geticon.php?context=actions&amp;icon=process-stop&amp;size=16</image> <image>geticon.php?context=actions&amp;icon=process-stop&amp;size=16</image>
<label>Abort</label> <label>Abort</label>
</action> </action>
<action> <action>
<type>separator</type> <type>separator</type>
......
mail/personal/mail/class_mail-methods.inc
+ 1
− 1
View file @ 71c831dd
...@@ -427,7 +427,7 @@ class mailMethod ...@@ -427,7 +427,7 @@ class mailMethod
This function is mainly used to read and write folder permissions. This function is mainly used to read and write folder permissions.
@return String A valid folder id @return String A valid folder id
*/ */
public function create_folder_id($folder, $type = "") public function create_folder_id($folder)
{ {
if (!empty($folder)) { if (!empty($folder)) {
$folder = trim(preg_replace("/^INBOX[\.\/]*/i", "", $folder)); $folder = trim(preg_replace("/^INBOX[\.\/]*/i", "", $folder));
......
supann/admin/supannStructures/class_etablissement.inc
+ 2
− 2
View file @ 71c831dd
...@@ -176,11 +176,11 @@ class etablissement extends simplePlugin ...@@ -176,11 +176,11 @@ class etablissement extends simplePlugin
} }
} }
$root_mode = 'add'; $root_mode = 'add';
} else if (($root_code !== FALSE) && ($root_code == $this->supannEtablissement) && $this->set_root) { } elseif (($root_code !== FALSE) && ($root_code == $this->supannEtablissement) && $this->set_root) {
/* We are the root etablissement, we need to update it */ /* We are the root etablissement, we need to update it */
$root_attrs = $this->attrs; $root_attrs = $this->attrs;
$root_mode = 'modify'; $root_mode = 'modify';
} else if (($root_code !== FALSE) && ($root_code == $this->supannEtablissement) && !$this->set_root) { } elseif (($root_code !== FALSE) && ($root_code == $this->supannEtablissement) && !$this->set_root) {
/* We are the root etablissement, we want to delete it */ /* We are the root etablissement, we want to delete it */
$root_mode = 'delete'; $root_mode = 'delete';
} }
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment