[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Dolibarr-git] [Dolibarr/dolibarr] 34987d: Exclude conf.php file from gi
|
From: |
Laurent Destailleur |
|
Subject: |
[Dolibarr-git] [Dolibarr/dolibarr] 34987d: Exclude conf.php file from git |
|
Date: |
Sat, 24 Aug 2013 12:57:50 -0700 |
Branch: refs/heads/3.4_backported
Home: https://github.com/Dolibarr/dolibarr
Commit: 34987d3e8b2802d814f33dd9bb85c1f788f6351f
https://github.com/Dolibarr/dolibarr/commit/34987d3e8b2802d814f33dd9bb85c1f788f6351f
Author: Laurent Destailleur <address@hidden>
Date: 2013-08-10 (Sat, 10 Aug 2013)
Changed paths:
M htdocs/conf/.gitignore
Log Message:
-----------
Exclude conf.php file from git
Commit: 26d1352de4ee29f9a0c3b2bb9abd78efa5b1d36d
https://github.com/Dolibarr/dolibarr/commit/26d1352de4ee29f9a0c3b2bb9abd78efa5b1d36d
Author: Florian Henry <address@hidden>
Date: 2013-08-12 (Mon, 12 Aug 2013)
Changed paths:
M ChangeLog
M htdocs/core/class/commonobject.class.php
Log Message:
-----------
Fix update extrafield do not display immediatly
Commit: 067c8c55b9fc52351c82e97e5699c5ba1452d1a3
https://github.com/Dolibarr/dolibarr/commit/067c8c55b9fc52351c82e97e5699c5ba1452d1a3
Author: simnandez <address@hidden>
Date: 2013-08-12 (Mon, 12 Aug 2013)
Changed paths:
M ChangeLog
M htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
Log Message:
-----------
Fix: [ bug #1033 ] SUPPLIER REF disappeared
Commit: da565b2c7f5e7b1c409265c8ea9ff076dc0adc1f
https://github.com/Dolibarr/dolibarr/commit/da565b2c7f5e7b1c409265c8ea9ff076dc0adc1f
Author: Florian Henry <address@hidden>
Date: 2013-08-12 (Mon, 12 Aug 2013)
Changed paths:
M htdocs/societe/canvas/company/tpl/card_create.tpl.php
M htdocs/societe/canvas/company/tpl/card_edit.tpl.php
Log Message:
-----------
Change-Id: I3d7bc928bf2428e4a96c61fd9d22e8235792dfe7
Commit: 5fcbd2d14fa59404da6bb70011225d2258b0fe92
https://github.com/Dolibarr/dolibarr/commit/5fcbd2d14fa59404da6bb70011225d2258b0fe92
Author: Florian Henry <address@hidden>
Date: 2013-08-12 (Mon, 12 Aug 2013)
Changed paths:
M ChangeLog
Log Message:
-----------
Fix Bug with canvas
Commit: d6c7ac5f73b97145ace577fe9cea928846d6519c
https://github.com/Dolibarr/dolibarr/commit/d6c7ac5f73b97145ace577fe9cea928846d6519c
Author: Florian Henry <address@hidden>
Date: 2013-08-13 (Tue, 13 Aug 2013)
Changed paths:
M htdocs/societe/canvas/company/tpl/card_create.tpl.php
M htdocs/societe/canvas/company/tpl/card_edit.tpl.php
Log Message:
-----------
Fix canvas feature broken
Commit: 60b3f61339236b452088419015a03be3e6fa3a60
https://github.com/Dolibarr/dolibarr/commit/60b3f61339236b452088419015a03be3e6fa3a60
Author: Florian Henry <address@hidden>
Date: 2013-08-13 (Tue, 13 Aug 2013)
Changed paths:
M ChangeLog
M htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
Log Message:
-----------
Merge branch '3.4' of https://github.com/Dolibarr/dolibarr.git into 3.4
Conflicts:
ChangeLog
Commit: 6b0e52192008265ea3380ec7fd549e2076e7beef
https://github.com/Dolibarr/dolibarr/commit/6b0e52192008265ea3380ec7fd549e2076e7beef
Author: Juanjo Menent <address@hidden>
Date: 2013-08-14 (Wed, 14 Aug 2013)
Changed paths:
M ChangeLog
M htdocs/core/class/commonobject.class.php
M htdocs/societe/canvas/company/tpl/card_create.tpl.php
M htdocs/societe/canvas/company/tpl/card_edit.tpl.php
Log Message:
-----------
Merge pull request #1177 from FHenry/3.4
Fix update extrafield do not display immediatly
Commit: 49e38e1263a4d637f9cee967e80372899817ce36
https://github.com/Dolibarr/dolibarr/commit/49e38e1263a4d637f9cee967e80372899817ce36
Author: Grand Philippe <address@hidden>
Date: 2013-08-16 (Fri, 16 Aug 2013)
Changed paths:
M htdocs/core/boxes/modules_boxes.php
M htdocs/core/lib/pdf.lib.php
Log Message:
-----------
fix some trad
Commit: 4e34e7b71c3d51ba62de2679b082e6d75e4efd96
https://github.com/Dolibarr/dolibarr/commit/4e34e7b71c3d51ba62de2679b082e6d75e4efd96
Author: simnandez <address@hidden>
Date: 2013-08-21 (Wed, 21 Aug 2013)
Changed paths:
M ChangeLog
M htdocs/product/stats/facture_fournisseur.php
Log Message:
-----------
Fix: [ bug #1037 ] Consumption> Supplier invoices related
Commit: 9ac22149d4930f31ae08ae4238d87ab75528cc91
https://github.com/Dolibarr/dolibarr/commit/9ac22149d4930f31ae08ae4238d87ab75528cc91
Author: Christophe Battarel <address@hidden>
Date: 2013-08-21 (Wed, 21 Aug 2013)
Changed paths:
M htdocs/fourn/product/liste.php
Log Message:
-----------
fix old bug on reordering supplier products in list
Commit: b6d998d1c55fb70c6dfcc1c89252fc3cd536074e
https://github.com/Dolibarr/dolibarr/commit/b6d998d1c55fb70c6dfcc1c89252fc3cd536074e
Author: Juanjo Menent <address@hidden>
Date: 2013-08-21 (Wed, 21 Aug 2013)
Changed paths:
M htdocs/fourn/product/liste.php
Log Message:
-----------
Merge pull request #1185 from altatof/3.4
fix old bug on reordering supplier products in list
Commit: ba4fde20ce1baf820804a7c1dd75ca5f3312dbfc
https://github.com/Dolibarr/dolibarr/commit/ba4fde20ce1baf820804a7c1dd75ca5f3312dbfc
Author: Florian Henry <address@hidden>
Date: 2013-08-21 (Wed, 21 Aug 2013)
Changed paths:
M ChangeLog
M htdocs/user/class/usergroup.class.php
M htdocs/user/group/fiche.php
Log Message:
-----------
Fix UserGroup name not display in card view or edit
Commit: 71ec4ea31ccbf5d8e806eedc98800085039efb2c
https://github.com/Dolibarr/dolibarr/commit/71ec4ea31ccbf5d8e806eedc98800085039efb2c
Author: Florian Henry <address@hidden>
Date: 2013-08-21 (Wed, 21 Aug 2013)
Changed paths:
M ChangeLog
M htdocs/fourn/product/liste.php
M htdocs/product/stats/facture_fournisseur.php
Log Message:
-----------
Merge remote-tracking branch 'origin/3.4' into 3.4
Conflicts:
ChangeLog
Change-Id: I325ab3266300286664f4790b5f2314255ac1911d
Commit: 7e27b9f2214f4a76e62c2e13a76c3b40a14dc6ab
https://github.com/Dolibarr/dolibarr/commit/7e27b9f2214f4a76e62c2e13a76c3b40a14dc6ab
Author: Juanjo Menent <address@hidden>
Date: 2013-08-21 (Wed, 21 Aug 2013)
Changed paths:
M ChangeLog
M htdocs/user/class/usergroup.class.php
M htdocs/user/group/fiche.php
Log Message:
-----------
Merge pull request #1186 from FHenry/3.4
Fix UserGroup name not display in card view or edit
Commit: dd32dbacb5dff2ffddaf56155aea00b76ea1bff3
https://github.com/Dolibarr/dolibarr/commit/dd32dbacb5dff2ffddaf56155aea00b76ea1bff3
Author: Christophe Battarel <address@hidden>
Date: 2013-08-21 (Wed, 21 Aug 2013)
Changed paths:
M htdocs/compta/facture/class/facture.class.php
Log Message:
-----------
Fix retrieving of margin info when invoice created automatically from order
(used by workflow module)
Commit: 5ca7820884e56fae765b12e9f3355af518f414a0
https://github.com/Dolibarr/dolibarr/commit/5ca7820884e56fae765b12e9f3355af518f414a0
Author: Laurent Destailleur <address@hidden>
Date: 2013-08-21 (Wed, 21 Aug 2013)
Changed paths:
M htdocs/compta/facture/class/facture.class.php
Log Message:
-----------
Merge pull request #1187 from altatof/3.4
Fix retrieving of margin info when invoice created automatically from order.
Commit: dd3d0ad9acbde03a4a13747184ee67fa8dfb1d5b
https://github.com/Dolibarr/dolibarr/commit/dd3d0ad9acbde03a4a13747184ee67fa8dfb1d5b
Author: Laurent Destailleur <address@hidden>
Date: 2013-08-21 (Wed, 21 Aug 2013)
Changed paths:
M htdocs/core/boxes/modules_boxes.php
M htdocs/core/lib/pdf.lib.php
Log Message:
-----------
Merge pull request #1181 from grandoc/3.3
fix some trad
Commit: 05040d19979bedd2d55d9f1868ebb840f58625e6
https://github.com/Dolibarr/dolibarr/commit/05040d19979bedd2d55d9f1868ebb840f58625e6
Author: Laurent Destailleur <address@hidden>
Date: 2013-08-21 (Wed, 21 Aug 2013)
Changed paths:
M htdocs/core/modules/mailings/contacts3.modules.php
Log Message:
-----------
Fix: B1032-develop: Problem in the filter of Contact by company category
Commit: 32dd1e448083b1307000c43f6152bef4eb11d6a9
https://github.com/Dolibarr/dolibarr/commit/32dd1e448083b1307000c43f6152bef4eb11d6a9
Author: Christophe Battarel <address@hidden>
Date: 2013-08-22 (Thu, 22 Aug 2013)
Changed paths:
M htdocs/fourn/ajax/getSupplierPrices.php
Log Message:
-----------
fix display of buying price on line edit when no supplier price is defined
Commit: e00f02616d43d5da391703d0ac88002761089d16
https://github.com/Dolibarr/dolibarr/commit/e00f02616d43d5da391703d0ac88002761089d16
Author: Christophe Battarel <address@hidden>
Date: 2013-08-22 (Thu, 22 Aug 2013)
Changed paths:
M ChangeLog
Log Message:
-----------
update changelog
Commit: 4f991da8463759340ec991f2b807a6bb5d6f72fa
https://github.com/Dolibarr/dolibarr/commit/4f991da8463759340ec991f2b807a6bb5d6f72fa
Author: Florian Henry <address@hidden>
Date: 2013-08-22 (Thu, 22 Aug 2013)
Changed paths:
M ChangeLog
M htdocs/fourn/fiche.php
Log Message:
-----------
Fix: Link "Show all supplier invoice" on suplier card not working
Commit: 37e3455f82056cac68c54234ea9f5a39e81db76c
https://github.com/Dolibarr/dolibarr/commit/37e3455f82056cac68c54234ea9f5a39e81db76c
Author: Juanjo Menent <address@hidden>
Date: 2013-08-22 (Thu, 22 Aug 2013)
Changed paths:
M ChangeLog
M htdocs/fourn/fiche.php
Log Message:
-----------
Merge pull request #1191 from FHenry/3.4
Fix: Link "Show all supplier invoice" on suplier card not working
Commit: ecdce9ddf6586c4f276b0c0f49bf62fc3db0c3d7
https://github.com/Dolibarr/dolibarr/commit/ecdce9ddf6586c4f276b0c0f49bf62fc3db0c3d7
Author: Christophe Battarel <address@hidden>
Date: 2013-08-23 (Fri, 23 Aug 2013)
Changed paths:
M ChangeLog
M htdocs/fourn/fiche.php
Log Message:
-----------
Merge branch '3.4' of https://github.com/Dolibarr/dolibarr into 3.4
Commit: edf7af444c346bed6c911b6fbe17dcf20a39ee87
https://github.com/Dolibarr/dolibarr/commit/edf7af444c346bed6c911b6fbe17dcf20a39ee87
Author: Christophe Battarel <address@hidden>
Date: 2013-08-23 (Fri, 23 Aug 2013)
Changed paths:
M htdocs/margin/agentMargins.php
M htdocs/margin/customerMargins.php
M htdocs/margin/productMargins.php
Log Message:
-----------
fix margin reports bugs (wrong group by + jquery syntax error)
Commit: 7e61c3703a7f4a5bdcfeaa032c48d386574c8452
https://github.com/Dolibarr/dolibarr/commit/7e61c3703a7f4a5bdcfeaa032c48d386574c8452
Author: Juanjo Menent <address@hidden>
Date: 2013-08-23 (Fri, 23 Aug 2013)
Changed paths:
M ChangeLog
M htdocs/fourn/ajax/getSupplierPrices.php
Log Message:
-----------
Merge pull request #1189 from altairis-fr/3.4
fix display of buying price on line edit when no supplier price is defined
Commit: 2e79e750e96604058ae936fb2f8b4c20f4c16b9b
https://github.com/Dolibarr/dolibarr/commit/2e79e750e96604058ae936fb2f8b4c20f4c16b9b
Author: Christophe Battarel <address@hidden>
Date: 2013-08-23 (Fri, 23 Aug 2013)
Log Message:
-----------
Merge branch '3.4' of https://github.com/Dolibarr/dolibarr into 3.4
Commit: 20d349689d0bdbc28434294a3dc050ee773bef26
https://github.com/Dolibarr/dolibarr/commit/20d349689d0bdbc28434294a3dc050ee773bef26
Author: Juanjo Menent <address@hidden>
Date: 2013-08-23 (Fri, 23 Aug 2013)
Changed paths:
M htdocs/margin/agentMargins.php
M htdocs/margin/customerMargins.php
M htdocs/margin/productMargins.php
Log Message:
-----------
Merge pull request #1192 from altairis-fr/3.4
fix margin reports bugs (wrong group by + jquery syntax error)
Commit: c242d665300e1eb3e6890d2684b2f2bc2b0faf81
https://github.com/Dolibarr/dolibarr/commit/c242d665300e1eb3e6890d2684b2f2bc2b0faf81
Author: simnandez <address@hidden>
Date: 2013-08-23 (Fri, 23 Aug 2013)
Changed paths:
M ChangeLog
M htdocs/compta/facture/fiche-rec.php
Log Message:
-----------
Fix: [ bug #1039 ] Pre-defined invoices conversion
Commit: 1c527b8db9a61031e37f28558d5c958094e3930b
https://github.com/Dolibarr/dolibarr/commit/1c527b8db9a61031e37f28558d5c958094e3930b
Author: Laurent Destailleur <address@hidden>
Date: 2013-08-24 (Sat, 24 Aug 2013)
Changed paths:
M htdocs/conf/.gitignore
M htdocs/core/boxes/modules_boxes.php
M htdocs/core/lib/pdf.lib.php
Log Message:
-----------
Merge remote-tracking branch 'origin/3.3' into 3.4
Commit: 1c08cad6b9cd02e3df6d6317b50386f9033a40ee
https://github.com/Dolibarr/dolibarr/commit/1c08cad6b9cd02e3df6d6317b50386f9033a40ee
Author: Laurent Destailleur <address@hidden>
Date: 2013-08-24 (Sat, 24 Aug 2013)
Changed paths:
M htdocs/core/menus/standard/auguria_menu.php
M htdocs/core/menus/standard/eldy_menu.php
M htdocs/langs/en_US/main.lang
M htdocs/langs/fr_FR/main.lang
Log Message:
-----------
Fix: Bad translation (to pick to 3.4)
Conflicts:
htdocs/langs/en_US/main.lang
htdocs/langs/fr_FR/main.lang
Commit: cafd75ac4ab7620e945ed6bd2dbad00457ebf529
https://github.com/Dolibarr/dolibarr/commit/cafd75ac4ab7620e945ed6bd2dbad00457ebf529
Author: Laurent Destailleur <address@hidden>
Date: 2013-08-24 (Sat, 24 Aug 2013)
Changed paths:
M htdocs/fourn/fiche.php
Log Message:
-----------
Revert a bad fix.
Commit: f7a33ba737933d9c3461ec7a6eacc793c11c4cbd
https://github.com/Dolibarr/dolibarr/commit/f7a33ba737933d9c3461ec7a6eacc793c11c4cbd
Author: Laurent Destailleur <address@hidden>
Date: 2013-08-24 (Sat, 24 Aug 2013)
Changed paths:
M ChangeLog
M htdocs/compta/facture/class/facture.class.php
M htdocs/compta/facture/fiche-rec.php
M htdocs/conf/.gitignore
M htdocs/core/boxes/modules_boxes.php
M htdocs/core/class/commonobject.class.php
M htdocs/core/lib/pdf.lib.php
M htdocs/core/menus/standard/auguria_menu.php
M htdocs/core/menus/standard/eldy_menu.php
M htdocs/core/modules/mailings/contacts3.modules.php
M htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
M htdocs/fourn/ajax/getSupplierPrices.php
M htdocs/fourn/fiche.php
M htdocs/fourn/product/liste.php
M htdocs/langs/en_US/main.lang
M htdocs/langs/fr_FR/main.lang
M htdocs/margin/agentMargins.php
M htdocs/margin/customerMargins.php
M htdocs/margin/productMargins.php
M htdocs/product/stats/facture_fournisseur.php
M htdocs/societe/canvas/company/tpl/card_create.tpl.php
M htdocs/societe/canvas/company/tpl/card_edit.tpl.php
M htdocs/user/class/usergroup.class.php
M htdocs/user/group/fiche.php
Log Message:
-----------
Merge remote-tracking branch 'origin/3.4' into 3.4_backported
Conflicts:
ChangeLog
htdocs/fourn/fiche.php
Compare:
https://github.com/Dolibarr/dolibarr/compare/ea238281a499...f7a33ba73793