[Dolibarr-git] [Dolibarr/dolibarr] 9b1470: Work on generic filemanager component

[Laurent Destailleur]

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 9b1470dab5b25f277b74425921def795acf23609
      
https://github.com/Dolibarr/dolibarr/commit/9b1470dab5b25f277b74425921def795acf23609
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-11-18 (Sat, 18 Nov 2017)

  Changed paths:
    M htdocs/core/actions_linkedfiles.inc.php
    M htdocs/core/ajax/ajaxdirpreview.php
    M htdocs/core/ajax/ajaxdirtree.php
    M htdocs/core/class/html.form.class.php
    M htdocs/core/class/html.formfile.class.php
    M htdocs/ecm/index.php
    M htdocs/ecm/tpl/enablefiletreeajax.tpl.php
    M htdocs/ecm/tpl/filemanager.tpl.php
    M htdocs/website/index.php

  Log Message:
  -----------
  Work on generic filemanager component


  Commit: 9f5b73f4e2737ac13108a9e94dc91c2426752da6
      
https://github.com/Dolibarr/dolibarr/commit/9f5b73f4e2737ac13108a9e94dc91c2426752da6
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-11-18 (Sat, 18 Nov 2017)

  Changed paths:
    M htdocs/website/index.php

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

Conflicts:
        htdocs/core/actions_linkedfiles.inc.php
        htdocs/core/ajax/ajaxdirpreview.php
        htdocs/website/index.php


Compare: 
https://github.com/Dolibarr/dolibarr/compare/7288c18574c7...9f5b73f4e273