dolibarr-git
[Top][All Lists]
Advanced

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

[Dolibarr-git] [Dolibarr/dolibarr] 182dd7: Fix: phpunit regression


From: Laurent Destailleur
Subject: [Dolibarr-git] [Dolibarr/dolibarr] 182dd7: Fix: phpunit regression
Date: Wed, 07 May 2014 10:30:50 -0700

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 182dd774b610d563cf96633bea48608e5d53db1d
      
https://github.com/Dolibarr/dolibarr/commit/182dd774b610d563cf96633bea48608e5d53db1d
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-05-07 (Wed, 07 May 2014)

  Changed paths:
    M htdocs/core/modules/modExpedition.class.php

  Log Message:
  -----------
  Fix: phpunit regression


  Commit: 7fe5389adf0cc7bc867bed80a58cd30c73582146
      
https://github.com/Dolibarr/dolibarr/commit/7fe5389adf0cc7bc867bed80a58cd30c73582146
  Author: Marcos García de La Fuente <address@hidden>
  Date:   2014-05-07 (Wed, 07 May 2014)

  Changed paths:
    M ChangeLog

  Log Message:
  -----------
  Updated changelog


  Commit: 8681079fa7760b89fba083197355eedccae4c1f6
      
https://github.com/Dolibarr/dolibarr/commit/8681079fa7760b89fba083197355eedccae4c1f6
  Author: Marcos García de La Fuente <address@hidden>
  Date:   2014-05-07 (Wed, 07 May 2014)

  Changed paths:
    M htdocs/core/modules/modExpedition.class.php
    M htdocs/livraison/fiche.php

  Log Message:
  -----------
  Fixed CR


  Commit: fb7f08b33ab48e448063c39c4d66ad78c59d61af
      
https://github.com/Dolibarr/dolibarr/commit/fb7f08b33ab48e448063c39c4d66ad78c59d61af
  Author: Marcos García de La Fuente <address@hidden>
  Date:   2014-05-07 (Wed, 07 May 2014)

  Changed paths:
    M ChangeLog

  Log Message:
  -----------
  Corrected changelog message


  Commit: e6708a50724132234f17f4aa1253e59c09d80338
      
https://github.com/Dolibarr/dolibarr/commit/e6708a50724132234f17f4aa1253e59c09d80338
  Author: Florian HENRY <address@hidden>
  Date:   2014-05-07 (Wed, 07 May 2014)

  Changed paths:
    M htdocs/projet/class/project.class.php
    M htdocs/projet/fiche.php

  Log Message:
  -----------
  Fix error return project deletion


  Commit: 3f22bc70095e47af406b9b408bf5ec936169dc46
      
https://github.com/Dolibarr/dolibarr/commit/3f22bc70095e47af406b9b408bf5ec936169dc46
  Author: Florian HENRY <address@hidden>
  Date:   2014-05-07 (Wed, 07 May 2014)

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

  Log Message:
  -----------
  Better error management in delete project method


  Commit: e35008b53420b1a6aef9813adefefed122cf7912
      
https://github.com/Dolibarr/dolibarr/commit/e35008b53420b1a6aef9813adefefed122cf7912
  Author: Florian HENRY <address@hidden>
  Date:   2014-05-07 (Wed, 07 May 2014)

  Changed paths:
    M ChangeLog
    M htdocs/adherents/note.php
    M htdocs/categories/class/categorie.class.php
    M htdocs/compta/paiement_charge.php
    M htdocs/compta/sociales/charges.php
    M htdocs/core/class/commondocgenerator.class.php
    M htdocs/core/class/notify.class.php
    M htdocs/core/db/mysql.class.php
    M htdocs/core/db/mysqli.class.php
    M htdocs/core/lib/member.lib.php
    M htdocs/core/modules/modExpedition.class.php
    M htdocs/install/mysql/migration/3.4.0-3.5.0.sql
    M htdocs/install/mysql/migration/repair.sql

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


  Commit: 0e2497e7108bc65b89ee143ad9c33f5ba7a5ddf8
      
https://github.com/Dolibarr/dolibarr/commit/0e2497e7108bc65b89ee143ad9c33f5ba7a5ddf8
  Author: Florian HENRY <address@hidden>
  Date:   2014-05-07 (Wed, 07 May 2014)

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

  Log Message:
  -----------
  [ bug #1377 ] Warning: get_class() called without object from outside a
class


  Commit: 1bc355830763c60f084d338275c9a8f2ac8430ae
      
https://github.com/Dolibarr/dolibarr/commit/1bc355830763c60f084d338275c9a8f2ac8430ae
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-05-07 (Wed, 07 May 2014)

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

  Log Message:
  -----------
  Fix: Better html detection


  Commit: 16b3ec8923a8880cf0a71c0fb58d4c07cd6c005b
      
https://github.com/Dolibarr/dolibarr/commit/16b3ec8923a8880cf0a71c0fb58d4c07cd6c005b
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-05-07 (Wed, 07 May 2014)

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

  Log Message:
  -----------
  Fix: concat of string must use dol_concat.


  Commit: ac27884b887e852dd6eae5bb41dd106f1ffa6d61
      
https://github.com/Dolibarr/dolibarr/commit/ac27884b887e852dd6eae5bb41dd106f1ffa6d61
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-05-07 (Wed, 07 May 2014)

  Changed paths:
    M htdocs/includes/odtphp/Segment.php
    M htdocs/includes/odtphp/odf.php

  Log Message:
  -----------
  Fix: [ bug #1366 ] Special characters are HTML encoded with WYSIWYG
module.


  Commit: ef2a8a0b092b27646015498f5c5b4283b1b176f5
      
https://github.com/Dolibarr/dolibarr/commit/ef2a8a0b092b27646015498f5c5b4283b1b176f5
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-05-07 (Wed, 07 May 2014)

  Changed paths:
    M ChangeLog
    M htdocs/core/modules/modExpedition.class.php
    M htdocs/livraison/fiche.php

  Log Message:
  -----------
  Merge pull request #1582 from marcosgdf/changelog

Changelog


  Commit: 4bf86508a535b29179501ba0e05cf4f39a30f5c4
      
https://github.com/Dolibarr/dolibarr/commit/4bf86508a535b29179501ba0e05cf4f39a30f5c4
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-05-07 (Wed, 07 May 2014)

  Changed paths:
    M htdocs/core/lib/functions2.lib.php
    M htdocs/projet/class/project.class.php
    M htdocs/projet/fiche.php

  Log Message:
  -----------
  Merge pull request #1583 from FHenry/3.5

Fix error return project deletion


  Commit: 7bfbc4cbf30fa4f4c0d5bb5b464611722c40818d
      
https://github.com/Dolibarr/dolibarr/commit/7bfbc4cbf30fa4f4c0d5bb5b464611722c40818d
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-05-07 (Wed, 07 May 2014)

  Changed paths:
    M ChangeLog
    M htdocs/core/lib/doc.lib.php
    M htdocs/core/lib/functions.lib.php
    M htdocs/includes/odtphp/Segment.php
    M htdocs/includes/odtphp/odf.php
    M htdocs/livraison/fiche.php
    M htdocs/projet/class/project.class.php
    M test/phpunit/FunctionsLibTest.php

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

Conflicts:
        htdocs/core/modules/modExpedition.class.php
        htdocs/projet/class/project.class.php


Compare: 
https://github.com/Dolibarr/dolibarr/compare/51baae16a4b1...7bfbc4cbf30f

reply via email to

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