[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Dolibarr-git] [Dolibarr/dolibarr] 1bbf67: add session newtoken
|
From: |
Laurent Destailleur |
|
Subject: |
[Dolibarr-git] [Dolibarr/dolibarr] 1bbf67: add session newtoken |
|
Date: |
Thu, 07 Mar 2019 05:13:43 -0800 |
Branch: refs/heads/develop
Home: https://github.com/Dolibarr/dolibarr
Commit: 1bbf6737ecbf48948cb2c70f52a0ab513d2e3455
https://github.com/Dolibarr/dolibarr/commit/1bbf6737ecbf48948cb2c70f52a0ab513d2e3455
Author: Frédéric FRANCE <address@hidden>
Date: 2019-03-05 (Tue, 05 Mar 2019)
Changed paths:
M htdocs/exports/export.php
Log Message:
-----------
add session newtoken
Commit: 3db8218cba96675e456f473d15a1bf746967dbd3
https://github.com/Dolibarr/dolibarr/commit/3db8218cba96675e456f473d15a1bf746967dbd3
Author: Laurent Destailleur <address@hidden>
Date: 2019-03-05 (Tue, 05 Mar 2019)
Changed paths:
M htdocs/exports/export.php
Log Message:
-----------
Merge pull request #10745 from frederic34/patch-6
add session newtoken
Commit: 0ff29051802d477a47071e75d5ebba9744b48f99
https://github.com/Dolibarr/dolibarr/commit/0ff29051802d477a47071e75d5ebba9744b48f99
Author: gauthier <address@hidden>
Date: 2019-03-06 (Wed, 06 Mar 2019)
Changed paths:
M htdocs/fourn/class/fournisseur.facture.class.php
M htdocs/fourn/facture/card.php
Log Message:
-----------
FIX : we need to keep originline special_code
Commit: 96b8da0d6247fd0d12f77f71ba664e2dc485dee2
https://github.com/Dolibarr/dolibarr/commit/96b8da0d6247fd0d12f77f71ba664e2dc485dee2
Author: Christophe Battarel <address@hidden>
Date: 2019-03-06 (Wed, 06 Mar 2019)
Changed paths:
M htdocs/core/tpl/objectline_create.tpl.php
Log Message:
-----------
fix supllier discount
Commit: c31318f29d36e41cb3a24d97bcab641d1ea99a79
https://github.com/Dolibarr/dolibarr/commit/c31318f29d36e41cb3a24d97bcab641d1ea99a79
Author: Timoté Fallais <address@hidden>
Date: 2019-03-07 (Thu, 07 Mar 2019)
Changed paths:
M htdocs/adherents/class/adherent.class.php
Log Message:
-----------
Update libelle of user (making Mailman working correctly)
Commit: e3fb228a4d148265945c5a0008019f9534b18221
https://github.com/Dolibarr/dolibarr/commit/e3fb228a4d148265945c5a0008019f9534b18221
Author: Laurent Destailleur <address@hidden>
Date: 2019-03-07 (Thu, 07 Mar 2019)
Changed paths:
M htdocs/fourn/class/fournisseur.facture.class.php
Log Message:
-----------
Update fournisseur.facture.class.php
Commit: 2ae3d75df485b2e86e6797844b09c85a9f2e694b
https://github.com/Dolibarr/dolibarr/commit/2ae3d75df485b2e86e6797844b09c85a9f2e694b
Author: Laurent Destailleur <address@hidden>
Date: 2019-03-07 (Thu, 07 Mar 2019)
Changed paths:
M htdocs/fourn/class/fournisseur.facture.class.php
M htdocs/fourn/facture/card.php
Log Message:
-----------
Merge pull request #10752 from atm-gauthier/7.0_fix_fourninvoice_specialcode
FIX : we need to keep originline special_code
Commit: a0bc6672d8e034a8ce5ef0da736a46a7bec57f74
https://github.com/Dolibarr/dolibarr/commit/a0bc6672d8e034a8ce5ef0da736a46a7bec57f74
Author: Laurent Destailleur <address@hidden>
Date: 2019-03-07 (Thu, 07 Mar 2019)
Changed paths:
M htdocs/adherents/class/adherent.class.php
Log Message:
-----------
Try to avoid to make subquery when not necessary
Commit: 8685f82a4153c06cfe74d131fdf9d64087d6b6ee
https://github.com/Dolibarr/dolibarr/commit/8685f82a4153c06cfe74d131fdf9d64087d6b6ee
Author: Laurent Destailleur <address@hidden>
Date: 2019-03-07 (Thu, 07 Mar 2019)
Changed paths:
M htdocs/adherents/class/adherent.class.php
Log Message:
-----------
Merge pull request #10767 from Toumaniere/9.0
Update libelle of user (making Mailman working correctly)
Commit: 1fb86e12e5bf10177f510d75b28c45494374af25
https://github.com/Dolibarr/dolibarr/commit/1fb86e12e5bf10177f510d75b28c45494374af25
Author: Laurent Destailleur <address@hidden>
Date: 2019-03-07 (Thu, 07 Mar 2019)
Changed paths:
M htdocs/compta/compta-files.php
Log Message:
-----------
Merge manually some enhancement from #10507
Commit: b93a12bf19a39cb0092c64a57e35538ed202e56b
https://github.com/Dolibarr/dolibarr/commit/b93a12bf19a39cb0092c64a57e35538ed202e56b
Author: Laurent Destailleur <address@hidden>
Date: 2019-03-07 (Thu, 07 Mar 2019)
Changed paths:
M dev/setup/codesniffer/ruleset.xml
M htdocs/bom/admin/setup.php
M htdocs/bom/bom_card.php
M htdocs/bom/bom_document.php
M htdocs/bom/bom_list.php
M htdocs/bom/bom_note.php
M htdocs/bom/lib/bom.lib.php
M htdocs/categories/edit.php
M htdocs/comm/propal/class/propal.class.php
M htdocs/core/class/CMailFile.class.php
M htdocs/core/class/commonorder.class.php
M htdocs/core/class/html.formfile.class.php
M htdocs/core/class/stats.class.php
M htdocs/core/modules/export/export_csv.modules.php
M htdocs/core/modules/syslog/mod_syslog_chromephp.php
M htdocs/core/modules/syslog/mod_syslog_file.php
M htdocs/core/modules/syslog/mod_syslog_syslog.php
M htdocs/expensereport/class/expensereportstats.class.php
M htdocs/main.inc.php
M
htdocs/modulebuilder/template/core/modules/mailings/mailinglist_mymodule_myobject.modules.php
Log Message:
-----------
Merge branch 'develop' of address@hidden:Dolibarr/dolibarr.git into develop
Commit: 0349f9bfaae2331f818d3c97f7a13aa15af88457
https://github.com/Dolibarr/dolibarr/commit/0349f9bfaae2331f818d3c97f7a13aa15af88457
Author: Laurent Destailleur <address@hidden>
Date: 2019-03-07 (Thu, 07 Mar 2019)
Changed paths:
M htdocs/core/tpl/objectline_create.tpl.php
Log Message:
-----------
Update objectline_create.tpl.php
Commit: e96f84a3d69dfea96e9413a180599ee0ecbb8178
https://github.com/Dolibarr/dolibarr/commit/e96f84a3d69dfea96e9413a180599ee0ecbb8178
Author: Laurent Destailleur <address@hidden>
Date: 2019-03-07 (Thu, 07 Mar 2019)
Changed paths:
M htdocs/core/tpl/objectline_create.tpl.php
Log Message:
-----------
Merge pull request #10765 from altatof/sd8
FIX : supplier discount was not retrieved when choosing a product
Commit: 4f189f4058b67edf9cb9468235b282e11b3b91c3
https://github.com/Dolibarr/dolibarr/commit/4f189f4058b67edf9cb9468235b282e11b3b91c3
Author: Laurent Destailleur <address@hidden>
Date: 2019-03-07 (Thu, 07 Mar 2019)
Changed paths:
M htdocs/comm/action/card.php
M htdocs/comm/action/class/actioncomm.class.php
M htdocs/core/db/mysqli.class.php
Log Message:
-----------
Merge branch 'develop' of address@hidden:Dolibarr/dolibarr.git into develop
Commit: d2f1d0cc3325929ccaad43414f66bb38e672ec15
https://github.com/Dolibarr/dolibarr/commit/d2f1d0cc3325929ccaad43414f66bb38e672ec15
Author: Laurent Destailleur <address@hidden>
Date: 2019-03-07 (Thu, 07 Mar 2019)
Changed paths:
M htdocs/exports/export.php
M htdocs/fourn/class/fournisseur.facture.class.php
M htdocs/fourn/facture/card.php
Log Message:
-----------
Merge branch '7.0' of address@hidden:Dolibarr/dolibarr.git into 8.0
Conflicts:
htdocs/fourn/class/fournisseur.facture.class.php
Commit: 02b8bc94e77d63b72bb7c66cab2fc3c343fa56d8
https://github.com/Dolibarr/dolibarr/commit/02b8bc94e77d63b72bb7c66cab2fc3c343fa56d8
Author: Laurent Destailleur <address@hidden>
Date: 2019-03-07 (Thu, 07 Mar 2019)
Changed paths:
M htdocs/core/tpl/objectline_create.tpl.php
M htdocs/exports/export.php
M htdocs/fourn/class/fournisseur.facture.class.php
M htdocs/fourn/facture/card.php
Log Message:
-----------
Merge branch '8.0' of address@hidden:Dolibarr/dolibarr.git into 9.0
Commit: ddc52b71994bbfc0aa24a1e835c29674bdc408ed
https://github.com/Dolibarr/dolibarr/commit/ddc52b71994bbfc0aa24a1e835c29674bdc408ed
Author: Laurent Destailleur <address@hidden>
Date: 2019-03-07 (Thu, 07 Mar 2019)
Changed paths:
M htdocs/adherents/class/adherent.class.php
M htdocs/core/tpl/objectline_create.tpl.php
M htdocs/exports/export.php
M htdocs/fourn/class/fournisseur.facture.class.php
M htdocs/fourn/facture/card.php
Log Message:
-----------
Merge branch '9.0' of address@hidden:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/core/tpl/objectline_create.tpl.php
htdocs/exports/export.php
htdocs/fourn/class/fournisseur.facture.class.php
htdocs/fourn/facture/card.php
Compare:
https://github.com/Dolibarr/dolibarr/compare/a40a08badafe...ddc52b71994b