[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Dolibarr-git] [Dolibarr/dolibarr] b356c3: [mail; password; forgotten][#
|
From: |
Laurent Destailleur |
|
Subject: |
[Dolibarr-git] [Dolibarr/dolibarr] b356c3: [mail; password; forgotten][#6334] - Fix mail url |
|
Date: |
Wed, 22 Feb 2017 17:56:11 -0800 |
Branch: refs/heads/develop
Home: https://github.com/Dolibarr/dolibarr
Commit: b356c34dc47d1ba00bb25e8f0e865d727f7f0eb5
https://github.com/Dolibarr/dolibarr/commit/b356c34dc47d1ba00bb25e8f0e865d727f7f0eb5
Author: De Coninck Laurent <address@hidden>
Date: 2017-02-12 (Sun, 12 Feb 2017)
Changed paths:
M htdocs/user/class/user.class.php
Log Message:
-----------
[mail; password; forgotten][#6334] - Fix mail url
Fix the mail url on password generation
Commit: 294517a8e0b1bd525d5d49e2fd99f84ae8a8254c
https://github.com/Dolibarr/dolibarr/commit/294517a8e0b1bd525d5d49e2fd99f84ae8a8254c
Author: De Coninck Laurent <address@hidden>
Date: 2017-02-13 (Mon, 13 Feb 2017)
Changed paths:
M htdocs/user/class/user.class.php
Log Message:
-----------
use already existing variable
Commit: e903bf2b5c8fecd35478cd4ca323710f7d03985a
https://github.com/Dolibarr/dolibarr/commit/e903bf2b5c8fecd35478cd4ca323710f7d03985a
Author: fmarcet <address@hidden>
Date: 2017-02-14 (Tue, 14 Feb 2017)
Changed paths:
M htdocs/comm/propal/class/propal.class.php
Log Message:
-----------
Fix: Bad code makes don't work for external modules numeration model
Commit: 89e6d86bf7d9073e6a63234561f5edba3a92553d
https://github.com/Dolibarr/dolibarr/commit/89e6d86bf7d9073e6a63234561f5edba3a92553d
Author: florian HENRY <address@hidden>
Date: 2017-02-15 (Wed, 15 Feb 2017)
Changed paths:
M htdocs/core/boxes/box_services_contracts.php
Log Message:
-----------
FIX #6411
Commit: c175dfe68bdfa20c12bea5aac5b1046ce7f20208
https://github.com/Dolibarr/dolibarr/commit/c175dfe68bdfa20c12bea5aac5b1046ce7f20208
Author: fmarcet <address@hidden>
Date: 2017-02-15 (Wed, 15 Feb 2017)
Changed paths:
M htdocs/comm/propal/class/propal.class.php
Log Message:
-----------
Fix: Bad code makes don't work for external modules numeration model
Commit: efd2e85f1235ff29726b5628535a8035f68620e2
https://github.com/Dolibarr/dolibarr/commit/efd2e85f1235ff29726b5628535a8035f68620e2
Author: Laurent Destailleur <address@hidden>
Date: 2017-02-17 (Fri, 17 Feb 2017)
Changed paths:
M htdocs/user/class/user.class.php
Log Message:
-----------
Merge pull request #6416 from laudeco/fix/password_forgotten
[mail; password; forgotten][#6334] - Fix mail url
Commit: 45eba9f62e04a1492068e6d78c811336eb3124ac
https://github.com/Dolibarr/dolibarr/commit/45eba9f62e04a1492068e6d78c811336eb3124ac
Author: Laurent Destailleur <address@hidden>
Date: 2017-02-17 (Fri, 17 Feb 2017)
Changed paths:
M htdocs/comm/propal/class/propal.class.php
Log Message:
-----------
Merge pull request #6420 from fmarcet/4.0
Fix: Bad code makes don't work for external modules numeration model
Commit: d3eff46305f1b80c0dd102b7c0996c0f879d2b68
https://github.com/Dolibarr/dolibarr/commit/d3eff46305f1b80c0dd102b7c0996c0f879d2b68
Author: Laurent Destailleur <address@hidden>
Date: 2017-02-17 (Fri, 17 Feb 2017)
Changed paths:
M htdocs/core/boxes/box_services_contracts.php
Log Message:
-----------
Merge pull request #6423 from atm-florian/4.0
FIX #6411
Commit: 0a9ffa58c1d749cea2bf8214972fbd21a3964c25
https://github.com/Dolibarr/dolibarr/commit/0a9ffa58c1d749cea2bf8214972fbd21a3964c25
Author: jfefe <address@hidden>
Date: 2017-02-20 (Mon, 20 Feb 2017)
Changed paths:
M htdocs/comm/action/card.php
Log Message:
-----------
FIX : event status is not modified when assign an user
Commit: 33d1d78329baa54e5c74ccc7c3dc243289a1bfc1
https://github.com/Dolibarr/dolibarr/commit/33d1d78329baa54e5c74ccc7c3dc243289a1bfc1
Author: De Coninck Laurent <address@hidden>
Date: 2017-02-21 (Tue, 21 Feb 2017)
Changed paths:
M htdocs/core/class/html.form.class.php
Log Message:
-----------
FIX - use MAIN_FIRSTNAME_NAME_POSITION for select users
Commit: a0873bad297034180aaa0903932c27a9e12888ea
https://github.com/Dolibarr/dolibarr/commit/a0873bad297034180aaa0903932c27a9e12888ea
Author: Laurent Destailleur <address@hidden>
Date: 2017-02-21 (Tue, 21 Feb 2017)
Changed paths:
M htdocs/user/class/user.class.php
Log Message:
-----------
Fix TZ
Commit: b3a127519b2714d1922a230aa96a5723d7fd8f49
https://github.com/Dolibarr/dolibarr/commit/b3a127519b2714d1922a230aa96a5723d7fd8f49
Author: Laurent Destailleur <address@hidden>
Date: 2017-02-21 (Tue, 21 Feb 2017)
Changed paths:
M htdocs/filefunc.inc.php
Log Message:
-----------
Prepare final 5.0
Commit: 63876a1b91026c9d643781d3f019a0727bf4a86e
https://github.com/Dolibarr/dolibarr/commit/63876a1b91026c9d643781d3f019a0727bf4a86e
Author: Laurent Destailleur <address@hidden>
Date: 2017-02-21 (Tue, 21 Feb 2017)
Changed paths:
M dev/initdemo/README
R dev/initdemo/dolibarr-mysql2pgsql.pl
M dev/initdemo/mysqldump_dolibarr_5.0.0.sql
A dev/tools/dolibarr-mysql2pgsql.pl
Log Message:
-----------
Prepare 5.0 release
Commit: ebe625aa16ac310805f21f715ec83de6471db523
https://github.com/Dolibarr/dolibarr/commit/ebe625aa16ac310805f21f715ec83de6471db523
Author: Laurent Destailleur <address@hidden>
Date: 2017-02-21 (Tue, 21 Feb 2017)
Changed paths:
A dev/initdemo/documents_demo/societe/19/SEPA Mandate 19-Morgan
Bank-RUM1301-0008-0.pdf
M htdocs/compta/prelevement/card.php
M htdocs/compta/prelevement/class/bonprelevement.class.php
M htdocs/compta/prelevement/class/ligneprelevement.class.php
M htdocs/compta/prelevement/create.php
M htdocs/compta/prelevement/demandes.php
M htdocs/compta/prelevement/factures.php
M htdocs/compta/prelevement/fiche-rejet.php
M htdocs/compta/prelevement/fiche-stat.php
M htdocs/langs/en_US/withdrawals.lang
Log Message:
-----------
Fix debug direct debit module
Commit: 230bb09c1a96408eded0cd7a8eb07b61d66c3771
https://github.com/Dolibarr/dolibarr/commit/230bb09c1a96408eded0cd7a8eb07b61d66c3771
Author: Laurent Destailleur <address@hidden>
Date: 2017-02-21 (Tue, 21 Feb 2017)
Changed paths:
M dev/initdemo/mysqldump_dolibarr_5.0.0.sql
Log Message:
-----------
Prepare 5.0
Commit: 089aa1df330925bea40c15075cdc2ac282a472bb
https://github.com/Dolibarr/dolibarr/commit/089aa1df330925bea40c15075cdc2ac282a472bb
Author: Laurent Destailleur <address@hidden>
Date: 2017-02-21 (Tue, 21 Feb 2017)
Changed paths:
M htdocs/expensereport/payment/payment.php
M htdocs/main.inc.php
M htdocs/theme/eldy/style.css.php
M htdocs/theme/md/style.css.php
Log Message:
-----------
FIX If bank module on, field must be required to register payment of
expense report.
Commit: 2ecf50a6cc90bdaaaa1193f01a043ea36b06fb5a
https://github.com/Dolibarr/dolibarr/commit/2ecf50a6cc90bdaaaa1193f01a043ea36b06fb5a
Author: De Coninck Laurent <address@hidden>
Date: 2017-02-21 (Tue, 21 Feb 2017)
Changed paths:
M htdocs/fourn/facture/card.php
Log Message:
-----------
generate new pdf when validate billing
Commit: 32678015c98b49dc190e4af09ca86346439397ba
https://github.com/Dolibarr/dolibarr/commit/32678015c98b49dc190e4af09ca86346439397ba
Author: Laurent Destailleur <address@hidden>
Date: 2017-02-21 (Tue, 21 Feb 2017)
Changed paths:
M htdocs/core/lib/treeview.lib.php
M htdocs/user/class/user.class.php
M htdocs/user/hierarchy.php
Log Message:
-----------
FIX protection against infinite loop on hierarchy
Commit: cbb80e6727f77ee137fd4826d7cc892f9d496c29
https://github.com/Dolibarr/dolibarr/commit/cbb80e6727f77ee137fd4826d7cc892f9d496c29
Author: Laurent Destailleur <address@hidden>
Date: 2017-02-22 (Wed, 22 Feb 2017)
Changed paths:
M htdocs/user/card.php
Log Message:
-----------
Fixfield at wrong place
Commit: bb7212117935562d06a2100e48c3a9297275c44a
https://github.com/Dolibarr/dolibarr/commit/bb7212117935562d06a2100e48c3a9297275c44a
Author: Laurent Destailleur <address@hidden>
Date: 2017-02-22 (Wed, 22 Feb 2017)
Changed paths:
M htdocs/core/lib/functions.lib.php
M htdocs/core/menus/init_menu_auguria.sql
M htdocs/core/menus/standard/auguria.lib.php
Log Message:
-----------
Fix menu loading
Commit: fc6fb6147631ead155551ca8dcc22f37184ecb89
https://github.com/Dolibarr/dolibarr/commit/fc6fb6147631ead155551ca8dcc22f37184ecb89
Author: Laurent Destailleur <address@hidden>
Date: 2017-02-22 (Wed, 22 Feb 2017)
Changed paths:
M htdocs/langs/en_US/cron.lang
M htdocs/product/admin/product_tools.php
Log Message:
-----------
Minor fix in typo
Commit: 89b52e24f693232b7b6f7614047f95a43299b17a
https://github.com/Dolibarr/dolibarr/commit/89b52e24f693232b7b6f7614047f95a43299b17a
Author: Laurent Destailleur <address@hidden>
Date: 2017-02-22 (Wed, 22 Feb 2017)
Changed paths:
M htdocs/core/modules/modBarcode.class.php
M htdocs/core/modules/modCron.class.php
M htdocs/core/modules/modPrinting.class.php
M htdocs/core/modules/modProduct.class.php
Log Message:
-----------
Fix menu navigation
Commit: daf1dbb3a1026aec4c636435d182ae96387eee12
https://github.com/Dolibarr/dolibarr/commit/daf1dbb3a1026aec4c636435d182ae96387eee12
Author: Laurent Destailleur <address@hidden>
Date: 2017-02-22 (Wed, 22 Feb 2017)
Changed paths:
M htdocs/contact/class/contact.class.php
Log Message:
-----------
FIX #6453
Commit: cbe855370b8e9d43c4a44eeabd99acde771c8e40
https://github.com/Dolibarr/dolibarr/commit/cbe855370b8e9d43c4a44eeabd99acde771c8e40
Author: Laurent Destailleur <address@hidden>
Date: 2017-02-22 (Wed, 22 Feb 2017)
Changed paths:
M htdocs/core/class/html.form.class.php
Log Message:
-----------
Merge pull request #6451 from laudeco/feature/list_user_by_firstname
FIX - use MAIN_FIRSTNAME_NAME_POSITION for select users
Commit: b32c552fbc496abb7a71b3b4468f5f0cf122bbb0
https://github.com/Dolibarr/dolibarr/commit/b32c552fbc496abb7a71b3b4468f5f0cf122bbb0
Author: Laurent Destailleur <address@hidden>
Date: 2017-02-22 (Wed, 22 Feb 2017)
Changed paths:
M htdocs/comm/action/card.php
Log Message:
-----------
Merge pull request #6447 from aternatik/fix_6446
Fix #6446 : Event status lost after assign or remouve user
Commit: 5a3873cfb7de57d8516be7e0e7a18b3983abfb17
https://github.com/Dolibarr/dolibarr/commit/5a3873cfb7de57d8516be7e0e7a18b3983abfb17
Author: Laurent Destailleur <address@hidden>
Date: 2017-02-22 (Wed, 22 Feb 2017)
Changed paths:
M htdocs/fourn/facture/card.php
Log Message:
-----------
Merge pull request #6455 from laudeco/fix/generation_billing_on_validation
generate new pdf when validate billing
Commit: ba03b17354916f2193441b0ee59227828aa2d374
https://github.com/Dolibarr/dolibarr/commit/ba03b17354916f2193441b0ee59227828aa2d374
Author: Laurent Destailleur <address@hidden>
Date: 2017-02-22 (Wed, 22 Feb 2017)
Changed paths:
M htdocs/core/class/html.form.class.php
Log Message:
-----------
Fix css
Commit: aefdc09cdc1f787a4e828752ef82e4d7766f45c7
https://github.com/Dolibarr/dolibarr/commit/aefdc09cdc1f787a4e828752ef82e4d7766f45c7
Author: Laurent Destailleur <address@hidden>
Date: 2017-02-22 (Wed, 22 Feb 2017)
Changed paths:
M htdocs/fourn/facture/card.php
Log Message:
-----------
Fix missing MAIN_DISABLE_PDF_AUTOUPDATE
Commit: a79903a2fcaaf3b98b41b40177a5c200ac636d81
https://github.com/Dolibarr/dolibarr/commit/a79903a2fcaaf3b98b41b40177a5c200ac636d81
Author: Laurent Destailleur <address@hidden>
Date: 2017-02-23 (Thu, 23 Feb 2017)
Changed paths:
M htdocs/core/lib/propal.lib.php
M htdocs/expensereport/card.php
M htdocs/resource/add.php
M htdocs/resource/class/html.formresource.class.php
M htdocs/theme/eldy/style.css.php
M htdocs/theme/md/style.css.php
Log Message:
-----------
Fix responsive design
Commit: e981e719a1d9e3f394de9c0320361c0fa1fc7387
https://github.com/Dolibarr/dolibarr/commit/e981e719a1d9e3f394de9c0320361c0fa1fc7387
Author: Laurent Destailleur <address@hidden>
Date: 2017-02-23 (Thu, 23 Feb 2017)
Changed paths:
M htdocs/comm/action/card.php
M htdocs/comm/propal/class/propal.class.php
M htdocs/contact/class/contact.class.php
M htdocs/core/boxes/box_services_contracts.php
M htdocs/core/lib/treeview.lib.php
M htdocs/user/class/user.class.php
M htdocs/user/hierarchy.php
Log Message:
-----------
Merge branch '4.0' of address@hidden:Dolibarr/dolibarr.git into 5.0
Conflicts:
htdocs/comm/action/card.php
Commit: fb88eaf2a4e47f5b3b0cfc7eb59b2ebdab89b723
https://github.com/Dolibarr/dolibarr/commit/fb88eaf2a4e47f5b3b0cfc7eb59b2ebdab89b723
Author: Laurent Destailleur <address@hidden>
Date: 2017-02-23 (Thu, 23 Feb 2017)
Changed paths:
M dev/initdemo/README
A dev/initdemo/documents_demo/societe/19/SEPA Mandate 19-Morgan
Bank-RUM1301-0008-0.pdf
R dev/initdemo/dolibarr-mysql2pgsql.pl
M dev/initdemo/mysqldump_dolibarr_5.0.0.sql
A dev/tools/dolibarr-mysql2pgsql.pl
M htdocs/comm/action/card.php
M htdocs/comm/propal/class/propal.class.php
M htdocs/compta/prelevement/card.php
M htdocs/compta/prelevement/class/bonprelevement.class.php
M htdocs/compta/prelevement/class/ligneprelevement.class.php
M htdocs/compta/prelevement/create.php
M htdocs/compta/prelevement/demandes.php
M htdocs/compta/prelevement/factures.php
M htdocs/compta/prelevement/fiche-rejet.php
M htdocs/compta/prelevement/fiche-stat.php
M htdocs/contact/class/contact.class.php
M htdocs/core/boxes/box_services_contracts.php
M htdocs/core/class/html.form.class.php
M htdocs/core/lib/functions.lib.php
M htdocs/core/lib/propal.lib.php
M htdocs/core/lib/treeview.lib.php
M htdocs/core/menus/init_menu_auguria.sql
M htdocs/core/menus/standard/auguria.lib.php
M htdocs/core/modules/modBarcode.class.php
M htdocs/core/modules/modCron.class.php
M htdocs/core/modules/modPrinting.class.php
M htdocs/core/modules/modProduct.class.php
M htdocs/expensereport/card.php
M htdocs/fourn/facture/card.php
M htdocs/langs/en_US/cron.lang
M htdocs/langs/en_US/withdrawals.lang
M htdocs/product/admin/product_tools.php
M htdocs/resource/add.php
M htdocs/resource/class/html.formresource.class.php
M htdocs/theme/eldy/style.css.php
M htdocs/theme/md/style.css.php
M htdocs/user/card.php
M htdocs/user/class/user.class.php
M htdocs/user/hierarchy.php
Log Message:
-----------
Merge branch '5.0' of address@hidden:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/filefunc.inc.php
Compare:
https://github.com/Dolibarr/dolibarr/compare/7673aff3bafc...fb88eaf2a4e4