[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Dolibarr-git] [Dolibarr/dolibarr] 02698c: fileconf.php redundant else s
|
From: |
Laurent Destailleur |
|
Subject: |
[Dolibarr-git] [Dolibarr/dolibarr] 02698c: fileconf.php redundant else statements |
|
Date: |
Fri, 09 Sep 2016 00:37:50 -0700 |
Branch: refs/heads/develop
Home: https://github.com/Dolibarr/dolibarr
Commit: 02698c5abb08b0458a8014e6048d15fd86694985
https://github.com/Dolibarr/dolibarr/commit/02698c5abb08b0458a8014e6048d15fd86694985
Author: Sergiu Sandu <address@hidden>
Date: 2016-09-07 (Wed, 07 Sep 2016)
Changed paths:
M htdocs/install/fileconf.php
Log Message:
-----------
fileconf.php redundant else statements
Is it ok the 2 else blocks are the same?
Commit: 2b43eb934fc6f4636778c44081d06c3c31036762
https://github.com/Dolibarr/dolibarr/commit/2b43eb934fc6f4636778c44081d06c3c31036762
Author: aspangaro <address@hidden>
Date: 2016-09-07 (Wed, 07 Sep 2016)
Changed paths:
M htdocs/fourn/commande/index.php
Log Message:
-----------
Fix: Problem of presentation with index supplier command
Commit: 2b7ef01e422aae00d22abaae8da5d339f66b4c72
https://github.com/Dolibarr/dolibarr/commit/2b7ef01e422aae00d22abaae8da5d339f66b4c72
Author: Laurent Destailleur <address@hidden>
Date: 2016-09-08 (Thu, 08 Sep 2016)
Changed paths:
M htdocs/admin/tools/export.php
M htdocs/core/lib/functions.lib.php
Log Message:
-----------
FIX SEC for HTB23302
Commit: 35145b74267a4ed7a01ed9c7b0dc7ac20214809d
https://github.com/Dolibarr/dolibarr/commit/35145b74267a4ed7a01ed9c7b0dc7ac20214809d
Author: Laurent Destailleur <address@hidden>
Date: 2016-09-08 (Thu, 08 Sep 2016)
Changed paths:
M htdocs/filefunc.inc.php
Log Message:
-----------
Merge branch '4.0' of address@hidden:Dolibarr/dolibarr.git into 4.0
Commit: 9affdc088689fcefc3e2562c0cb59a33d4efb18d
https://github.com/Dolibarr/dolibarr/commit/9affdc088689fcefc3e2562c0cb59a33d4efb18d
Author: Laurent Destailleur <address@hidden>
Date: 2016-09-08 (Thu, 08 Sep 2016)
Changed paths:
M htdocs/filefunc.inc.php
Log Message:
-----------
Prepare 4.0.1
Commit: 9aa6c72a116a1871fc49343afc20aeb4b5e9ddb6
https://github.com/Dolibarr/dolibarr/commit/9aa6c72a116a1871fc49343afc20aeb4b5e9ddb6
Author: Laurent Destailleur <address@hidden>
Date: 2016-09-08 (Thu, 08 Sep 2016)
Changed paths:
M htdocs/cron/card.php
M htdocs/cron/class/cronjob.class.php
M htdocs/cron/list.php
Log Message:
-----------
FIX Update of maxnbrun on job list failed.
Commit: 71cef95dda7e9f2f2099fca619a7ad57cb88ad72
https://github.com/Dolibarr/dolibarr/commit/71cef95dda7e9f2f2099fca619a7ad57cb88ad72
Author: Laurent Destailleur <address@hidden>
Date: 2016-09-08 (Thu, 08 Sep 2016)
Changed paths:
M htdocs/cron/card.php
M htdocs/cron/class/cronjob.class.php
M htdocs/cron/list.php
Log Message:
-----------
FIX Execute a dedicated job from its id may results of launching other
jobs too.
Commit: 79171699610d974f319a187abe2ac3299f57736b
https://github.com/Dolibarr/dolibarr/commit/79171699610d974f319a187abe2ac3299f57736b
Author: phf <address@hidden>
Date: 2016-09-08 (Thu, 08 Sep 2016)
Changed paths:
M htdocs/install/mysql/migration/3.9.0-4.0.0.sql
M htdocs/install/mysql/tables/llx_multicurrency_rate.sql
Log Message:
-----------
Fix miss entity column in llx_multicurrency_rate
Commit: 7229b572dcd771deffade94c7c24f73f95c7ba37
https://github.com/Dolibarr/dolibarr/commit/7229b572dcd771deffade94c7c24f73f95c7ba37
Author: phf <address@hidden>
Date: 2016-09-08 (Thu, 08 Sep 2016)
Changed paths:
M htdocs/install/mysql/migration/3.9.0-4.0.0.sql
Log Message:
-----------
Default entity 1 in llx_multicurrency_rate
Commit: 6fd14128baa0f3775031700b9322dbaa62135512
https://github.com/Dolibarr/dolibarr/commit/6fd14128baa0f3775031700b9322dbaa62135512
Author: philippe grand <address@hidden>
Date: 2016-09-08 (Thu, 08 Sep 2016)
Changed paths:
M htdocs/adherents/list.php
Log Message:
-----------
fix : bad name
Commit: 417b2f566f88fc031dba2d78c3a89269cae247fa
https://github.com/Dolibarr/dolibarr/commit/417b2f566f88fc031dba2d78c3a89269cae247fa
Author: Laurent Destailleur <address@hidden>
Date: 2016-09-08 (Thu, 08 Sep 2016)
Changed paths:
M htdocs/core/modules/propale/doc/pdf_azur.modules.php
M htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php
M htdocs/langs/en_US/companies.lang
Log Message:
-----------
FIX Translation of "Name" is not a good choice for floow-up.
Commit: c3bb4a89e484edb924a067ed5d7f9f2202f4cf5f
https://github.com/Dolibarr/dolibarr/commit/c3bb4a89e484edb924a067ed5d7f9f2202f4cf5f
Author: Laurent Destailleur <address@hidden>
Date: 2016-09-08 (Thu, 08 Sep 2016)
Changed paths:
M htdocs/contrat/card.php
M htdocs/contrat/services.php
Log Message:
-----------
Fix late satus on contract service line
Commit: bdb55895fa6261f3ccf9d0edc0546995d44d570c
https://github.com/Dolibarr/dolibarr/commit/bdb55895fa6261f3ccf9d0edc0546995d44d570c
Author: Juanjo Menent <address@hidden>
Date: 2016-09-08 (Thu, 08 Sep 2016)
Changed paths:
M htdocs/install/fileconf.php
Log Message:
-----------
Merge pull request #5713 from sanser/4.0
FIX: fileconf.php redundant else blocks
Commit: 4fe4907b442e4e0fc05a5f30e6ed71133abe1da0
https://github.com/Dolibarr/dolibarr/commit/4fe4907b442e4e0fc05a5f30e6ed71133abe1da0
Author: Laurent Destailleur <address@hidden>
Date: 2016-09-08 (Thu, 08 Sep 2016)
Changed paths:
M htdocs/compta/facture.php
Log Message:
-----------
FIX Mandatory field payment term was not css highlighted.
Commit: fc8fe394dbade5c5beab03227be66a45ffad2f3b
https://github.com/Dolibarr/dolibarr/commit/fc8fe394dbade5c5beab03227be66a45ffad2f3b
Author: Juanjo Menent <address@hidden>
Date: 2016-09-08 (Thu, 08 Sep 2016)
Changed paths:
M htdocs/fourn/commande/index.php
Log Message:
-----------
Merge pull request #5714 from aspangaro/4.0-p48
FIX: Problem of presentation with index supplier command
Commit: ecfd3a0af5438bfd2fcec3b6cb69b47682aec0fe
https://github.com/Dolibarr/dolibarr/commit/ecfd3a0af5438bfd2fcec3b6cb69b47682aec0fe
Author: Juanjo Menent <address@hidden>
Date: 2016-09-08 (Thu, 08 Sep 2016)
Changed paths:
M htdocs/install/mysql/migration/3.9.0-4.0.0.sql
M htdocs/install/mysql/tables/llx_multicurrency_rate.sql
Log Message:
-----------
Merge pull request #5722 from atm-ph/fix_4.0_multicurrency_rate_entity
Fix miss entity column in llx_multicurrency_rate
Commit: 52801b13d9e64988803846150a5ac1bfd4904048
https://github.com/Dolibarr/dolibarr/commit/52801b13d9e64988803846150a5ac1bfd4904048
Author: Laurent Destailleur <address@hidden>
Date: 2016-09-08 (Thu, 08 Sep 2016)
Changed paths:
M htdocs/fourn/commande/index.php
M htdocs/install/fileconf.php
M htdocs/install/mysql/migration/3.9.0-4.0.0.sql
M htdocs/install/mysql/tables/llx_multicurrency_rate.sql
Log Message:
-----------
Merge branch '4.0' of address@hidden:Dolibarr/dolibarr.git into 4.0
Commit: 65ba409add6d05629f35078e7d2e12fc71a1ea12
https://github.com/Dolibarr/dolibarr/commit/65ba409add6d05629f35078e7d2e12fc71a1ea12
Author: Juanjo Menent <address@hidden>
Date: 2016-09-08 (Thu, 08 Sep 2016)
Changed paths:
M htdocs/adherents/list.php
Log Message:
-----------
Merge pull request #5724 from grandoc/4.0
fix : bad name
Commit: 87165cd859a1829b8102d9f0e71e25214a987144
https://github.com/Dolibarr/dolibarr/commit/87165cd859a1829b8102d9f0e71e25214a987144
Author: Laurent Destailleur <address@hidden>
Date: 2016-09-08 (Thu, 08 Sep 2016)
Changed paths:
M htdocs/adherents/list.php
Log Message:
-----------
Merge branch '4.0' of address@hidden:Dolibarr/dolibarr.git into 4.0
Commit: efde12b489d1bbea2783494f53261f610f3d0f48
https://github.com/Dolibarr/dolibarr/commit/efde12b489d1bbea2783494f53261f610f3d0f48
Author: Laurent Destailleur <address@hidden>
Date: 2016-09-09 (Fri, 09 Sep 2016)
Changed paths:
M htdocs/cashdesk/tpl/facturation1.tpl.php
M htdocs/holiday/list.php
M htdocs/theme/eldy/style.css.php
M htdocs/theme/md/style.css.php
Log Message:
-----------
Fix minor css
Commit: 0debcf745a91f50bdb7b90d8e0f0100b74ea60de
https://github.com/Dolibarr/dolibarr/commit/0debcf745a91f50bdb7b90d8e0f0100b74ea60de
Author: Laurent Destailleur <address@hidden>
Date: 2016-09-09 (Fri, 09 Sep 2016)
Changed paths:
M htdocs/admin/tools/export.php
M htdocs/cashdesk/tpl/facturation1.tpl.php
M htdocs/compta/facture.php
M htdocs/contrat/card.php
M htdocs/contrat/services.php
M htdocs/core/lib/functions.lib.php
M htdocs/core/modules/propale/doc/pdf_azur.modules.php
M htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php
M htdocs/cron/card.php
M htdocs/cron/class/cronjob.class.php
M htdocs/cron/list.php
M htdocs/fourn/commande/index.php
M htdocs/holiday/list.php
M htdocs/install/fileconf.php
M htdocs/install/mysql/migration/3.9.0-4.0.0.sql
M htdocs/install/mysql/tables/llx_multicurrency_rate.sql
M htdocs/langs/en_US/companies.lang
M htdocs/theme/eldy/style.css.php
M htdocs/theme/md/style.css.php
Log Message:
-----------
Merge branch '4.0' of address@hidden:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/cron/card.php
htdocs/cron/list.php
htdocs/filefunc.inc.php
Commit: 858291c3a3f5cc6f6afe1e2c05fb1c30292a5949
https://github.com/Dolibarr/dolibarr/commit/858291c3a3f5cc6f6afe1e2c05fb1c30292a5949
Author: Laurent Destailleur <address@hidden>
Date: 2016-09-09 (Fri, 09 Sep 2016)
Changed paths:
M dev/skeletons/modMyModule.class.php
M htdocs/contact/list.php
M htdocs/core/lib/functions.lib.php
M htdocs/core/modules/DolibarrModules.class.php
Log Message:
-----------
Merge branch 'develop' of address@hidden:Dolibarr/dolibarr.git into develop
Compare:
https://github.com/Dolibarr/dolibarr/compare/2625d4003803...858291c3a3f5