From scm@users.codelutin.com Tue Apr 18 15:21:50 2017 From: "codelutin.com scm" To: faxtomail-commits@list.forge.codelutin.com Subject: [Faxtomail-commits] branch develop updated (6b973ee -> bbc51af) Date: Tue, 18 Apr 2017 15:21:50 +0200 Message-ID: <20170418132150.26624.38839@bihar.codelutin.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============8881630658992868715==" --===============8881630658992868715== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable This is an automated email from the git hooks/post-receive script. New change to branch develop in repository faxtomail. See https://gitlab.nuiton.org/codelutin/faxtomail.git from 6b973ee fix typo new 511972c ajout d'un libell=C3=A9 new bbc51af mauvaise r=C3=A9cursivit=C3=A9 The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit bbc51afa6ae259ba4d16b622020488e42e4ab2ff Author: Kevin Morin Date: Tue Apr 18 15:21:32 2017 +0200 mauvaise r=C3=A9cursivit=C3=A9 commit 511972c3571afca24d0b2c2bc580a99e441419a4 Author: Kevin Morin Date: Tue Apr 18 15:21:17 2017 +0200 ajout d'un libell=C3=A9 Summary of changes: .../main/resources/i18n/faxtomail-ui-swing_fr_FR.properties | 2 +- faxtomail-ui-web/src/main/webapp/js/configuration.js | 11 ++++++---= -- 2 files changed, 7 insertions(+), 6 deletions(-) --=20 To stop receiving notification emails like this one, please contact codelutin.com SCM administrator . --===============8881630658992868715==-- From scm@users.codelutin.com Tue Apr 18 15:21:50 2017 From: "codelutin.com scm" To: faxtomail-commits@list.forge.codelutin.com Subject: [Faxtomail-commits] 01/02: ajout d'un =?utf-8?q?libell=C3=A9?= Date: Tue, 18 Apr 2017 15:21:51 +0200 Message-ID: <20170418132150.88A275C0305@goh.codelutin.com> In-Reply-To: <20170418132150.26624.38839@bihar.codelutin.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============1197657668671945955==" --===============1197657668671945955== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository faxtomail. See https://gitlab.nuiton.org/codelutin/faxtomail.git commit 511972c3571afca24d0b2c2bc580a99e441419a4 Author: Kevin Morin Date: Tue Apr 18 15:21:17 2017 +0200 ajout d'un libell=C3=A9 --- .../src/main/resources/i18n/faxtomail-ui-swing_fr_FR.properties | 2 = +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/faxtomail-ui-swing/src/main/resources/i18n/faxtomail-ui-swing_fr= _FR.properties b/faxtomail-ui-swing/src/main/resources/i18n/faxtomail-ui-swin= g_fr_FR.properties index a20908e..1983655 100644 --- a/faxtomail-ui-swing/src/main/resources/i18n/faxtomail-ui-swing_fr_FR.pro= perties +++ b/faxtomail-ui-swing/src/main/resources/i18n/faxtomail-ui-swing_fr_FR.pro= perties @@ -319,7 +319,7 @@ faxtomail.reply.label.to=3D=C3=80 \: faxtomail.reply.message=3D

Le %s, %s a =C3=A9crit \:<= /p>

faxtomail.reply.subject=3DRe \: %s faxtomail.reply.title=3DR=C3=A9ponse =C3=A0 \: %s -faxtomail.reply.titleForward=3D +faxtomail.reply.titleForward=3DTransfert =C3=A0 \: %s faxtomail.search.action.error=3DErreur lors de la recherche faxtomail.search.action.gotoFolder=3DAller au dossier faxtomail.search.action.gotoFolder.tip=3DAller au dossier --=20 To stop receiving notification emails like this one, please contact codelutin.com SCM administrator . --===============1197657668671945955==-- From scm@users.codelutin.com Tue Apr 18 15:21:50 2017 From: "codelutin.com scm" To: faxtomail-commits@list.forge.codelutin.com Subject: [Faxtomail-commits] 02/02: mauvaise =?utf-8?q?r=C3=A9cursivit?= =?utf-8?q?=C3=A9?= Date: Tue, 18 Apr 2017 15:21:52 +0200 Message-ID: <20170418132150.B45FF5D737F@goh.codelutin.com> In-Reply-To: <20170418132150.26624.38839@bihar.codelutin.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============2825886035260969058==" --===============2825886035260969058== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository faxtomail. See https://gitlab.nuiton.org/codelutin/faxtomail.git commit bbc51afa6ae259ba4d16b622020488e42e4ab2ff Author: Kevin Morin Date: Tue Apr 18 15:21:32 2017 +0200 mauvaise r=C3=A9cursivit=C3=A9 --- faxtomail-ui-web/src/main/webapp/js/configuration.js | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/faxtomail-ui-web/src/main/webapp/js/configuration.js b/faxtomail= -ui-web/src/main/webapp/js/configuration.js index e51f027..db18730 100644 --- a/faxtomail-ui-web/src/main/webapp/js/configuration.js +++ b/faxtomail-ui-web/src/main/webapp/js/configuration.js @@ -860,6 +860,12 @@ ConfigurationModule.controller('ConfigurationTreeControl= ler', ['$scope', '$windo =20 var updateParentScopeValues =3D function(folder) { if (folder) { + + // move to parent first to keed parent order for collection + if (folder.$parent) { + updateParentScopeValues(folder.$parent); + }; + // take current folder first before parent values (warn about 'undef= ined' and 'false') if (angular.isUndefined($scope.parentScopeValues.allowCreateDemandIn= toFolder)) { $scope.parentScopeValues.allowCreateDemandIntoFolder =3D folder.al= lowCreateDemandIntoFolder; @@ -952,11 +958,6 @@ ConfigurationModule.controller('ConfigurationTreeControl= ler', ['$scope', '$windo $scope.parentScopeValues.invalidFormDisabledActions =3D folder.inv= alidFormDisabledActions; } =20 - // move to parent first to keed parent order for collection - if (folder.$parent) { - updateParentScopeValues(folder.$parent); - }; - // parents values if (folder.replyAddresses) { $scope.parentScopeValues.replyAddresses =3D $scope.parentScopeValu= es.replyAddresses.concat(folder.replyAddresses); --=20 To stop receiving notification emails like this one, please contact codelutin.com SCM administrator . --===============2825886035260969058==--