Commits · 47bf442c849083aec1d0427369a29bccd54f67a6 · Software_Artifact_Infrastructure_Repository / dolibarr

Dec 18, 2016
- Merge pull request #6167 from atm-florian/4.0 · 47bf442c
  Laurent Destailleur authored 8 years ago
  
  GETPOST instead of $_GET
  47bf442c
- Merge pull request #6164 from hregis/4.0_bug · 27785323
  Laurent Destailleur authored 8 years ago
  
  Fix: missing date locale and date rfc
  27785323
Dec 17, 2016
- Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0 · c36d4b98
  Laurent Destailleur authored 8 years ago
  
  c36d4b98
- Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0 · 394e284a
  Laurent Destailleur authored 8 years ago
  
  Conflicts: htdocs/core/class/CMailFile.class.php htdocs/langs/en_US/errors.lang
  394e284a
- Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.9 · 6830fdca
  Laurent Destailleur authored 8 years ago
  
  Conflicts: htdocs/product/class/product.class.php
  6830fdca
- Fix deletion of product · 321933f2
  Laurent Destailleur authored 8 years ago
  
  321933f2
- Fix help/messages for emailing to warn users. · 73e66632
  Laurent Destailleur authored 8 years ago
  
  73e66632
- Fix translation of error message when sending email · c5db333a
  Laurent Destailleur authored 8 years ago
  
  c5db333a
Dec 16, 2016
- FIX Missing field · d8e394d3
  Laurent Destailleur authored 8 years ago
  
  d8e394d3
- Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0 · 92990404
  Laurent Destailleur authored 8 years ago
  
  Conflicts: htdocs/conf/conf.php.example htdocs/langs/en_US/mails.lang
  92990404
- FIX Security to restrict email sending was not efficient · 534e2b12
  Laurent Destailleur authored 8 years ago
  
  534e2b12
Dec 15, 2016
- Prepare 4.0.3 · 7fdd6ccb
  Laurent Destailleur authored 8 years ago
  
  7fdd6ccb
- Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0 · 8f3ce46c
  Laurent Destailleur authored 8 years ago
  
  8f3ce46c
- Better fix to add server name into email id. · 2c4c48ad
  Laurent Destailleur authored 8 years ago
  
  2c4c48ad
- FIX javascript xss injection and a translation · d32fd7aa
  Laurent Destailleur authored 8 years ago
  
  d32fd7aa
Dec 14, 2016
- Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0 · d2e4888b
  Laurent Destailleur authored 8 years ago
  
  d2e4888b
- Fix bad concat · e4dd0208
  Laurent Destailleur authored 8 years ago
  
  e4dd0208
- FIX Introduce hidden option MAIL_PREFIX_FOR_EMAIL_ID to solve pb of · af407a09
  Laurent Destailleur authored 8 years ago
  
  tracking email.
  af407a09
- FIX Introduce hidden option MAIL_PREFIX_FOR_EMAIL_ID to solve pb of · 56b3f2c0
  Laurent Destailleur authored 8 years ago
  
  tracking email.
  56b3f2c0
- FIX Introduce hidden option MAIL_PREFIX_FOR_EMAIL_ID to solve pb of · 530d3503
  Laurent Destailleur authored 8 years ago
  
  tracking email.
  530d3503
Dec 13, 2016
- Merge remote-tracking branch 'origin/4.0' into 4.0_bug · cb21ad2c
  Regis Houssin authored 8 years ago
  
  cb21ad2c
- Merge branch '4.0' of https://github.com/Dolibarr/dolibarr.git into 4.0 · 3992a92d
  florian HENRY authored 8 years ago
  
  3992a92d
- FIX if a supplier price reference is changed after creating an order, we · 43d18cd7
  Laurent Destailleur authored 8 years ago
  
  can't clone order.
  43d18cd7
- Fix: missing date locale and date rfc · 337509d4
  Regis Houssin authored 8 years ago
  
  337509d4
Dec 11, 2016
- Merge pull request #6132 from simnandez/3.9 · 5c4ab99a
  Juanjo Menent authored 8 years ago
  
  Fix #5646 Error editing Sell Price on products/services
  5c4ab99a
- Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0 · 95d8faef
  Laurent Destailleur authored 8 years ago
  
  Conflicts: htdocs/product/class/product.class.php
  95d8faef
- FIX Regression when deleting product · 7fd75c79
  Laurent Destailleur authored 8 years ago
  
  7fd75c79
Dec 10, 2016
- Merge remote-tracking branch 'origin/3.9' into 4.0 · 9b436ce8
  Laurent Destailleur authored 8 years ago
  
  Conflicts: htdocs/product/class/product.class.php
  9b436ce8
- Merge remote-tracking branch 'origin/3.8' into 3.9 · b42a2616
  Laurent Destailleur authored 8 years ago
  
  Conflicts: htdocs/install/mysql/migration/3.8.0-3.9.0.sql
  b42a2616
- Fix #5646 Error editing Sell Price on products/services · 56aafa46
  Juanjo Menent authored 8 years ago
  
  56aafa46
- Merge pull request #6128 from simnandez/3.9 · 6e9d6b4e
  Laurent Destailleur authored 8 years ago
  
  FIX #5853 $conf->global->$calc==0 || $conf->global->$calc==1
  6e9d6b4e
- FIX #5853 $conf->global->$calc==0 || $conf->global->$calc==1 · 5a2b8ff5
  Juanjo Menent authored 8 years ago
  
  5a2b8ff5
- Merge pull request #6113 from atm-maxime/3.8 · f49d332b
  Laurent Destailleur authored 8 years ago
  
  Fix : delete product was not possible if batch stock
  f49d332b
- Merge pull request #6111 from simnandez/3.8 · 46d84f8f
  Laurent Destailleur authored 8 years ago
  
  Fix: Delete surplus migration file
  46d84f8f
- Fix : delete product was not possible if batch stock · 97e21cb7
  Maxime Kohlhaas authored 8 years ago
  
  97e21cb7
- Fix: Delete surplus migration file · 829ff229
  Juanjo Menent authored 8 years ago
  
  829ff229
- Merge pull request #6076 from olsesacl/#6062 · 08f27a5c
  Laurent Destailleur authored 8 years ago
  
  FIX: #6062 Can't add images to the description when edit product
  08f27a5c
- fix: uniformize · 0f0db5a3
  florian HENRY authored 8 years ago
  
  0f0db5a3
- Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 4.0 · 45783e6b
  Laurent Destailleur authored 8 years ago
  
  45783e6b
- Better message after report on #5933 · a45915e4
  Laurent Destailleur authored 8 years ago
  
  a45915e4