[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Dolibarr-git] [Dolibarr/dolibarr] 85068e: Merge branch '3.8' of address
|
From: |
Laurent Destailleur |
|
Subject: |
[Dolibarr-git] [Dolibarr/dolibarr] 85068e: Merge branch '3.8' of address@hidden:Dolibarr/doli... |
|
Date: |
Wed, 25 Nov 2015 16:32:32 -0800 |
Branch: refs/heads/develop
Home: https://github.com/Dolibarr/dolibarr
Commit: 85068ec4e9f169d2f23bcbd4f52220eff8631789
https://github.com/Dolibarr/dolibarr/commit/85068ec4e9f169d2f23bcbd4f52220eff8631789
Author: Florian HENRY <address@hidden>
Date: 2015-11-16 (Mon, 16 Nov 2015)
Changed paths:
M dev/initdata/mysqldump_dolibarr_3.8.0.sql
M dev/initdata/savedemo.sh
Log Message:
-----------
Merge branch '3.8' of address@hidden:Dolibarr/dolibarr.git into 3.8
Commit: bd368fd1e56ba74412334dd741d9ec857ab877ba
https://github.com/Dolibarr/dolibarr/commit/bd368fd1e56ba74412334dd741d9ec857ab877ba
Author: Florian HENRY <address@hidden>
Date: 2015-11-17 (Tue, 17 Nov 2015)
Changed paths:
M htdocs/comm/propal/class/propal.class.php
M htdocs/core/class/hookmanager.class.php
M htdocs/core/class/html.form.class.php
M htdocs/fichinter/card.php
M htdocs/fourn/class/fournisseur.commande.class.php
M htdocs/margin/agentMargins.php
M htdocs/margin/lib/margins.lib.php
Log Message:
-----------
Merge branch '3.8' of address@hidden:Dolibarr/dolibarr.git into 3.8
Commit: 28196a5fd92a5c6ef66c287911b2a1584519ae6a
https://github.com/Dolibarr/dolibarr/commit/28196a5fd92a5c6ef66c287911b2a1584519ae6a
Author: Florian HENRY <address@hidden>
Date: 2015-11-18 (Wed, 18 Nov 2015)
Changed paths:
M htdocs/install/pgsql/functions/functions.sql
Log Message:
-----------
add pgsql function
Commit: 0c4f7a1b229bce634701524a7ffc574a552fe669
https://github.com/Dolibarr/dolibarr/commit/0c4f7a1b229bce634701524a7ffc574a552fe669
Author: Florian HENRY <address@hidden>
Date: 2015-11-19 (Thu, 19 Nov 2015)
Changed paths:
M htdocs/core/tpl/document_actions_pre_headers.tpl.php
Log Message:
-----------
Merge branch '3.8' of address@hidden:Dolibarr/dolibarr.git into 3.8
Commit: 80f19de223f781ee394325e6859f421ee0a9df2f
https://github.com/Dolibarr/dolibarr/commit/80f19de223f781ee394325e6859f421ee0a9df2f
Author: Florian HENRY <address@hidden>
Date: 2015-11-19 (Thu, 19 Nov 2015)
Changed paths:
M htdocs/core/class/extrafields.class.php
Log Message:
-----------
fix && vs and
Commit: c0d29d2a15c5cf9871441d16acd922cf437828eb
https://github.com/Dolibarr/dolibarr/commit/c0d29d2a15c5cf9871441d16acd922cf437828eb
Author: Florian HENRY <address@hidden>
Date: 2015-11-21 (Sat, 21 Nov 2015)
Changed paths:
M htdocs/admin/menus/edit.php
M htdocs/comm/mailing/cibles.php
M htdocs/core/lib/functions2.lib.php
Log Message:
-----------
Merge branch '3.8' of address@hidden:Dolibarr/dolibarr.git into 3.8
Commit: e31a8f25a216fcf88a3a9fe64ecce555ee734b95
https://github.com/Dolibarr/dolibarr/commit/e31a8f25a216fcf88a3a9fe64ecce555ee734b95
Author: Marcos García de La Fuente <address@hidden>
Date: 2015-11-21 (Sat, 21 Nov 2015)
Changed paths:
M htdocs/comm/mailing/class/mailing.class.php
Log Message:
-----------
FIX #4018 SQL error if trying to access the mailing/card.php page without an
ID defined
Commit: eba5832d3ad9fdb7101e844b327eb3081c906978
https://github.com/Dolibarr/dolibarr/commit/eba5832d3ad9fdb7101e844b327eb3081c906978
Author: Marcos García de La Fuente <address@hidden>
Date: 2015-11-21 (Sat, 21 Nov 2015)
Changed paths:
M htdocs/product/card.php
Log Message:
-----------
FIX #4049 PHP warning when trying to access a non-existing product/service
Commit: e8fc5f0d3ac3f1062e48ef464177432e6027429f
https://github.com/Dolibarr/dolibarr/commit/e8fc5f0d3ac3f1062e48ef464177432e6027429f
Author: Marcos García de La Fuente <address@hidden>
Date: 2015-11-21 (Sat, 21 Nov 2015)
Changed paths:
M htdocs/fourn/class/fournisseur.commande.class.php
Log Message:
-----------
FIX #3987 Undefined variable $newref in CommandeFournisseur::approve
Commit: 4bf6cf4e65b847044036ad332e5294aabb2d271e
https://github.com/Dolibarr/dolibarr/commit/4bf6cf4e65b847044036ad332e5294aabb2d271e
Author: Marcos García de La Fuente <address@hidden>
Date: 2015-11-21 (Sat, 21 Nov 2015)
Changed paths:
M htdocs/core/boxes/modules_boxes.php
Log Message:
-----------
FIX #3508 Useless tooltip in 3.8 boxes
Commit: 3fbe10a5784e8025020700229d46821a1ed14f9a
https://github.com/Dolibarr/dolibarr/commit/3fbe10a5784e8025020700229d46821a1ed14f9a
Author: Marcos García de La Fuente <address@hidden>
Date: 2015-11-21 (Sat, 21 Nov 2015)
Changed paths:
M htdocs/theme/eldy/style.css.php
Log Message:
-----------
FIX #3293 Login page form icons not shown
Commit: a456d212494625d4781687da4b7c82af0bf142b8
https://github.com/Dolibarr/dolibarr/commit/a456d212494625d4781687da4b7c82af0bf142b8
Author: Marcos García de La Fuente <address@hidden>
Date: 2015-11-21 (Sat, 21 Nov 2015)
Changed paths:
M htdocs/core/class/dolgeoip.class.php
Log Message:
-----------
FIX #3231 [Members] Public subscription page displays GeoIP error
Commit: 54b6ff02c027e45d782b67c30b2ef612e35c278f
https://github.com/Dolibarr/dolibarr/commit/54b6ff02c027e45d782b67c30b2ef612e35c278f
Author: Laurent Destailleur <address@hidden>
Date: 2015-11-21 (Sat, 21 Nov 2015)
Changed paths:
M htdocs/core/class/extrafields.class.php
M htdocs/install/pgsql/functions/functions.sql
Log Message:
-----------
Merge pull request #4048 from FHenry/3.8
FIX Missing fields managed by update_customer_modtime in 3.8
Commit: 295d83001a2e1f55f35d99145c296a51b8963b67
https://github.com/Dolibarr/dolibarr/commit/295d83001a2e1f55f35d99145c296a51b8963b67
Author: Laurent Destailleur <address@hidden>
Date: 2015-11-21 (Sat, 21 Nov 2015)
Changed paths:
M htdocs/comm/mailing/class/mailing.class.php
Log Message:
-----------
Merge pull request #4051 from marcosgdf/bug-4018
FIX #4018 SQL error if trying to access the mailing/card.php page without an ID
defined
Commit: 4481c4f978b2dfe6b6f851e77cdd9d015be83edd
https://github.com/Dolibarr/dolibarr/commit/4481c4f978b2dfe6b6f851e77cdd9d015be83edd
Author: Laurent Destailleur <address@hidden>
Date: 2015-11-21 (Sat, 21 Nov 2015)
Changed paths:
M htdocs/product/card.php
Log Message:
-----------
Merge pull request #4052 from marcosgdf/bug-4049
FIX #4049 PHP warning when trying to access a non-existing product/service
Commit: dc6496fdf3e3ff3ca172f907a644ff59a7362f4a
https://github.com/Dolibarr/dolibarr/commit/dc6496fdf3e3ff3ca172f907a644ff59a7362f4a
Author: Laurent Destailleur <address@hidden>
Date: 2015-11-21 (Sat, 21 Nov 2015)
Changed paths:
M htdocs/core/boxes/modules_boxes.php
Log Message:
-----------
Merge pull request #4054 from marcosgdf/bug-3508
FIX #3508 Useless tooltip in 3.8 boxes
Commit: 7bde781206d0cd9907c7082feea74e1b48053e61
https://github.com/Dolibarr/dolibarr/commit/7bde781206d0cd9907c7082feea74e1b48053e61
Author: Laurent Destailleur <address@hidden>
Date: 2015-11-21 (Sat, 21 Nov 2015)
Changed paths:
M htdocs/core/class/dolgeoip.class.php
Log Message:
-----------
Merge pull request #4061 from marcosgdf/bug-3231
FIX #3231 [Members] Public subscription page displays GeoIP error
Commit: a30f7d543a225567e903a75d579f893ac9db074b
https://github.com/Dolibarr/dolibarr/commit/a30f7d543a225567e903a75d579f893ac9db074b
Author: Marcos García <address@hidden>
Date: 2015-11-25 (Wed, 25 Nov 2015)
Changed paths:
M htdocs/fourn/class/fournisseur.commande.class.php
Log Message:
-----------
Corrected fix
Commit: 677cba01cee6298a98105b0e06d67258459974d6
https://github.com/Dolibarr/dolibarr/commit/677cba01cee6298a98105b0e06d67258459974d6
Author: braito4 <address@hidden>
Date: 2015-11-25 (Wed, 25 Nov 2015)
Changed paths:
M htdocs/projet/element.php
Log Message:
-----------
Part solution bug #4095
It allow us to deactivate the link to a project queries to lower the page
workload.
Commit: c8da4ee9f358a38c1be253ef1d646430c49e080a
https://github.com/Dolibarr/dolibarr/commit/c8da4ee9f358a38c1be253ef1d646430c49e080a
Author: Laurent Destailleur <address@hidden>
Date: 2015-11-25 (Wed, 25 Nov 2015)
Changed paths:
M htdocs/theme/eldy/style.css.php
Log Message:
-----------
Merge pull request #4058 from marcosgdf/bug-3293
FIX #3293 Login page form icons not shown
Commit: 1caf148dc6167a695e34f2d5928cda585a35caf2
https://github.com/Dolibarr/dolibarr/commit/1caf148dc6167a695e34f2d5928cda585a35caf2
Author: Laurent Destailleur <address@hidden>
Date: 2015-11-25 (Wed, 25 Nov 2015)
Changed paths:
M htdocs/fourn/class/fournisseur.commande.class.php
Log Message:
-----------
Merge pull request #4053 from marcosgdf/bug-3987
FIX #3987 Undefined variable $newref in CommandeFournisseur::approve
Commit: 85d788d43a1298716c1d1f69ed8a39f4ae519873
https://github.com/Dolibarr/dolibarr/commit/85d788d43a1298716c1d1f69ed8a39f4ae519873
Author: Laurent Destailleur <address@hidden>
Date: 2015-11-25 (Wed, 25 Nov 2015)
Changed paths:
M dev/codesniffer/ruleset.xml
Log Message:
-----------
Fix crazy phpcs test
Commit: ad087a75e620e31bf1822bd1cff91d692e99c70f
https://github.com/Dolibarr/dolibarr/commit/ad087a75e620e31bf1822bd1cff91d692e99c70f
Author: Laurent Destailleur <address@hidden>
Date: 2015-11-25 (Wed, 25 Nov 2015)
Changed paths:
M htdocs/theme/eldy/style.css.php
Log Message:
-----------
Fix missing php
Commit: ddd0f8224fd9d12529de61a71f085d94eb1b479d
https://github.com/Dolibarr/dolibarr/commit/ddd0f8224fd9d12529de61a71f085d94eb1b479d
Author: Laurent Destailleur <address@hidden>
Date: 2015-11-26 (Thu, 26 Nov 2015)
Changed paths:
M htdocs/theme/eldy/style.css.php
Log Message:
-----------
Picto was not visible onto login page, we keep this behaviour.
Commit: bc6d04e495590add4cbf93d56ea301d75378ab6f
https://github.com/Dolibarr/dolibarr/commit/bc6d04e495590add4cbf93d56ea301d75378ab6f
Author: Laurent Destailleur <address@hidden>
Date: 2015-11-26 (Thu, 26 Nov 2015)
Changed paths:
M htdocs/langs/en_US/mails.lang
Log Message:
-----------
Typo
Commit: a1a5eba2de1c9de5223b8d6b8464b5ad09277cd0
https://github.com/Dolibarr/dolibarr/commit/a1a5eba2de1c9de5223b8d6b8464b5ad09277cd0
Author: Laurent Destailleur <address@hidden>
Date: 2015-11-26 (Thu, 26 Nov 2015)
Changed paths:
M htdocs/projet/element.php
Log Message:
-----------
Merge pull request #4096 from braito4/patch-1
Part solution bug #4095
Commit: f353464bce1fe2698459672c0e97cfb1341c6930
https://github.com/Dolibarr/dolibarr/commit/f353464bce1fe2698459672c0e97cfb1341c6930
Author: Laurent Destailleur <address@hidden>
Date: 2015-11-26 (Thu, 26 Nov 2015)
Changed paths:
M htdocs/core/class/html.formprojet.class.php
Log Message:
-----------
Prepare code to fix #4095
Commit: 1608fec9372465deef22cea1a9aee3903020dfef
https://github.com/Dolibarr/dolibarr/commit/1608fec9372465deef22cea1a9aee3903020dfef
Author: Laurent Destailleur <address@hidden>
Date: 2015-11-26 (Thu, 26 Nov 2015)
Changed paths:
M htdocs/projet/element.php
Log Message:
-----------
Merge branch '3.8' of address@hidden:Dolibarr/dolibarr.git into 3.8
Commit: b47dbc7a5fd31ce23ce9f5f459bc454e9c57c1ea
https://github.com/Dolibarr/dolibarr/commit/b47dbc7a5fd31ce23ce9f5f459bc454e9c57c1ea
Author: Laurent Destailleur <address@hidden>
Date: 2015-11-26 (Thu, 26 Nov 2015)
Changed paths:
M dev/codesniffer/ruleset.xml
M htdocs/comm/mailing/class/mailing.class.php
M htdocs/core/boxes/modules_boxes.php
M htdocs/core/class/dolgeoip.class.php
M htdocs/core/class/html.formprojet.class.php
M htdocs/fourn/class/fournisseur.commande.class.php
M htdocs/install/pgsql/functions/functions.sql
M htdocs/langs/en_US/mails.lang
M htdocs/product/card.php
M htdocs/projet/element.php
M htdocs/theme/eldy/style.css.php
Log Message:
-----------
Merge remote-tracking branch 'origin/3.8' into develop
Conflicts:
htdocs/install/pgsql/functions/functions.sql
htdocs/projet/element.php
Compare:
https://github.com/Dolibarr/dolibarr/compare/995db6111075...b47dbc7a5fd3