[Dolibarr-git] [Dolibarr/dolibarr] b5cc7a: Work on merge tab photos and attached files

[Laurent Destailleur]

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: b5cc7ae1c85b934404a7abf969e9cc0a14ae4def
      
https://github.com/Dolibarr/dolibarr/commit/b5cc7ae1c85b934404a7abf969e9cc0a14ae4def
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-06-19 (Fri, 19 Jun 2015)

  Changed paths:
    M htdocs/core/class/html.formfile.class.php
    M htdocs/product/class/product.class.php
    M htdocs/product/document.php

  Log Message:
  -----------
  Work on merge tab photos and attached files


  Commit: 20da120a49c4ee021759c4b04e2a6a428c8050fc
      
https://github.com/Dolibarr/dolibarr/commit/20da120a49c4ee021759c4b04e2a6a428c8050fc
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-06-19 (Fri, 19 Jun 2015)

  Changed paths:
    M htdocs/core/class/html.formfile.class.php
    M htdocs/core/js/lib_photosresize.js
    M htdocs/core/lib/product.lib.php
    M htdocs/core/photos_resize.php
    R htdocs/product/photos.php
    M htdocs/theme/eldy/style.css.php

  Log Message:
  -----------
  Merge tab to upload photo and other files to same tab. This reduce
duplicate code and avoid users to be lost.


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

  Changed paths:
    A .dockerignore
    M COPYRIGHT
    M ChangeLog
    A Dockerfile
    M htdocs/compta/bank/account.php
    M htdocs/core/js/dst.js
    M htdocs/core/lib/fourn.lib.php
    M htdocs/core/tpl/login.tpl.php
    M htdocs/don/class/paymentdonation.class.php
    M htdocs/expensereport/card.php
    M htdocs/expensereport/class/expensereport.class.php
    A htdocs/expensereport/class/paymentexpensereport.class.php
    A htdocs/expensereport/payment/card.php
    A htdocs/expensereport/payment/index.html
    A htdocs/expensereport/payment/payment.php
    M htdocs/fourn/commande/dispatch.php
    A htdocs/includes/jstz/jstz.min.js
    M htdocs/install/mysql/migration/3.7.0-3.8.0.sql
    M htdocs/install/mysql/tables/llx_expensereport.sql
    A htdocs/install/mysql/tables/llx_payment_expensereport.sql

  Log Message:
  -----------
  Merge branch 'develop' of address@hidden:Dolibarr/dolibarr.git into develop


  Commit: 44d4d23c00fa9eaa9b2881f35e38db4daa5a5401
      
https://github.com/Dolibarr/dolibarr/commit/44d4d23c00fa9eaa9b2881f35e38db4daa5a5401
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-06-19 (Fri, 19 Jun 2015)

  Changed paths:
    M htdocs/comm/action/class/actioncomm.class.php

  Log Message:
  -----------
  Fix phpcs


Compare: 
https://github.com/Dolibarr/dolibarr/compare/0d7fea70a020...44d4d23c00fa