[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Dolibarr-git] [Dolibarr/dolibarr] d848e9: Fix: add possibility to chang
|
From: |
Laurent Destailleur |
|
Subject: |
[Dolibarr-git] [Dolibarr/dolibarr] d848e9: Fix: add possibility to change width type to preve... |
|
Date: |
Fri, 11 Nov 2016 06:13:22 -0800 |
Branch: refs/heads/develop
Home: https://github.com/Dolibarr/dolibarr
Commit: d848e98759937e7b5f6e7e065f6734fe791571d7
https://github.com/Dolibarr/dolibarr/commit/d848e98759937e7b5f6e7e065f6734fe791571d7
Author: Regis Houssin <address@hidden>
Date: 2016-10-12 (Wed, 12 Oct 2016)
Changed paths:
M htdocs/core/lib/ajax.lib.php
Log Message:
-----------
Fix: add possibility to change width type to prevent some display issues
Commit: 6423b23fb3fc5a890ceddc778f367d56b3ed4529
https://github.com/Dolibarr/dolibarr/commit/6423b23fb3fc5a890ceddc778f367d56b3ed4529
Author: Regis Houssin <address@hidden>
Date: 2016-10-12 (Wed, 12 Oct 2016)
Changed paths:
M htdocs/core/lib/ajax.lib.php
Log Message:
-----------
Fix: use parameter instead constant
Commit: 8b16eeb55481da937a2927a4a255a52f74252c2d
https://github.com/Dolibarr/dolibarr/commit/8b16eeb55481da937a2927a4a255a52f74252c2d
Author: Regis Houssin <address@hidden>
Date: 2016-11-04 (Fri, 04 Nov 2016)
Changed paths:
M htdocs/viewimage.php
Log Message:
-----------
Fix: no login are required for fckeditor (external emailing)
Commit: 718adef600eaeda9e74fcef3eedfe88b63079a0c
https://github.com/Dolibarr/dolibarr/commit/718adef600eaeda9e74fcef3eedfe88b63079a0c
Author: Regis Houssin <address@hidden>
Date: 2016-11-04 (Fri, 04 Nov 2016)
Changed paths:
M htdocs/core/class/doleditor.class.php
M htdocs/core/filemanagerdol/connectors/php/config.php
Log Message:
-----------
Fix: external access of fkeditor image with multicompany
Commit: e33654cc459b21c847d3c65ebb8277f331b85806
https://github.com/Dolibarr/dolibarr/commit/e33654cc459b21c847d3c65ebb8277f331b85806
Author: Regis Houssin <address@hidden>
Date: 2016-11-04 (Fri, 04 Nov 2016)
Changed paths:
M htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
M htdocs/fourn/class/fournisseur.commande.class.php
M htdocs/langs/en_US/main.lang
M htdocs/margin/tabs/thirdpartyMargins.php
Log Message:
-----------
Merge remote-tracking branch 'origin/3.9' into 3.9_bug
Commit: f0151c5a4cb6d6d2bed15303382381be74083a87
https://github.com/Dolibarr/dolibarr/commit/f0151c5a4cb6d6d2bed15303382381be74083a87
Author: Laurent Destailleur <address@hidden>
Date: 2016-11-08 (Tue, 08 Nov 2016)
Changed paths:
M htdocs/core/class/doleditor.class.php
M htdocs/core/filemanagerdol/connectors/php/config.php
M htdocs/viewimage.php
Log Message:
-----------
Merge pull request #5955 from hregis/3.9_bug
FIX external access of fckeditor image (external emailing)
Commit: 0b594eab594d7df40e9ebb1443509ea59f481309
https://github.com/Dolibarr/dolibarr/commit/0b594eab594d7df40e9ebb1443509ea59f481309
Author: Marcos García de La Fuente <address@hidden>
Date: 2016-11-09 (Wed, 09 Nov 2016)
Changed paths:
M htdocs/comm/propal/class/propal.class.php
Log Message:
-----------
FIX #5966 Bug: getNomUrl tooltips show Proposal info even if user has no
rights to read them
Commit: c6f96a81d130a82fa1e21805212e419ae818b715
https://github.com/Dolibarr/dolibarr/commit/c6f96a81d130a82fa1e21805212e419ae818b715
Author: Marcos García de La Fuente <address@hidden>
Date: 2016-11-09 (Wed, 09 Nov 2016)
Changed paths:
M htdocs/comm/propal/class/propal.class.php
Log Message:
-----------
Little correction
Commit: 24c12df356a83fcb1bc44c72edac1533d4e49e10
https://github.com/Dolibarr/dolibarr/commit/24c12df356a83fcb1bc44c72edac1533d4e49e10
Author: philazerty <address@hidden>
Date: 2016-11-09 (Wed, 09 Nov 2016)
Changed paths:
M htdocs/langs/fr_FR/companies.lang
Log Message:
-----------
Update companies.lang
Ajout du Gabon
Commit: 9daac25519420e0ece7e2e19944a1cc4de58f933
https://github.com/Dolibarr/dolibarr/commit/9daac25519420e0ece7e2e19944a1cc4de58f933
Author: florian HENRY <address@hidden>
Date: 2016-11-10 (Thu, 10 Nov 2016)
Changed paths:
M htdocs/compta/facture/fiche-rec.php
Log Message:
-----------
Fix translation for CRON
Commit: c2ce5c4eeb3da051c1892371df34ddba0ceccd72
https://github.com/Dolibarr/dolibarr/commit/c2ce5c4eeb3da051c1892371df34ddba0ceccd72
Author: Laurent Destailleur <address@hidden>
Date: 2016-11-10 (Thu, 10 Nov 2016)
Changed paths:
M htdocs/contrat/services.php
Log Message:
-----------
FIX False positive on services not activated
Commit: 2b2bd03edadfdc2fa1efe3b9172ac09ef3c3fb1a
https://github.com/Dolibarr/dolibarr/commit/2b2bd03edadfdc2fa1efe3b9172ac09ef3c3fb1a
Author: Laurent Destailleur <address@hidden>
Date: 2016-11-11 (Fri, 11 Nov 2016)
Changed paths:
M htdocs/compta/facture/fiche-rec.php
Log Message:
-----------
Merge pull request #5971 from atm-florian/4.0
FIX : translation missing
Commit: 94544fb9aecb263b006cfa76593b605a2e006659
https://github.com/Dolibarr/dolibarr/commit/94544fb9aecb263b006cfa76593b605a2e006659
Author: Laurent Destailleur <address@hidden>
Date: 2016-11-11 (Fri, 11 Nov 2016)
Changed paths:
M htdocs/langs/fr_FR/companies.lang
Log Message:
-----------
Merge pull request #5968 from philazerty/patch-6
Update companies.lang
Commit: f7e780fa9e7abe30c2ff4651de595ff197ed3b0a
https://github.com/Dolibarr/dolibarr/commit/f7e780fa9e7abe30c2ff4651de595ff197ed3b0a
Author: Laurent Destailleur <address@hidden>
Date: 2016-11-11 (Fri, 11 Nov 2016)
Changed paths:
M htdocs/comm/propal/class/propal.class.php
Log Message:
-----------
Merge pull request #5967 from marcosgdf/bug-5966
FIX #5966 Bug: getNomUrl tooltips show Proposal info even if user has no rights
to read them
Commit: fd1c0f404c82e3dfd4882215f055e48ea87d4a30
https://github.com/Dolibarr/dolibarr/commit/fd1c0f404c82e3dfd4882215f055e48ea87d4a30
Author: Laurent Destailleur <address@hidden>
Date: 2016-11-11 (Fri, 11 Nov 2016)
Changed paths:
M htdocs/core/lib/ajax.lib.php
Log Message:
-----------
Merge pull request #5864 from hregis/4.0_bug
Fix: add possibility to change width type to prevent some display issues
Commit: e4617ec76ca53a3c025fa0309af194f203bc73c6
https://github.com/Dolibarr/dolibarr/commit/e4617ec76ca53a3c025fa0309af194f203bc73c6
Author: Laurent Destailleur <address@hidden>
Date: 2016-11-11 (Fri, 11 Nov 2016)
Changed paths:
M htdocs/comm/propal/class/propal.class.php
M htdocs/core/class/doleditor.class.php
M htdocs/core/filemanagerdol/connectors/php/config.php
M htdocs/langs/fr_FR/companies.lang
M htdocs/viewimage.php
Log Message:
-----------
Merge branch '3.9' of address@hidden:Dolibarr/dolibarr.git into 4.0
Conflicts:
htdocs/core/filemanagerdol/connectors/php/config.php
htdocs/viewimage.php
Commit: a605e0b972a5e6894bca972cecfe28800b4306a7
https://github.com/Dolibarr/dolibarr/commit/a605e0b972a5e6894bca972cecfe28800b4306a7
Author: Laurent Destailleur <address@hidden>
Date: 2016-11-11 (Fri, 11 Nov 2016)
Changed paths:
M htdocs/core/lib/ajax.lib.php
Log Message:
-----------
Fix phpcs
Commit: cd9f1db2298147e244072345cf7d08e9e5392a77
https://github.com/Dolibarr/dolibarr/commit/cd9f1db2298147e244072345cf7d08e9e5392a77
Author: Laurent Destailleur <address@hidden>
Date: 2016-11-11 (Fri, 11 Nov 2016)
Changed paths:
M htdocs/compta/facture/fiche-rec.php
M htdocs/contrat/services.php
M htdocs/core/class/doleditor.class.php
M htdocs/core/filemanagerdol/connectors/php/config.php
M htdocs/core/lib/ajax.lib.php
M htdocs/langs/fr_FR/companies.lang
M htdocs/viewimage.php
Log Message:
-----------
Merge branch '4.0' of address@hidden:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/comm/propal/class/propal.class.php
htdocs/compta/facture/fiche-rec.php
Compare:
https://github.com/Dolibarr/dolibarr/compare/614787c12340...cd9f1db22981