[Dolibarr-git] [Dolibarr/dolibarr] 4d9f78: getlibstatut added

[Laurent Destailleur]

  Branch: refs/heads/3.6
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 4d9f78dc07d8df31d3ab58897cc1b7fdb8f4c9b8
      
https://github.com/Dolibarr/dolibarr/commit/4d9f78dc07d8df31d3ab58897cc1b7fdb8f4c9b8
  Author: BENKE Charles <address@hidden>
  Date:   2014-07-06 (Sun, 06 Jul 2014)

  Changed paths:
    M htdocs/projet/class/task.class.php

  Log Message:
  -----------
  getlibstatut added

Add function getlibstatut and libstatut on task (fk_statut allready present on 
project_task table)


  Commit: 96ec3ad7f4b0e5ddbc457a3720df97773ef75b6f
      
https://github.com/Dolibarr/dolibarr/commit/96ec3ad7f4b0e5ddbc457a3720df97773ef75b6f
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-07-07 (Mon, 07 Jul 2014)

  Changed paths:
    M htdocs/core/class/doleditor.class.php

  Log Message:
  -----------
  Fix: Allow percent to solve presentation pb by some pages.


  Commit: 41dc0681c62dcfcbfb2c4c66efdbe5764ff381be
      
https://github.com/Dolibarr/dolibarr/commit/41dc0681c62dcfcbfb2c4c66efdbe5764ff381be
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-07-08 (Tue, 08 Jul 2014)

  Changed paths:
    M htdocs/projet/class/task.class.php

  Log Message:
  -----------
  Merge pull request #1715 from defrance69/patch-5

getlibstatut added


  Commit: 6c8c23203632ddde0620c73b99f433dd069e9532
      
https://github.com/Dolibarr/dolibarr/commit/6c8c23203632ddde0620c73b99f433dd069e9532
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-07-08 (Tue, 08 Jul 2014)

  Changed paths:
    M .travis.yml

  Log Message:
  -----------
  Fix: Solve timeout pb.


  Commit: 36e6f9a9fcb3ebb498c7d01a7b269bf92751db19
      
https://github.com/Dolibarr/dolibarr/commit/36e6f9a9fcb3ebb498c7d01a7b269bf92751db19
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-07-08 (Tue, 08 Jul 2014)

  Changed paths:
    M htdocs/projet/class/task.class.php

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

Conflicts:
        .travis.yml


Compare: 
https://github.com/Dolibarr/dolibarr/compare/5b1cdd05cbc2...36e6f9a9fcb3