[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Dolibarr-git] [Dolibarr/dolibarr] 5cc02a: Fix deletion of signatures
|
From: |
Laurent Destailleur |
|
Subject: |
[Dolibarr-git] [Dolibarr/dolibarr] 5cc02a: Fix deletion of signatures |
|
Date: |
Mon, 28 Aug 2017 03:53:17 -0700 |
Branch: refs/heads/develop
Home: https://github.com/Dolibarr/dolibarr
Commit: 5cc02ac97fba378df36f4c50b3f7df4f7dd28c04
https://github.com/Dolibarr/dolibarr/commit/5cc02ac97fba378df36f4c50b3f7df4f7dd28c04
Author: Laurent Destailleur <address@hidden>
Date: 2017-08-26 (Sat, 26 Aug 2017)
Changed paths:
M build/generate_filelist_xml.php
Log Message:
-----------
Fix deletion of signatures
Commit: ba3581354a5aaed80912756a8ae28128ab857cb3
https://github.com/Dolibarr/dolibarr/commit/ba3581354a5aaed80912756a8ae28128ab857cb3
Author: Laurent Destailleur <address@hidden>
Date: 2017-08-27 (Sun, 27 Aug 2017)
Changed paths:
M htdocs/filefunc.inc.php
Log Message:
-----------
Prepare 5.0.6
Commit: 7916a2a648370d0ea9c9b07cab377c572a7f82c9
https://github.com/Dolibarr/dolibarr/commit/7916a2a648370d0ea9c9b07cab377c572a7f82c9
Author: Laurent Destailleur <address@hidden>
Date: 2017-08-27 (Sun, 27 Aug 2017)
Changed paths:
M build/generate_filelist_xml.php
M htdocs/filefunc.inc.php
Log Message:
-----------
Merge branch '5.0' of address@hidden:Dolibarr/dolibarr.git into 6.0
Conflicts:
build/generate_filelist_xml.php
htdocs/filefunc.inc.php
Commit: d800d1076665d2a07dc65651ad5cff7b865f87f7
https://github.com/Dolibarr/dolibarr/commit/d800d1076665d2a07dc65651ad5cff7b865f87f7
Author: Regis Houssin <address@hidden>
Date: 2017-08-27 (Sun, 27 Aug 2017)
Changed paths:
M htdocs/core/lib/security2.lib.php
M htdocs/core/tpl/login.tpl.php
Log Message:
-----------
Fix: use resprint instead resarray
Commit: 896c8b4a78f7fb669a545060885443d032a4d24d
https://github.com/Dolibarr/dolibarr/commit/896c8b4a78f7fb669a545060885443d032a4d24d
Author: Regis Houssin <address@hidden>
Date: 2017-08-27 (Sun, 27 Aug 2017)
Changed paths:
M htdocs/core/tpl/login.tpl.php
Log Message:
-----------
Fix: comment old code
Commit: 1ce1899a46df1c18d492defa818000a25b7986b3
https://github.com/Dolibarr/dolibarr/commit/1ce1899a46df1c18d492defa818000a25b7986b3
Author: Regis Houssin <address@hidden>
Date: 2017-08-27 (Sun, 27 Aug 2017)
Changed paths:
M htdocs/core/lib/security2.lib.php
M htdocs/core/tpl/login.tpl.php
Log Message:
-----------
Fix: add comment
Commit: 526ccc870b652e58768c19bcd7dca9f683c5d6f7
https://github.com/Dolibarr/dolibarr/commit/526ccc870b652e58768c19bcd7dca9f683c5d6f7
Author: Regis Houssin <address@hidden>
Date: 2017-08-27 (Sun, 27 Aug 2017)
Changed paths:
M htdocs/core/lib/security2.lib.php
M htdocs/core/tpl/login.tpl.php
Log Message:
-----------
Fix: add compatibility with old modules
Commit: 80af01c20f0137d4cb2cdc9c2f8678d3c75d5e65
https://github.com/Dolibarr/dolibarr/commit/80af01c20f0137d4cb2cdc9c2f8678d3c75d5e65
Author: Regis Houssin <address@hidden>
Date: 2017-08-27 (Sun, 27 Aug 2017)
Changed paths:
M htdocs/core/tpl/login.tpl.php
Log Message:
-----------
Fix: wrong test
Commit: 54afb2f1afd10a7becee46bd96c49b28affce316
https://github.com/Dolibarr/dolibarr/commit/54afb2f1afd10a7becee46bd96c49b28affce316
Author: Laurent Destailleur <address@hidden>
Date: 2017-08-27 (Sun, 27 Aug 2017)
Changed paths:
A dev/initdemo/mysqldump_dolibarr_6.0.0.sql
M dev/initdemo/savedemo.sh
Log Message:
-----------
Add demo file for 6.0
Commit: 52a20731521751bb0d8c812e97d5cb0854be36e6
https://github.com/Dolibarr/dolibarr/commit/52a20731521751bb0d8c812e97d5cb0854be36e6
Author: Laurent Destailleur <address@hidden>
Date: 2017-08-27 (Sun, 27 Aug 2017)
Changed paths:
M dev/initdemo/mysqldump_dolibarr_6.0.0.sql
Log Message:
-----------
Add demo file for 6.0
Commit: c382ca22b8723c0ed760b439ccc2b087f92315a0
https://github.com/Dolibarr/dolibarr/commit/c382ca22b8723c0ed760b439ccc2b087f92315a0
Author: Laurent Destailleur <address@hidden>
Date: 2017-08-28 (Mon, 28 Aug 2017)
Changed paths:
M htdocs/core/class/CMailFile.class.php
M htdocs/core/class/smtps.class.php
Log Message:
-----------
FIX link in to email and option for tls
Commit: f6604f657840c75cf3aab3c0b8b9a0746adef1a6
https://github.com/Dolibarr/dolibarr/commit/f6604f657840c75cf3aab3c0b8b9a0746adef1a6
Author: Alexandre SPANGARO <address@hidden>
Date: 2017-08-28 (Mon, 28 Aug 2017)
Changed paths:
M htdocs/fourn/facture/paiement.php
Log Message:
-----------
Fix: Search on supplier payment list doesn't work
Commit: b3642708b37ddcf5ba7d205163b88c6476a00821
https://github.com/Dolibarr/dolibarr/commit/b3642708b37ddcf5ba7d205163b88c6476a00821
Author: Regis Houssin <address@hidden>
Date: 2017-08-28 (Mon, 28 Aug 2017)
Changed paths:
M htdocs/core/tpl/login.tpl.php
M htdocs/core/tpl/passwordforgotten.tpl.php
Log Message:
-----------
Fix: better for responsive background image
Commit: 1f64f9dfcc082f58c587717efc48f16ecad4c9fc
https://github.com/Dolibarr/dolibarr/commit/1f64f9dfcc082f58c587717efc48f16ecad4c9fc
Author: Laurent Destailleur <address@hidden>
Date: 2017-08-28 (Mon, 28 Aug 2017)
Changed paths:
M htdocs/core/tpl/login.tpl.php
M htdocs/core/tpl/passwordforgotten.tpl.php
Log Message:
-----------
Merge pull request #7303 from hregis/6.0_background
Fix: better for responsive background image
Commit: 570c683b996413cc95cee8f814bab4dd659871e4
https://github.com/Dolibarr/dolibarr/commit/570c683b996413cc95cee8f814bab4dd659871e4
Author: Regis Houssin <address@hidden>
Date: 2017-08-28 (Mon, 28 Aug 2017)
Changed paths:
A dev/initdemo/mysqldump_dolibarr_6.0.0.sql
M dev/initdemo/savedemo.sh
M htdocs/core/class/CMailFile.class.php
M htdocs/core/class/smtps.class.php
M htdocs/core/tpl/login.tpl.php
M htdocs/core/tpl/passwordforgotten.tpl.php
Log Message:
-----------
Merge branch '6.0' of https://github.com/Dolibarr/dolibarr.git into 6.0_bug2
Commit: 0ce51fcb877d474ea04dbde749f7226ea8cd141f
https://github.com/Dolibarr/dolibarr/commit/0ce51fcb877d474ea04dbde749f7226ea8cd141f
Author: Regis Houssin <address@hidden>
Date: 2017-08-28 (Mon, 28 Aug 2017)
Changed paths:
M htdocs/core/tpl/passwordforgotten.tpl.php
M htdocs/user/passwordforgotten.php
Log Message:
-----------
Fix: add resprint for passwordforgotten
Commit: 21a7fcb01a64b3c7966286ca4462d5de17ddbef1
https://github.com/Dolibarr/dolibarr/commit/21a7fcb01a64b3c7966286ca4462d5de17ddbef1
Author: Laurent Destailleur <address@hidden>
Date: 2017-08-28 (Mon, 28 Aug 2017)
Changed paths:
M htdocs/adherents/class/adherent.class.php
M htdocs/admin/mails.php
M htdocs/core/actions_massactions.inc.php
M htdocs/core/actions_sendmails.inc.php
M htdocs/langs/en_US/other.lang
Log Message:
-----------
Fix substitution when sending emails
Commit: 3d5edba574f0b0d8114361e9d0239434c974ade8
https://github.com/Dolibarr/dolibarr/commit/3d5edba574f0b0d8114361e9d0239434c974ade8
Author: Laurent Destailleur <address@hidden>
Date: 2017-08-28 (Mon, 28 Aug 2017)
Changed paths:
M htdocs/fourn/facture/paiement.php
Log Message:
-----------
Merge pull request #7302 from aspangaro/6.0-rc_p1
Fix: Search on supplier payment list doesn't work
Commit: 73a799b0cea6504002c02b5a0d82c35e4fd6e8cd
https://github.com/Dolibarr/dolibarr/commit/73a799b0cea6504002c02b5a0d82c35e4fd6e8cd
Author: Laurent Destailleur <address@hidden>
Date: 2017-08-28 (Mon, 28 Aug 2017)
Changed paths:
M htdocs/core/lib/security2.lib.php
M htdocs/core/tpl/login.tpl.php
M htdocs/core/tpl/passwordforgotten.tpl.php
M htdocs/user/passwordforgotten.php
Log Message:
-----------
Merge pull request #7297 from hregis/6.0_bug2
Fix: use resprint instead resarray
Commit: 075a138e144396ea93c58bab4273964472c6eb33
https://github.com/Dolibarr/dolibarr/commit/075a138e144396ea93c58bab4273964472c6eb33
Author: Laurent Destailleur <address@hidden>
Date: 2017-08-28 (Mon, 28 Aug 2017)
Changed paths:
M htdocs/comm/mailing/card.php
M htdocs/core/class/CMailFile.class.php
Log Message:
-----------
Fix substitution of __EMAIL__
Commit: a60cd49fb02f52057fe896d6eaa6cda202a582ba
https://github.com/Dolibarr/dolibarr/commit/a60cd49fb02f52057fe896d6eaa6cda202a582ba
Author: Laurent Destailleur <address@hidden>
Date: 2017-08-28 (Mon, 28 Aug 2017)
Changed paths:
M build/generate_filelist_xml.php
A dev/initdemo/mysqldump_dolibarr_6.0.0.sql
M dev/initdemo/savedemo.sh
M htdocs/adherents/class/adherent.class.php
M htdocs/admin/mails.php
M htdocs/comm/mailing/card.php
M htdocs/core/actions_massactions.inc.php
M htdocs/core/actions_sendmails.inc.php
M htdocs/core/class/CMailFile.class.php
M htdocs/core/lib/security2.lib.php
M htdocs/core/tpl/login.tpl.php
M htdocs/core/tpl/passwordforgotten.tpl.php
M htdocs/fourn/facture/paiement.php
M htdocs/langs/en_US/other.lang
M htdocs/user/passwordforgotten.php
Log Message:
-----------
Merge branch '6.0' of address@hidden:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/core/actions_sendmails.inc.php
htdocs/core/class/CMailFile.class.php
htdocs/filefunc.inc.php
Compare:
https://github.com/Dolibarr/dolibarr/compare/b4769d37d69b...a60cd49fb02f