dolibarr-git
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Dolibarr-git] [Dolibarr/dolibarr] 440236: Fix pb in dolGetFirstLineOfTe


From: Laurent Destailleur
Subject: [Dolibarr-git] [Dolibarr/dolibarr] 440236: Fix pb in dolGetFirstLineOfText. Add PHPunit
Date: Sun, 23 Jul 2017 11:30:17 -0700

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 44023606c65d74217fd02867e62aa5e0692f3346
      
https://github.com/Dolibarr/dolibarr/commit/44023606c65d74217fd02867e62aa5e0692f3346
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-07-22 (Sat, 22 Jul 2017)

  Changed paths:
    M htdocs/core/lib/files.lib.php
    M htdocs/core/lib/functions.lib.php
    M test/phpunit/FunctionsLibTest.php

  Log Message:
  -----------
  Fix pb in dolGetFirstLineOfText. Add PHPunit


  Commit: 585dde6cf5329eb363ed6a464dfda33a3d98e23e
      
https://github.com/Dolibarr/dolibarr/commit/585dde6cf5329eb363ed6a464dfda33a3d98e23e
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-07-23 (Sun, 23 Jul 2017)

  Changed paths:
    M build/exe/doliwamp/doliwamp.iss

  Log Message:
  -----------
  Fix url


  Commit: d5d95c31a62b348ed192e6076d8c75dac2494af9
      
https://github.com/Dolibarr/dolibarr/commit/d5d95c31a62b348ed192e6076d8c75dac2494af9
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-07-23 (Sun, 23 Jul 2017)

  Changed paths:
    M build/exe/doliwamp/doliwamp.iss

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


  Commit: 25b107defbffa77ad851121f19846ec041770466
      
https://github.com/Dolibarr/dolibarr/commit/25b107defbffa77ad851121f19846ec041770466
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-07-23 (Sun, 23 Jul 2017)

  Changed paths:
    M build/exe/doliwamp/doliwamp.iss
    M htdocs/comm/propal/list.php
    M htdocs/commande/card.php
    M htdocs/commande/list.php
    M htdocs/compta/facture/list.php
    M htdocs/contrat/class/contrat.class.php
    M htdocs/contrat/list.php
    M htdocs/core/class/html.form.class.php
    M htdocs/core/class/smtps.class.php
    M htdocs/core/lib/files.lib.php
    M htdocs/core/lib/functions.lib.php
    M htdocs/fichinter/list.php
    M htdocs/fourn/facture/list.php
    M htdocs/install/mysql/migration/3.9.0-4.0.0.sql
    M htdocs/install/mysql/tables/llx_user.sql
    M test/phpunit/FunctionsLibTest.php

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

Conflicts:
        htdocs/contrat/list.php
        htdocs/fichinter/list.php


  Commit: 9043cf759bb98dd6db45d0e4fbc906a3522a74b9
      
https://github.com/Dolibarr/dolibarr/commit/9043cf759bb98dd6db45d0e4fbc906a3522a74b9
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-07-23 (Sun, 23 Jul 2017)

  Changed paths:
    M htdocs/core/lib/functions.lib.php

  Log Message:
  -----------
  Fix clone function


  Commit: 73c7aa378e8b3ccc5485c0092709eb4763301ebd
      
https://github.com/Dolibarr/dolibarr/commit/73c7aa378e8b3ccc5485c0092709eb4763301ebd
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-07-23 (Sun, 23 Jul 2017)

  Changed paths:
    M build/exe/doliwamp/doliwamp.iss
    M htdocs/contrat/list.php
    M htdocs/core/lib/files.lib.php
    M htdocs/core/lib/functions.lib.php
    M htdocs/fichinter/list.php
    M test/phpunit/FunctionsLibTest.php

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

Conflicts:
        htdocs/contrat/list.php
        htdocs/fichinter/list.php


Compare: 
https://github.com/Dolibarr/dolibarr/compare/6421ec313964...73c7aa378e8b

reply via email to

[Prev in Thread] Current Thread [Next in Thread]