Commits · 428bd14b55153547aa44a1b8022d26f702eb6f00 · Software_Artifact_Infrastructure_Repository / dolibarr

Jul 21, 2015

Merge branch '3.5' of github.com:Dolibarr/dolibarr into 3.5 · 428bd14b

Maxime Kohlhaas authored 9 years ago

# Veuillez entrer un message de validation pour expliquer en quoi cette fusion est
# nécessaire, surtout si cela fusionne une branche amont mise à jour dans une branche de sujet.
#
# Les lignes commençant par '#' seront ignorées, et un message vide
# abandonne la validation.

428bd14b

Jul 14, 2015
- Fix #3188 SQL error if qty or discount is not a number on proposal add line · 5223934f
  Maxime Kohlhaas authored 9 years ago
  
  5223934f
Jun 16, 2015
- Merge pull request #3058 from fmarcet/3.5 · bd4d1082
  Laurent Destailleur authored 9 years ago
  
  Fix: Date filter on customer orders
  bd4d1082
- Fix: Date filter on customer orders · 05cb1f7b
  Ferran Marcet authored 9 years ago
  
  05cb1f7b
- Merge pull request #3034 from marcosgdf/bug-2814-2 · fa8defa1
  Laurent Destailleur authored 9 years ago
  
  Fix #2814 JPEG photos are not displayed in Product photos page
  fa8defa1
Jun 15, 2015
- Merge remote-tracking branch 'upstream/3.5' into bug-2814-2 · 2d3ab3b6
  Marcos García de La Fuente authored 9 years ago
  
  Conflicts: ChangeLog
  2d3ab3b6
Jun 14, 2015
- Merge branch 'marcosgdf-bug-2835' into 3.5 · 1fc47166
  Laurent Destailleur authored 9 years ago
  
  1fc47166
- Merge branch 'bug-2835' of https://github.com/marcosgdf/dolibarr into · fadc6403
  Laurent Destailleur authored 9 years ago
  
  marcosgdf-bug-2835 Conflicts: ChangeLog
  fadc6403
- Merge branch 'marcosgdf-bug-2837' into 3.5 · c4ff9c32
  Laurent Destailleur authored 9 years ago
  
  c4ff9c32
- Merge branch 'bug-2837' of https://github.com/marcosgdf/dolibarr into · d0b2c492
  Laurent Destailleur authored 9 years ago
  
  marcosgdf-bug-2837 Conflicts: ChangeLog
  d0b2c492
- Merge branch 'marcosgdf-bug-2861' into 3.5 · 288ae5de
  Laurent Destailleur authored 9 years ago
  
  288ae5de
- Merge branch 'bug-2861' of https://github.com/marcosgdf/dolibarr into · e915a54c
  Laurent Destailleur authored 9 years ago
  
  marcosgdf-bug-2861 Conflicts: ChangeLog
  e915a54c
