Commits · 34468644eff390a341666484655fe3a87cef0b59 · Software_Artifact_Infrastructure_Repository / dolibarr

Jun 16, 2015
- Merge remote-tracking branch 'origin/3.5' into 3.6 · 34468644
  Laurent Destailleur authored 9 years ago
  
  34468644
- 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 remote-tracking branch 'origin/3.5' into 3.6 · f4da53c3
  Laurent Destailleur authored 9 years ago
  
  Conflicts: htdocs/product/liste.php htdocs/product/price.php
  f4da53c3
- Merge branch '3.6' of git@github.com:Dolibarr/dolibarr.git into 3.6 · 1007aba6
  Laurent Destailleur authored 9 years ago
  
  1007aba6
- FIX End log must use same level then start log. · 14a8a226
  Laurent Destailleur authored 9 years ago
  
  14a8a226
- 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 #3035 from marcosgdf/bug-2786 · fdced80a
  Laurent Destailleur authored 9 years ago
  
  FIX #2786 Objectline_add template shows "0" for non-vat suppliers
  fdced80a
- 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
- Merge pull request #3026 from marcosgdf/bug-2891 · f67af6da
  Laurent Destailleur authored 9 years ago
  
  FIX Close bug #2891 Category hooks do not work
  f67af6da
Jun 12, 2015
- Fix Close bug #2786 Objectline_add template shows "0" for non-vat suppliers · ea625628
  Marcos García de La Fuente authored 9 years ago
  
  ea625628
- 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
- Merge pull request #3010 from GPCsolutions/3.6-3009 · ab3190df
  Juanjo Menent authored 9 years ago
  
  FIX #3009: Better filtering to prevent SQL injection
  ab3190df
- 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 #2891 Category hooks do not work · 300cfd22
  Marcos García de La Fuente authored 9 years ago
  
  300cfd22
- 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 11, 2015
- FIX #3009: Better filtering to prevent SQL injection · d8995504
  Raphaël Doursenaud authored 9 years ago
  
  d8995504
Jun 08, 2015
- Merge remote-tracking branch 'origin/3.5' into 3.6 · f9d85973
  Laurent Destailleur authored 9 years ago
  
  f9d85973
- 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
Jun 05, 2015
- Merge pull request #2938 from FHenry/3.6 · 3c8d54d5
  Laurent Destailleur authored 9 years ago
  
  FIX : If supplier invoice block linked element is display after other block total HT amount is not reset to 0 and sum other block (like customer orders values)
  3c8d54d5
- Merge pull request #2964 from atm-maxime/3.6 · d138e441
  Laurent Destailleur authored 9 years ago
  
  Fix : supplier order clone was buggy if notes contains apostrophe
  d138e441
- Fix : supplier order clone was buggy if notes contains apostrophe · f7493de5
  Maxime Kohlhaas authored 9 years ago
  
  f7493de5
- Merge pull request #2958 from jfefe/patch-8 · 15060d97
  Laurent Destailleur authored 9 years ago
  
  FIX #2957 : missing $langs object for trigger
  15060d97
Jun 04, 2015
- FIX #2957 : missing $langs object for trigger · 195a1b27
  Jean-François Ferry authored 9 years ago
  
  195a1b27
Jun 02, 2015
- FIX : total amount in tpl linked object are not reset · fb29fa48
  Florian Henry authored 9 years ago
  
  fb29fa48
- Merge branch '3.6' of git@github.com:Dolibarr/dolibarr.git into 3.6 · bdaf83a6
  Florian Henry authored 9 years ago
  
  bdaf83a6
- FIX : If supplier invoice block linked element is display after other · 3f161319
  Florian Henry authored 9 years ago
  
  block total HT amount is not reset to 0 and sum other block (like customer orders values)
  3f161319
May 30, 2015
- Merge pull request #2912 from atm-ph/fix_36_reassort_target · a60ab7dd
  Laurent Destailleur authored 9 years ago
  
  FIX top links menu have target attribute with wrong value
  a60ab7dd
May 29, 2015
- Merge pull request #2878 from atm-alexis/fix_multientity_num_check · 4324ed82
  Laurent Destailleur authored 9 years ago
  
  FIX when multicompany was enabled, isExistingObject check wrong
  4324ed82