[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Dolibarr-git] [Dolibarr/dolibarr] b57f0a: Fix option to use old path fo
|
From: |
Laurent Destailleur |
|
Subject: |
[Dolibarr-git] [Dolibarr/dolibarr] b57f0a: Fix option to use old path for product is for comp... |
|
Date: |
Mon, 08 Jun 2015 09:29:06 -0700 |
Branch: refs/heads/develop
Home: https://github.com/Dolibarr/dolibarr
Commit: b57f0a0e5fb4ab17565551bcc1f70fdd31054abf
https://github.com/Dolibarr/dolibarr/commit/b57f0a0e5fb4ab17565551bcc1f70fdd31054abf
Author: Laurent Destailleur <address@hidden>
Date: 2015-06-05 (Fri, 05 Jun 2015)
Changed paths:
M htdocs/install/mysql/migration/3.6.0-3.7.0.sql
Log Message:
-----------
Fix option to use old path for product is for compatibility if user come
from 3.6 or lower. Must not be enabled on 3.7.0 or +.
Commit: 9a812a6c287913437e0262b4aea5e5acb37318bb
https://github.com/Dolibarr/dolibarr/commit/9a812a6c287913437e0262b4aea5e5acb37318bb
Author: Regis Houssin <address@hidden>
Date: 2015-06-06 (Sat, 06 Jun 2015)
Changed paths:
M htdocs/comm/propal.php
M htdocs/commande/card.php
M htdocs/compta/facture.php
M htdocs/core/tpl/document_actions_post_headers.tpl.php
M htdocs/expedition/card.php
M htdocs/fichinter/card.php
M htdocs/fourn/commande/card.php
M htdocs/fourn/facture/card.php
Log Message:
-----------
Fix: add filter for "dol_most_recent_files" for avoid conflict with
option "Save file on server with name "FA0700034-Original filename""
Commit: 536f565d4e4105844e536a3e573da54ab6e50aff
https://github.com/Dolibarr/dolibarr/commit/536f565d4e4105844e536a3e573da54ab6e50aff
Author: Laurent Destailleur <address@hidden>
Date: 2015-06-07 (Sun, 07 Jun 2015)
Changed paths:
M htdocs/core/lib/company.lib.php
Log Message:
-----------
Fix Return value is always utf8 encoded and without entities.
Commit: de0dd5da603e93998e9e38d745788ff0fd1dad64
https://github.com/Dolibarr/dolibarr/commit/de0dd5da603e93998e9e38d745788ff0fd1dad64
Author: Regis Houssin <address@hidden>
Date: 2015-06-08 (Mon, 08 Jun 2015)
Changed paths:
M htdocs/install/mysql/migration/3.6.0-3.7.0.sql
Log Message:
-----------
Fix: Drop foreign key for avoid Mysql crash
Commit: dc3ae2237904bb47737b46bd3194963ac5359645
https://github.com/Dolibarr/dolibarr/commit/dc3ae2237904bb47737b46bd3194963ac5359645
Author: Juanjo Menent <address@hidden>
Date: 2015-06-08 (Mon, 08 Jun 2015)
Changed paths:
M htdocs/install/mysql/migration/3.6.0-3.7.0.sql
Log Message:
-----------
Merge pull request #2980 from hregis/3.7_crash
Close #2951
Commit: 7f16eea13b5b248d3f57290a49d005972ad19816
https://github.com/Dolibarr/dolibarr/commit/7f16eea13b5b248d3f57290a49d005972ad19816
Author: Laurent Destailleur <address@hidden>
Date: 2015-06-08 (Mon, 08 Jun 2015)
Changed paths:
M htdocs/comm/propal.php
M htdocs/commande/card.php
M htdocs/compta/facture.php
M htdocs/core/tpl/document_actions_post_headers.tpl.php
M htdocs/expedition/card.php
M htdocs/fichinter/card.php
M htdocs/fourn/commande/card.php
M htdocs/fourn/facture/card.php
Log Message:
-----------
Merge pull request #2978 from hregis/3.7-bug
Fix: use dash instead underscore and add filter for "dol_most_recent_files" for
avoid conflict
Commit: 08c9dd358d12581c8774d6ae10f707ec745625e8
https://github.com/Dolibarr/dolibarr/commit/08c9dd358d12581c8774d6ae10f707ec745625e8
Author: Raphaël Doursenaud <address@hidden>
Date: 2015-06-08 (Mon, 08 Jun 2015)
Changed paths:
M htdocs/core/class/html.form.class.php
Log Message:
-----------
FIX #2983 Load gravatar avatar images securely over HTTPS
Commit: 9e1dd42b56d37f1666bef1db15d348a44eadef51
https://github.com/Dolibarr/dolibarr/commit/9e1dd42b56d37f1666bef1db15d348a44eadef51
Author: Laurent Destailleur <address@hidden>
Date: 2015-06-08 (Mon, 08 Jun 2015)
Changed paths:
M htdocs/public/demo/index.php
Log Message:
-----------
Fix #2986
Commit: 3ed200766ccc864216f2a0e7554b233b2859b6b8
https://github.com/Dolibarr/dolibarr/commit/3ed200766ccc864216f2a0e7554b233b2859b6b8
Author: Laurent Destailleur <address@hidden>
Date: 2015-06-08 (Mon, 08 Jun 2015)
Changed paths:
M htdocs/comm/propal.php
M htdocs/commande/card.php
M htdocs/compta/facture.php
M htdocs/core/tpl/document_actions_post_headers.tpl.php
M htdocs/expedition/card.php
M htdocs/fichinter/card.php
M htdocs/fourn/commande/card.php
M htdocs/fourn/facture/card.php
M htdocs/install/mysql/migration/3.6.0-3.7.0.sql
Log Message:
-----------
Merge branch '3.7' of address@hidden:Dolibarr/dolibarr.git into 3.7
Commit: fd42b17027622f84a65f0a506589e4bc6644d379
https://github.com/Dolibarr/dolibarr/commit/fd42b17027622f84a65f0a506589e4bc6644d379
Author: Laurent Destailleur <address@hidden>
Date: 2015-06-08 (Mon, 08 Jun 2015)
Changed paths:
M htdocs/core/class/html.form.class.php
Log Message:
-----------
Merge pull request #2984 from GPCsolutions/dolibarr-2983
FIX #2983 Load gravatar avatar images securely over HTTPS
Commit: 35dd069ec974fe1619aac532858ce5fbf83b5b9a
https://github.com/Dolibarr/dolibarr/commit/35dd069ec974fe1619aac532858ce5fbf83b5b9a
Author: Laurent Destailleur <address@hidden>
Date: 2015-06-08 (Mon, 08 Jun 2015)
Changed paths:
M htdocs/core/lib/functions.lib.php
M htdocs/public/members/public_card.php
M htdocs/public/members/public_list.php
M htdocs/theme/eldy/style.css.php
Log Message:
-----------
Fix #2994
Commit: f9d85973aa0d2900e4caea8f0a0b61d415a6325b
https://github.com/Dolibarr/dolibarr/commit/f9d85973aa0d2900e4caea8f0a0b61d415a6325b
Author: Laurent Destailleur <address@hidden>
Date: 2015-06-08 (Mon, 08 Jun 2015)
Changed paths:
M htdocs/core/class/html.form.class.php
Log Message:
-----------
Merge remote-tracking branch 'origin/3.5' into 3.6
Commit: 05a653ee5f27efa734b21543dd7ed5ea3a5ce725
https://github.com/Dolibarr/dolibarr/commit/05a653ee5f27efa734b21543dd7ed5ea3a5ce725
Author: Laurent Destailleur <address@hidden>
Date: 2015-06-08 (Mon, 08 Jun 2015)
Changed paths:
M htdocs/core/class/html.form.class.php
Log Message:
-----------
Merge remote-tracking branch 'origin/3.6' into 3.7
Conflicts:
htdocs/core/class/html.form.class.php
Commit: 9b7982bf0c7330d73fa3ff74de06e2ae092e6cb7
https://github.com/Dolibarr/dolibarr/commit/9b7982bf0c7330d73fa3ff74de06e2ae092e6cb7
Author: Laurent Destailleur <address@hidden>
Date: 2015-06-08 (Mon, 08 Jun 2015)
Changed paths:
M htdocs/comm/propal.php
M htdocs/commande/card.php
M htdocs/compta/facture.php
M htdocs/core/lib/functions.lib.php
M htdocs/core/tpl/document_actions_post_headers.tpl.php
M htdocs/expedition/card.php
M htdocs/fichinter/card.php
M htdocs/fourn/commande/card.php
M htdocs/fourn/facture/card.php
M htdocs/install/mysql/migration/3.6.0-3.7.0.sql
M htdocs/public/demo/index.php
M htdocs/public/members/public_card.php
M htdocs/public/members/public_list.php
M htdocs/theme/eldy/style.css.php
Log Message:
-----------
Merge remote-tracking branch 'origin/3.7' into develop
Conflicts:
htdocs/comm/propal.php
htdocs/commande/card.php
htdocs/compta/facture.php
htdocs/core/class/html.form.class.php
htdocs/fourn/facture/card.php
htdocs/theme/eldy/style.css.php
Compare:
https://github.com/Dolibarr/dolibarr/compare/b61f7dda0bed...9b7982bf0c73