- Merge pull request #3044 from hregis/3.5_bug · f8d2e938
  Laurent Destailleur authored 9 years ago
  
  Fix: select date problem with mobile device (#3039)
  f8d2e938
- Fix: select date problem with mobile device (#3039) · b96ed082
  Regis Houssin authored 9 years ago
  
  b96ed082
Jun 13, 2015
- Merge pull request #3022 from marcosgdf/bug-2976 · a9bf38b8
  Laurent Destailleur authored 9 years ago
  
  FIX Close bug #2976: "Report" tab is the current tab but it is not marked as selected by the UI
  a9bf38b8
Jun 12, 2015
- Fix Close bug #2814 JPEG photos are not displayed in Product photos page · 12155029
  Marcos García de La Fuente authored 9 years ago
  
  12155029
- FIX Close #2835 Customer prices of a product shows incorrect history order · f9574fa4
  Marcos García de La Fuente authored 9 years ago
  
  f9574fa4
- FIX Close #2837 Product list table column header does not match column body · 2051a66c
  Marcos García de La Fuente authored 9 years ago
  
  2051a66c
- Added log · e3aa63f3
  Marcos García de La Fuente authored 9 years ago
  
  e3aa63f3
- FIX Close bug #2861 Undefined variable $res when migrating from 3.6.2 to 3.7.0 · 03358925
  Marcos García de La Fuente authored 9 years ago
  
  03358925
- FIX Close bug #2976: "Report" tab is the current tab but it is not marked as selected by the UI · 87a00d69
  Marcos García de La Fuente authored 9 years ago
  
  87a00d69
Jun 08, 2015
- Merge pull request #2984 from GPCsolutions/dolibarr-2983 · fd42b170
  Laurent Destailleur authored 9 years ago
  
  FIX #2983 Load gravatar avatar images securely over HTTPS
  fd42b170
- FIX #2983 Load gravatar avatar images securely over HTTPS · 08c9dd35
  Raphaël Doursenaud authored 9 years ago
  
  08c9dd35
May 22, 2015
- Merge branch '3.5' of git@github.com:Dolibarr/dolibarr.git into 3.5 · 0b405028
  Laurent Destailleur authored 9 years ago
  
  0b405028
- Fix bug debian 786479 · dcc197eb
  Laurent Destailleur authored 9 years ago
  
  dcc197eb
May 21, 2015
- Merge pull request #2866 from GPCsolutions/3.5-2857 · f32215a9
  Laurent Destailleur authored 9 years ago
  
  Properly escape untrusted data to prevent HTML injection.
  f32215a9
May 20, 2015
- Properly escape untrusted data to prevent HTML injection. · a7f6bbd3
  Raphaël Doursenaud authored 9 years ago
  
  First pass for #2857
  a7f6bbd3
May 16, 2015
- Prepare packaging 3.7 · e8fb89f8
  Laurent Destailleur authored 9 years ago
  
  e8fb89f8
- Prepare package 3.5.7 · 4dcdea52
  Laurent Destailleur authored 9 years ago
  
  Removed hardcoded version from rpm spec files, so it will not be necessary to update this files when making a new release.
  View commits for tag 3.5.7 3.5.7
  
  4dcdea52
- Merge branch '3.5' of git@github.com:Dolibarr/dolibarr.git into 3.5 · 1d8a3809
  Laurent Destailleur authored 9 years ago
  
  1d8a3809
- Prepare 3.5.7 · 80943111
  Laurent Destailleur authored 9 years ago
  
  80943111
May 12, 2015
- Merge pull request #2816 from marcosgdf/bug-2757 · f8e8fe6f
  Laurent Destailleur authored 9 years ago
  
  Close bug #2757 Deleting product category photo gives "Forbidden access" error
  f8e8fe6f
- Merge branch '3.5' into bug-2757 · 190f12c4
  Marcos García de La Fuente authored 9 years ago
  
  Conflicts: ChangeLog
  190f12c4
- Close bug #2757 Deleting product category photo gives "Forbidden access" error · ea7eb241
  Marcos García de La Fuente authored 9 years ago
  
  ea7eb241
May 11, 2015
- Merge pull request #2805 from marcosgdf/bug-2758 · 5f594d55
  Laurent Destailleur authored 9 years ago
  
  FIX #2758 Product::update sets product note to "null" when $prod->note is null
  5f594d55
May 09, 2015
- Removed debugging function · f6616dee
  Marcos García de La Fuente authored 9 years ago
  
  f6616dee
- FIX #2758 Product::update sets product note to "null" when $prod->note is null · f8e8b39f
  Marcos García de La Fuente authored 9 years ago
  
  f8e8b39f
May 01, 2015
- Merge pull request #2731 from GPCsolutions/dolibarr-2729 · 6309d213
  Juanjo Menent authored 9 years ago
  
  Allow exporting projects without a third party
  6309d213
Apr 30, 2015
- Allow exporting projects without a third party · f1032baa
  Raphaël Doursenaud authored 9 years ago
  
  FIX #2729
  f1032baa
Apr 18, 2015
- Merge branch '3.5' of github.com:Dolibarr/dolibarr into 3.5 · b8c512a3
  Laurent Destailleur authored 9 years ago
  
  b8c512a3