[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Dolibarr/dolibarr] bd6d49: FIX advanced target emailing sql and ergonom
|
From: |
Laurent Destailleur |
|
Subject: |
[Dolibarr/dolibarr] bd6d49: FIX advanced target emailing sql and ergonomy |
|
Date: |
Sat, 08 Feb 2020 07:01:47 -0800 |
Branch: refs/heads/develop
Home: https://github.com/Dolibarr/dolibarr
Commit: bd6d49f04a5ff374f4631950443518d51cbbed66
https://github.com/Dolibarr/dolibarr/commit/bd6d49f04a5ff374f4631950443518d51cbbed66
Author: atm-arnaud <address@hidden>
Date: 2020-02-06 (Thu, 06 Feb 2020)
Changed paths:
M htdocs/comm/mailing/class/advtargetemailing.class.php
M htdocs/core/tpl/advtarget.tpl.php
Log Message:
-----------
FIX advanced target emailing sql and ergonomy
Commit: 16fdab608977c175d267b29a8955d750cbb97f0f
https://github.com/Dolibarr/dolibarr/commit/16fdab608977c175d267b29a8955d750cbb97f0f
Author: ksar <address@hidden>
Date: 2020-02-06 (Thu, 06 Feb 2020)
Changed paths:
M htdocs/admin/tools/export_files.php
Log Message:
-----------
Update export_files.php
REmove the Warning
Commit: 23fc8321d5852b2d56f64523cea5d4114b3dab18
https://github.com/Dolibarr/dolibarr/commit/23fc8321d5852b2d56f64523cea5d4114b3dab18
Author: ksar <address@hidden>
Date: 2020-02-06 (Thu, 06 Feb 2020)
Changed paths:
M htdocs/admin/tools/export_files.php
Log Message:
-----------
FIX : Warning on admin/export_files
#13041
Commit: 387db16217fb998449e3aad73f2ede57259d73d1
https://github.com/Dolibarr/dolibarr/commit/387db16217fb998449e3aad73f2ede57259d73d1
Author: Laurent Destailleur <address@hidden>
Date: 2020-02-06 (Thu, 06 Feb 2020)
Changed paths:
M htdocs/core/class/CMailFile.class.php
Log Message:
-----------
FIX Filenames must not contains non ascii char or we will get non ascii
char into the SMTP header.
Conflicts:
htdocs/core/class/CMailFile.class.php
Commit: 78389e6c5dabb81db51119c79b310de226057be1
https://github.com/Dolibarr/dolibarr/commit/78389e6c5dabb81db51119c79b310de226057be1
Author: Laurent Destailleur <address@hidden>
Date: 2020-02-06 (Thu, 06 Feb 2020)
Changed paths:
Log Message:
-----------
Merge branch '9.0' of address@hidden:Dolibarr/dolibarr.git into 10.0
Commit: fe0d1a81ebe27b56bfe357e3dcc0cfc93b013a9c
https://github.com/Dolibarr/dolibarr/commit/fe0d1a81ebe27b56bfe357e3dcc0cfc93b013a9c
Author: Laurent Destailleur <address@hidden>
Date: 2020-02-06 (Thu, 06 Feb 2020)
Changed paths:
M htdocs/comm/action/peruser.php
M htdocs/core/lib/agenda.lib.php
Log Message:
-----------
Fix filter on current user is stupi on the view "per user".
Commit: 83598a0b5314fac0c1533621ff10e08f6e8f37cf
https://github.com/Dolibarr/dolibarr/commit/83598a0b5314fac0c1533621ff10e08f6e8f37cf
Author: Laurent Destailleur <address@hidden>
Date: 2020-02-06 (Thu, 06 Feb 2020)
Changed paths:
M htdocs/website/class/website.class.php
M htdocs/website/index.php
Log Message:
-----------
FIX After import of a website template, home page was not set
Commit: 45ba23da3ea3b7e7af2831de030eb40a671e8a53
https://github.com/Dolibarr/dolibarr/commit/45ba23da3ea3b7e7af2831de030eb40a671e8a53
Author: Regis Houssin <address@hidden>
Date: 2020-02-07 (Fri, 07 Feb 2020)
Changed paths:
M htdocs/user/card.php
Log Message:
-----------
FIX #13028
Commit: 84c1228ad4b00120fb2f5a539661e2ae11680c1d
https://github.com/Dolibarr/dolibarr/commit/84c1228ad4b00120fb2f5a539661e2ae11680c1d
Author: Laurent Destailleur <address@hidden>
Date: 2020-02-07 (Fri, 07 Feb 2020)
Changed paths:
M htdocs/core/class/html.formticket.class.php
M htdocs/ticket/card.php
Log Message:
-----------
FIX Disable ticket status change if ticket close
FIX Use ref into label of ticket message
Commit: 2eae9a2fa22001f03cf080d0a8968c30d3d3f11d
https://github.com/Dolibarr/dolibarr/commit/2eae9a2fa22001f03cf080d0a8968c30d3d3f11d
Author: Laurent Destailleur <address@hidden>
Date: 2020-02-07 (Fri, 07 Feb 2020)
Changed paths:
M htdocs/product/stock/product.php
Log Message:
-----------
FIX Missing include
Commit: 5f75ae48307ef8b1f6f564bc952c4147e6ec78ac
https://github.com/Dolibarr/dolibarr/commit/5f75ae48307ef8b1f6f564bc952c4147e6ec78ac
Author: Laurent Destailleur <address@hidden>
Date: 2020-02-08 (Sat, 08 Feb 2020)
Changed paths:
M htdocs/societe/card.php
Log Message:
-----------
FIX If we can change vendor status, we must be able to chane vendor code
Commit: 85c4013a0d074a1b8d3897e2055157bde272fdd8
https://github.com/Dolibarr/dolibarr/commit/85c4013a0d074a1b8d3897e2055157bde272fdd8
Author: Laurent Destailleur <address@hidden>
Date: 2020-02-08 (Sat, 08 Feb 2020)
Changed paths:
M htdocs/user/card.php
Log Message:
-----------
Update card.php
Commit: 46e7f613fdbabc2966e2cee4b726ac49d2f55a56
https://github.com/Dolibarr/dolibarr/commit/46e7f613fdbabc2966e2cee4b726ac49d2f55a56
Author: Laurent Destailleur <address@hidden>
Date: 2020-02-08 (Sat, 08 Feb 2020)
Changed paths:
M htdocs/user/card.php
Log Message:
-----------
Merge pull request #13049 from hregis/11.0
FIX #13028
Commit: ae5da164c69bca34655a6e94f481d2ccc82fdc54
https://github.com/Dolibarr/dolibarr/commit/ae5da164c69bca34655a6e94f481d2ccc82fdc54
Author: ptibogxiv <address@hidden>
Date: 2020-02-08 (Sat, 08 Feb 2020)
Changed paths:
M htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
Log Message:
-----------
FIX need weight short label in shipping doc
need short label because value + term is too long
Commit: 81007086393e9ad056d5760d2295cf4a7701b6a8
https://github.com/Dolibarr/dolibarr/commit/81007086393e9ad056d5760d2295cf4a7701b6a8
Author: ptibogxiv <address@hidden>
Date: 2020-02-08 (Sat, 08 Feb 2020)
Changed paths:
M htdocs/core/modules/expedition/doc/pdf_espadon.modules.php
Log Message:
-----------
Update pdf_espadon.modules.php
Commit: 5fac824824a6549404e23f25d73be7d1e3adb68b
https://github.com/Dolibarr/dolibarr/commit/5fac824824a6549404e23f25d73be7d1e3adb68b
Author: Laurent Destailleur <address@hidden>
Date: 2020-02-08 (Sat, 08 Feb 2020)
Changed paths:
M htdocs/comm/mailing/class/advtargetemailing.class.php
M htdocs/core/tpl/advtarget.tpl.php
Log Message:
-----------
Merge pull request #13040 from atm-arnaud/FIX_adv_target_emailing
FIX advanced target emailing sql and ergonomy
Commit: 2a897ac91adee16bf6ff773feaade1e2a47a0573
https://github.com/Dolibarr/dolibarr/commit/2a897ac91adee16bf6ff773feaade1e2a47a0573
Author: Laurent Destailleur <address@hidden>
Date: 2020-02-08 (Sat, 08 Feb 2020)
Changed paths:
M htdocs/comm/mailing/class/advtargetemailing.class.php
M htdocs/core/tpl/advtarget.tpl.php
Log Message:
-----------
Merge branch '10.0' of address@hidden:Dolibarr/dolibarr.git into 10.0
Commit: e951743077fb435f977a8473260024b091de9517
https://github.com/Dolibarr/dolibarr/commit/e951743077fb435f977a8473260024b091de9517
Author: ksar <address@hidden>
Date: 2020-02-08 (Sat, 08 Feb 2020)
Changed paths:
M htdocs/admin/tools/export_files.php
Log Message:
-----------
Update export_files.php
Remove Warning
Commit: 34192f25f69e4fe00d739314b4eb8aa95809ba4b
https://github.com/Dolibarr/dolibarr/commit/34192f25f69e4fe00d739314b4eb8aa95809ba4b
Author: Laurent Destailleur <address@hidden>
Date: 2020-02-08 (Sat, 08 Feb 2020)
Changed paths:
M htdocs/admin/tools/export_files.php
Log Message:
-----------
Merge pull request #13042 from ksar-ksar/11.0
FIX : Update export_files.php
Commit: 5f5645a184d254ba4b12a91b14df364815b3ca02
https://github.com/Dolibarr/dolibarr/commit/5f5645a184d254ba4b12a91b14df364815b3ca02
Author: Laurent Destailleur <address@hidden>
Date: 2020-02-08 (Sat, 08 Feb 2020)
Changed paths:
M htdocs/admin/tools/export_files.php
Log Message:
-----------
Merge pull request #13044 from ksar-ksar/10.0
FIX : Warning on admin/export_files
Commit: 9b9101dc2f989b13b49880f840ef20e5de02cafe
https://github.com/Dolibarr/dolibarr/commit/9b9101dc2f989b13b49880f840ef20e5de02cafe
Author: Laurent Destailleur <address@hidden>
Date: 2020-02-08 (Sat, 08 Feb 2020)
Changed paths:
Log Message:
-----------
Merge branch '10.0' of address@hidden:Dolibarr/dolibarr.git into 10.0
Conflicts:
htdocs/admin/tools/export_files.php
Commit: 1a167aa5b400da4a138b7e8a9bb0bd6121e15f66
https://github.com/Dolibarr/dolibarr/commit/1a167aa5b400da4a138b7e8a9bb0bd6121e15f66
Author: Laurent Destailleur <address@hidden>
Date: 2020-02-08 (Sat, 08 Feb 2020)
Changed paths:
M htdocs/compta/tva/card.php
Log Message:
-----------
Update card.php
Conflicts:
htdocs/compta/tva/card.php
Commit: df7cdd1da8197268e6f54b1cfee23c18b47605d2
https://github.com/Dolibarr/dolibarr/commit/df7cdd1da8197268e6f54b1cfee23c18b47605d2
Author: Laurent Destailleur <address@hidden>
Date: 2020-02-08 (Sat, 08 Feb 2020)
Changed paths:
M htdocs/admin/tools/export_files.php
M htdocs/comm/mailing/advtargetemailing.php
M htdocs/comm/mailing/class/advtargetemailing.class.php
M htdocs/comm/mailing/class/html.formadvtargetemailing.class.php
M htdocs/core/lib/emailing.lib.php
M htdocs/core/tpl/advtarget.tpl.php
Log Message:
-----------
Merge branch '10.0' of address@hidden:Dolibarr/dolibarr.git into 11.0
Conflicts:
htdocs/admin/tools/export_files.php
htdocs/comm/mailing/class/advtargetemailing.class.php
htdocs/core/tpl/advtarget.tpl.php
Commit: 716f765ce10fb0126a914276e44dceb40f30e79e
https://github.com/Dolibarr/dolibarr/commit/716f765ce10fb0126a914276e44dceb40f30e79e
Author: Laurent Destailleur <address@hidden>
Date: 2020-02-08 (Sat, 08 Feb 2020)
Changed paths:
M htdocs/comm/action/peruser.php
M htdocs/comm/mailing/advtargetemailing.php
M htdocs/comm/mailing/class/advtargetemailing.class.php
M htdocs/comm/mailing/class/html.formadvtargetemailing.class.php
M htdocs/compta/tva/card.php
M htdocs/core/lib/agenda.lib.php
M htdocs/core/lib/emailing.lib.php
M htdocs/core/tpl/advtarget.tpl.php
M htdocs/user/card.php
M htdocs/website/class/website.class.php
M htdocs/website/index.php
Log Message:
-----------
Merge branch '11.0' of address@hidden:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/core/modules/expedition/doc/pdf_espadon.modules.php
Commit: 5f507b2df55546c961be2b485c7cacc08588b532
https://github.com/Dolibarr/dolibarr/commit/5f507b2df55546c961be2b485c7cacc08588b532
Author: Laurent Destailleur <address@hidden>
Date: 2020-02-08 (Sat, 08 Feb 2020)
Changed paths:
M htdocs/compta/tva/card.php
Log Message:
-----------
Merge branch 'develop' of address@hidden:Dolibarr/dolibarr.git into
develop
Conflicts:
htdocs/compta/tva/card.php
Compare:
https://github.com/Dolibarr/dolibarr/compare/10790420ba08...5f507b2df555