[Dolibarr-git] [Dolibarr/dolibarr] 121550: Fix Close bug #2814 JPEG photos are not displayed ...

[Laurent Destailleur]

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 12155029279fe748da1ce78275739f38230f1639
      
https://github.com/Dolibarr/dolibarr/commit/12155029279fe748da1ce78275739f38230f1639
  Author: Marcos García de La Fuente <address@hidden>
  Date:   2015-06-13 (Sat, 13 Jun 2015)

  Changed paths:
    M ChangeLog
    M htdocs/product/class/product.class.php

  Log Message:
  -----------
  Fix Close bug #2814 JPEG photos are not displayed in Product photos page


  Commit: adc1998b7306ecdedce37b3e5735b5ae78e3cb21
      
https://github.com/Dolibarr/dolibarr/commit/adc1998b7306ecdedce37b3e5735b5ae78e3cb21
  Author: Marcos García <address@hidden>
  Date:   2015-06-15 (Mon, 15 Jun 2015)

  Changed paths:
    M htdocs/core/class/html.formprojet.class.php

  Log Message:
  -----------
  Fixed undefined variable typo


  Commit: 2d3ab3b658be95512a93c0791ae192387afc23fc
      
https://github.com/Dolibarr/dolibarr/commit/2d3ab3b658be95512a93c0791ae192387afc23fc
  Author: Marcos García de La Fuente <address@hidden>
  Date:   2015-06-15 (Mon, 15 Jun 2015)

  Changed paths:
    M ChangeLog
    M htdocs/compta/bank/virement.php
    M htdocs/core/lib/report.lib.php
    M htdocs/install/upgrade2.php
    M htdocs/product/liste.php
    M htdocs/product/price.php

  Log Message:
  -----------
  Merge remote-tracking branch 'upstream/3.5' into bug-2814-2

Conflicts:
        ChangeLog


  Commit: db4d92ccb66aeb5bffd0fe54c836ad851b7393e9
      
https://github.com/Dolibarr/dolibarr/commit/db4d92ccb66aeb5bffd0fe54c836ad851b7393e9
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-06-15 (Mon, 15 Jun 2015)

  Changed paths:
    M htdocs/core/class/html.formprojet.class.php

  Log Message:
  -----------
  Merge pull request #3047 from marcosgdf/patch-2

Fixed undefined variable typo


  Commit: fa8defa1bf71d2c4de07fa940251d52d1d170b6f
      
https://github.com/Dolibarr/dolibarr/commit/fa8defa1bf71d2c4de07fa940251d52d1d170b6f
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-06-16 (Tue, 16 Jun 2015)

  Changed paths:
    M ChangeLog
    M htdocs/product/class/product.class.php

  Log Message:
  -----------
  Merge pull request #3034 from marcosgdf/bug-2814-2

Fix #2814 JPEG photos are not displayed in Product photos page


  Commit: 34468644eff390a341666484655fe3a87cef0b59
      
https://github.com/Dolibarr/dolibarr/commit/34468644eff390a341666484655fe3a87cef0b59
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-06-16 (Tue, 16 Jun 2015)

  Changed paths:
    M ChangeLog
    M htdocs/product/class/product.class.php

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/3.5' into 3.6


  Commit: 85fee7ec49989411d33e2c76b8cccf4d7aaafb4f
      
https://github.com/Dolibarr/dolibarr/commit/85fee7ec49989411d33e2c76b8cccf4d7aaafb4f
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-06-16 (Tue, 16 Jun 2015)

  Changed paths:
    M ChangeLog

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/3.6' into 3.7

Conflicts:
        htdocs/product/class/product.class.php


  Commit: 417eae9c4f667d9798d269bcd142f6d7579d9ec1
      
https://github.com/Dolibarr/dolibarr/commit/417eae9c4f667d9798d269bcd142f6d7579d9ec1
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-06-16 (Tue, 16 Jun 2015)

  Changed paths:
    M ChangeLog
    M htdocs/core/class/html.formprojet.class.php

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/3.7' into develop


Compare: 
https://github.com/Dolibarr/dolibarr/compare/9281e2a82473...417eae9c4f66