[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Dolibarr-git] [Dolibarr/dolibarr] da2f97: fix upload images on category
|
From: |
Laurent Destailleur |
|
Subject: |
[Dolibarr-git] [Dolibarr/dolibarr] da2f97: fix upload images on category |
|
Date: |
Tue, 12 Sep 2017 04:26:39 -0700 |
Branch: refs/heads/develop
Home: https://github.com/Dolibarr/dolibarr
Commit: da2f97134596b7f9955f053e8ae4d27dac631a14
https://github.com/Dolibarr/dolibarr/commit/da2f97134596b7f9955f053e8ae4d27dac631a14
Author: florian HENRY <address@hidden>
Date: 2017-09-08 (Fri, 08 Sep 2017)
Changed paths:
M htdocs/categories/class/categorie.class.php
Log Message:
-----------
fix upload images on category
Commit: 20ed279489cd87f2dd386d8bbb5421e3317e9d75
https://github.com/Dolibarr/dolibarr/commit/20ed279489cd87f2dd386d8bbb5421e3317e9d75
Author: florian HENRY <address@hidden>
Date: 2017-09-08 (Fri, 08 Sep 2017)
Changed paths:
M htdocs/categories/class/categorie.class.php
Log Message:
-----------
better fix
Commit: 34f08ce082dd5f0c2aff5173ed549d5cd2312856
https://github.com/Dolibarr/dolibarr/commit/34f08ce082dd5f0c2aff5173ed549d5cd2312856
Author: florian HENRY <address@hidden>
Date: 2017-09-08 (Fri, 08 Sep 2017)
Changed paths:
M htdocs/categories/class/categorie.class.php
Log Message:
-----------
fix travis
Commit: 1a389b6faf891d4b3ffc51ad87e0b7d1ffcebb11
https://github.com/Dolibarr/dolibarr/commit/1a389b6faf891d4b3ffc51ad87e0b7d1ffcebb11
Author: florian HENRY <address@hidden>
Date: 2017-09-08 (Fri, 08 Sep 2017)
Changed paths:
M htdocs/categories/class/categorie.class.php
Log Message:
-----------
fix upload photo for categ
Commit: d4c20a919d5f1f4843382efb8706cd51c4a4ddb0
https://github.com/Dolibarr/dolibarr/commit/d4c20a919d5f1f4843382efb8706cd51c4a4ddb0
Author: Regis Houssin <address@hidden>
Date: 2017-09-08 (Fri, 08 Sep 2017)
Changed paths:
M htdocs/core/modules/user/doc/doc_generic_user_odt.modules.php
Log Message:
-----------
Fix: avoid warning
Commit: a6a142753a259c681dec77f6971888787c2f2114
https://github.com/Dolibarr/dolibarr/commit/a6a142753a259c681dec77f6971888787c2f2114
Author: Laurent Destailleur <address@hidden>
Date: 2017-09-08 (Fri, 08 Sep 2017)
Changed paths:
M htdocs/accountancy/customer/index.php
M htdocs/accountancy/expensereport/index.php
M htdocs/accountancy/supplier/index.php
M htdocs/langs/en_US/accountancy.lang
Log Message:
-----------
Fix bad label when account not set
Commit: 8b20c5edab762bf71208a281f76fa07645422e4f
https://github.com/Dolibarr/dolibarr/commit/8b20c5edab762bf71208a281f76fa07645422e4f
Author: Laurent Destailleur <address@hidden>
Date: 2017-09-08 (Fri, 08 Sep 2017)
Changed paths:
M htdocs/accountancy/journal/bankjournal.php
M htdocs/core/modules/syslog/mod_syslog_syslog.php
Log Message:
-----------
FIX Remove warning when using log into syslog
Commit: c498ce3c41d8847f279169fc15202ba0bb8c830d
https://github.com/Dolibarr/dolibarr/commit/c498ce3c41d8847f279169fc15202ba0bb8c830d
Author: Laurent Destailleur <address@hidden>
Date: 2017-09-08 (Fri, 08 Sep 2017)
Changed paths:
M htdocs/accountancy/journal/bankjournal.php
M htdocs/langs/en_US/accountancy.lang
Log Message:
-----------
FIX journalization for bank journal should not rely on a label.
Commit: 310e912a9d5ccb11f1777ca67aa1b190f3926b9c
https://github.com/Dolibarr/dolibarr/commit/310e912a9d5ccb11f1777ca67aa1b190f3926b9c
Author: Regis Houssin <address@hidden>
Date: 2017-09-08 (Fri, 08 Sep 2017)
Changed paths:
M htdocs/societe/list.php
Log Message:
-----------
Fix: missing parameters for filter and sort
Commit: 23c5b0366f58bbe293c5cd3fea68a3d89a8f3be4
https://github.com/Dolibarr/dolibarr/commit/23c5b0366f58bbe293c5cd3fea68a3d89a8f3be4
Author: Laurent Destailleur <address@hidden>
Date: 2017-09-08 (Fri, 08 Sep 2017)
Changed paths:
M htdocs/categories/class/categorie.class.php
Log Message:
-----------
Merge pull request #7344 from atm-florian/6.0_fixphotocateg
6.0 fixphotocateg
Commit: bb53146192cd3857d4e5c92ebea2282c99e130f2
https://github.com/Dolibarr/dolibarr/commit/bb53146192cd3857d4e5c92ebea2282c99e130f2
Author: Laurent Destailleur <address@hidden>
Date: 2017-09-08 (Fri, 08 Sep 2017)
Changed paths:
M htdocs/societe/list.php
Log Message:
-----------
Merge pull request #7348 from hregis/6.0_bug2
Fix: missing parameters for filter and sort
Commit: c1c75208eccbe6177aaa5ac7716c9b367bc2eceb
https://github.com/Dolibarr/dolibarr/commit/c1c75208eccbe6177aaa5ac7716c9b367bc2eceb
Author: Regis Houssin <address@hidden>
Date: 2017-09-09 (Sat, 09 Sep 2017)
Changed paths:
M htdocs/contact/list.php
Log Message:
-----------
Fix: missing parameters for filter and sort (contact list)
Commit: db02c32a9f03b6fb75587454bd3db51fe9bc6062
https://github.com/Dolibarr/dolibarr/commit/db02c32a9f03b6fb75587454bd3db51fe9bc6062
Author: Regis Houssin <address@hidden>
Date: 2017-09-09 (Sat, 09 Sep 2017)
Changed paths:
M htdocs/accountancy/customer/index.php
M htdocs/accountancy/expensereport/index.php
M htdocs/accountancy/journal/bankjournal.php
M htdocs/accountancy/supplier/index.php
M htdocs/adherents/type.php
M htdocs/categories/class/categorie.class.php
M htdocs/comm/mailing/class/advtargetemailing.class.php
M htdocs/comm/propal/stats/index.php
M htdocs/commande/stats/index.php
M htdocs/compta/facture/stats/index.php
M htdocs/core/class/html.form.class.php
M htdocs/core/modules/syslog/mod_syslog_syslog.php
M htdocs/don/list.php
M htdocs/expensereport/stats/index.php
M htdocs/fichinter/stats/index.php
M htdocs/fourn/commande/list.php
M htdocs/langs/en_US/accountancy.lang
M htdocs/product/class/html.formproduct.class.php
M htdocs/product/class/product.class.php
M htdocs/societe/list.php
M htdocs/supplier_proposal/list.php
Log Message:
-----------
Merge branch '6.0' of https://github.com/Dolibarr/dolibarr.git into 6.0_bug3
Commit: 7404a6cf980468b5b749bf1edcc303234f1f4177
https://github.com/Dolibarr/dolibarr/commit/7404a6cf980468b5b749bf1edcc303234f1f4177
Author: Regis Houssin <address@hidden>
Date: 2017-09-09 (Sat, 09 Sep 2017)
Changed paths:
M htdocs/admin/index.php
Log Message:
-----------
Fix: avoid htmlentities
Commit: a8fdf0b5eafe3628689d6a3e886491da437466a0
https://github.com/Dolibarr/dolibarr/commit/a8fdf0b5eafe3628689d6a3e886491da437466a0
Author: Regis Houssin <address@hidden>
Date: 2017-09-09 (Sat, 09 Sep 2017)
Changed paths:
M htdocs/install/upgrade2.php
Log Message:
-----------
Fix: missing salaries upgrade reload module
Commit: 67e9b65a2e1fc6ed3c9e6c4c6a37b862384c4423
https://github.com/Dolibarr/dolibarr/commit/67e9b65a2e1fc6ed3c9e6c4c6a37b862384c4423
Author: Regis Houssin <address@hidden>
Date: 2017-09-09 (Sat, 09 Sep 2017)
Changed paths:
M htdocs/core/modules/user/doc/doc_generic_user_odt.modules.php
Log Message:
-----------
Fix: use $array_key value instead
Commit: 762b4eb8768a0b09d69c06529566954f7efbc1c0
https://github.com/Dolibarr/dolibarr/commit/762b4eb8768a0b09d69c06529566954f7efbc1c0
Author: Regis Houssin <address@hidden>
Date: 2017-09-09 (Sat, 09 Sep 2017)
Changed paths:
M htdocs/core/class/conf.class.php
M htdocs/core/lib/files.lib.php
Log Message:
-----------
Fix: some problems with medias in multicompany
Commit: c315ad78010c9289a19ee9b37d90554947fdf6ff
https://github.com/Dolibarr/dolibarr/commit/c315ad78010c9289a19ee9b37d90554947fdf6ff
Author: Laurent Destailleur <address@hidden>
Date: 2017-09-10 (Sun, 10 Sep 2017)
Changed paths:
M htdocs/societe/class/societe.class.php
Log Message:
-----------
Fix missing tables into childtables
Commit: d13c4b7b84cfbe2a1e3f6b834ce16f978e5f8033
https://github.com/Dolibarr/dolibarr/commit/d13c4b7b84cfbe2a1e3f6b834ce16f978e5f8033
Author: Laurent Destailleur <address@hidden>
Date: 2017-09-11 (Mon, 11 Sep 2017)
Changed paths:
M htdocs/core/class/extrafields.class.php
Log Message:
-----------
Better autosize of extrafields
Commit: 26385fa10d66dd54e2c72a5f311546bad7b2c229
https://github.com/Dolibarr/dolibarr/commit/26385fa10d66dd54e2c72a5f311546bad7b2c229
Author: Laurent Destailleur <address@hidden>
Date: 2017-09-11 (Mon, 11 Sep 2017)
Changed paths:
M htdocs/compta/facture/class/facture-rec.class.php
Log Message:
-----------
FIX Clean bad parameters when inserting line of template invoice
Conflicts:
htdocs/compta/facture/class/facture-rec.class.php
Commit: e9e6a8e5ad325c5ffc38685b8fe1953398441c95
https://github.com/Dolibarr/dolibarr/commit/e9e6a8e5ad325c5ffc38685b8fe1953398441c95
Author: Laurent Destailleur <address@hidden>
Date: 2017-09-11 (Mon, 11 Sep 2017)
Changed paths:
M htdocs/admin/dict.php
M htdocs/core/tpl/contacts.tpl.php
Log Message:
-----------
Fix center of button
Commit: 214bad26dbf105408454e7d14ea5b49c41deb268
https://github.com/Dolibarr/dolibarr/commit/214bad26dbf105408454e7d14ea5b49c41deb268
Author: Laurent Destailleur <address@hidden>
Date: 2017-09-11 (Mon, 11 Sep 2017)
Changed paths:
M htdocs/core/lib/date.lib.php
Log Message:
-----------
Try a fix for dol_time_plus_duree when date is 2017-09-01 00:00 and
timezone > 0
Commit: 61a0f04bbef681c1ba3709878801fe6ba73f3918
https://github.com/Dolibarr/dolibarr/commit/61a0f04bbef681c1ba3709878801fe6ba73f3918
Author: Laurent Destailleur <address@hidden>
Date: 2017-09-11 (Mon, 11 Sep 2017)
Changed paths:
M htdocs/core/tpl/objectline_create.tpl.php
Log Message:
-----------
FIX dateSelector was not taken into account
Commit: b87ce172c35f389c27bbde5ae15a9eb60d811414
https://github.com/Dolibarr/dolibarr/commit/b87ce172c35f389c27bbde5ae15a9eb60d811414
Author: Laurent Destailleur <address@hidden>
Date: 2017-09-11 (Mon, 11 Sep 2017)
Changed paths:
M htdocs/commande/card.php
M htdocs/commande/class/commande.class.php
M htdocs/compta/facture/card.php
M htdocs/compta/facture/class/facture.class.php
Log Message:
-----------
FIX hidden option MAIN_PROPAGATE_CONTACTS_FROM_ORIGIN
Commit: 646e8713f2187808875c4dfd3a7ac169e2a6dcce
https://github.com/Dolibarr/dolibarr/commit/646e8713f2187808875c4dfd3a7ac169e2a6dcce
Author: Laurent Destailleur <address@hidden>
Date: 2017-09-11 (Mon, 11 Sep 2017)
Changed paths:
M htdocs/compta/facture/class/facture.class.php
Log Message:
-----------
Remove duplicated logs
Commit: 19e780c53f80116bb3a11b81574891ef54d5b71e
https://github.com/Dolibarr/dolibarr/commit/19e780c53f80116bb3a11b81574891ef54d5b71e
Author: Laurent Destailleur <address@hidden>
Date: 2017-09-11 (Mon, 11 Sep 2017)
Changed paths:
M htdocs/core/modules/user/doc/doc_generic_user_odt.modules.php
Log Message:
-----------
Merge pull request #7346 from hregis/6.0_bug3
Fix: avoid warning
Commit: 5a68d690676a11e42b3a9f7a94c54dbe172677da
https://github.com/Dolibarr/dolibarr/commit/5a68d690676a11e42b3a9f7a94c54dbe172677da
Author: Laurent Destailleur <address@hidden>
Date: 2017-09-11 (Mon, 11 Sep 2017)
Changed paths:
M htdocs/contact/list.php
Log Message:
-----------
Merge pull request #7350 from hregis/6.0_bug2
Fix: missing parameters for filter and sort (contact list)
Commit: 31b5ca17f169aa0f02ea6b39d5e71a77584fe08b
https://github.com/Dolibarr/dolibarr/commit/31b5ca17f169aa0f02ea6b39d5e71a77584fe08b
Author: Laurent Destailleur <address@hidden>
Date: 2017-09-11 (Mon, 11 Sep 2017)
Changed paths:
M htdocs/admin/index.php
Log Message:
-----------
Merge pull request #7353 from hregis/6.0_htmlentities
Fix: avoid htmlentities
Commit: 206e44431d9cd8aaf93ac50c235e7a65e9b58375
https://github.com/Dolibarr/dolibarr/commit/206e44431d9cd8aaf93ac50c235e7a65e9b58375
Author: Laurent Destailleur <address@hidden>
Date: 2017-09-11 (Mon, 11 Sep 2017)
Changed paths:
M htdocs/install/upgrade2.php
Log Message:
-----------
Merge pull request #7356 from hregis/6.0_upgrade
Fix: missing salaries upgrade reload module
Commit: 029f1c411f895b27e8eeaec60ebb361b6ad27e97
https://github.com/Dolibarr/dolibarr/commit/029f1c411f895b27e8eeaec60ebb361b6ad27e97
Author: Laurent Destailleur <address@hidden>
Date: 2017-09-11 (Mon, 11 Sep 2017)
Changed paths:
M htdocs/core/class/conf.class.php
M htdocs/core/lib/files.lib.php
Log Message:
-----------
Merge pull request #7357 from hregis/6.0_medias
Fix: some problems with medias in multicompany
Commit: 6da5a6b82fe2e3c85c9ea84498e0c638bac7f59d
https://github.com/Dolibarr/dolibarr/commit/6da5a6b82fe2e3c85c9ea84498e0c638bac7f59d
Author: Laurent Destailleur <address@hidden>
Date: 2017-09-11 (Mon, 11 Sep 2017)
Changed paths:
M htdocs/fichinter/class/fichinter.class.php
Log Message:
-----------
FIX #7359
Conflicts:
htdocs/fichinter/class/fichinter.class.php
Commit: 2fdad0f11d6479b02b6c51eee21bf3558c427634
https://github.com/Dolibarr/dolibarr/commit/2fdad0f11d6479b02b6c51eee21bf3558c427634
Author: reeperbahnause <address@hidden>
Date: 2017-09-11 (Mon, 11 Sep 2017)
Changed paths:
M htdocs/fichinter/class/fichinter.class.php
Log Message:
-----------
fix #7361 missing generateDocument function
fix #7361
Function generateDocument was missing for Class Fichinter
Commit: e9bc5b719d51450664e31eb41ba974e0c226c195
https://github.com/Dolibarr/dolibarr/commit/e9bc5b719d51450664e31eb41ba974e0c226c195
Author: Laurent Destailleur <address@hidden>
Date: 2017-09-11 (Mon, 11 Sep 2017)
Changed paths:
M htdocs/fichinter/class/fichinter.class.php
Log Message:
-----------
Complete #7361
Commit: 44405e5415fb2d3fd9aac3f444b10f436ba3a1ee
https://github.com/Dolibarr/dolibarr/commit/44405e5415fb2d3fd9aac3f444b10f436ba3a1ee
Author: Laurent Destailleur <address@hidden>
Date: 2017-09-11 (Mon, 11 Sep 2017)
Changed paths:
M htdocs/compta/facture/card.php
M htdocs/core/class/discount.class.php
Log Message:
-----------
Fix #7335 #7365 Better fix
Commit: a4665e17d4112c1629d5a5f9886b5d29aec7ec4f
https://github.com/Dolibarr/dolibarr/commit/a4665e17d4112c1629d5a5f9886b5d29aec7ec4f
Author: Laurent Destailleur <address@hidden>
Date: 2017-09-12 (Tue, 12 Sep 2017)
Changed paths:
M htdocs/accountancy/customer/index.php
M htdocs/accountancy/expensereport/index.php
M htdocs/accountancy/journal/bankjournal.php
M htdocs/accountancy/supplier/index.php
M htdocs/admin/dict.php
M htdocs/admin/index.php
M htdocs/categories/class/categorie.class.php
M htdocs/compta/facture/card.php
M htdocs/compta/facture/class/facture-rec.class.php
M htdocs/compta/facture/class/facture.class.php
M htdocs/contact/list.php
M htdocs/core/class/conf.class.php
M htdocs/core/class/discount.class.php
M htdocs/core/lib/files.lib.php
M htdocs/core/modules/syslog/mod_syslog_syslog.php
M htdocs/core/modules/user/doc/doc_generic_user_odt.modules.php
M htdocs/core/tpl/contacts.tpl.php
M htdocs/fichinter/class/fichinter.class.php
M htdocs/install/upgrade2.php
M htdocs/langs/en_US/accountancy.lang
M htdocs/societe/list.php
Log Message:
-----------
Merge branch '6.0' of address@hidden:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/accountancy/customer/index.php
htdocs/accountancy/expensereport/index.php
htdocs/compta/facture/class/facture-rec.class.php
htdocs/fichinter/class/fichinter.class.php
htdocs/societe/class/societe.class.php
htdocs/societe/list.php
Compare:
https://github.com/Dolibarr/dolibarr/compare/16092bc9f0f3...a4665e17d411