dolibarr-git
[Top][All Lists]
Advanced

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

[Dolibarr-git] [Dolibarr/dolibarr] 3c3c0b: Fix: _ not allowed into prest


From: Laurent Destailleur
Subject: [Dolibarr-git] [Dolibarr/dolibarr] 3c3c0b: Fix: _ not allowed into prestashop tags.
Date: Sat, 30 Mar 2013 06:10:14 -0700

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 3c3c0b456e856c9b8b60d6f9d241ef37e9af70b5
      
https://github.com/Dolibarr/dolibarr/commit/3c3c0b456e856c9b8b60d6f9d241ef37e9af70b5
  Author: Laurent Destailleur <address@hidden>
  Date:   2013-03-28 (Thu, 28 Mar 2013)

  Changed paths:
    M htdocs/admin/sms.php

  Log Message:
  -----------
  Fix: _ not allowed into prestashop tags.


  Commit: 888da9f3e9f1fa073c4b6cd4e4f1d54b1ccebf9c
      
https://github.com/Dolibarr/dolibarr/commit/888da9f3e9f1fa073c4b6cd4e4f1d54b1ccebf9c
  Author: Regis Houssin <address@hidden>
  Date:   2013-03-29 (Fri, 29 Mar 2013)

  Changed paths:
    M htdocs/comm/propal.php

  Log Message:
  -----------
  Fix: file with a specific mask not found


  Commit: 1e3b26a104e04b62ca422fd19b295c2eb19f0653
      
https://github.com/Dolibarr/dolibarr/commit/1e3b26a104e04b62ca422fd19b295c2eb19f0653
  Author: Regis Houssin <address@hidden>
  Date:   2013-03-29 (Fri, 29 Mar 2013)

  Changed paths:
    M htdocs/compta/facture.php

  Log Message:
  -----------
  Fix: file with a specific mask not found, again


  Commit: e0baa0fe46e53851f2f74a3be1fe77021b526c52
      
https://github.com/Dolibarr/dolibarr/commit/e0baa0fe46e53851f2f74a3be1fe77021b526c52
  Author: Laurent Destailleur <address@hidden>
  Date:   2013-03-30 (Sat, 30 Mar 2013)

  Changed paths:
    M htdocs/comm/propal.php
    M htdocs/commande/fiche.php
    M htdocs/compta/facture.php
    M htdocs/core/lib/files.lib.php
    M htdocs/expedition/fiche.php
    M htdocs/fichinter/fiche.php
    M htdocs/fourn/commande/fiche.php
    M htdocs/fourn/facture/fiche.php

  Log Message:
  -----------
  Generalize fix: file with a specific mask not found, again

Conflicts:
        htdocs/comm/propal.php
        htdocs/commande/fiche.php
        htdocs/compta/facture.php
        htdocs/expedition/fiche.php
        htdocs/fichinter/fiche.php


  Commit: 3c23a717fd32030c5aae306c9e868f7e58c34643
      
https://github.com/Dolibarr/dolibarr/commit/3c23a717fd32030c5aae306c9e868f7e58c34643
  Author: Laurent Destailleur <address@hidden>
  Date:   2013-03-30 (Sat, 30 Mar 2013)

  Changed paths:
    M htdocs/admin/sms.php
    M htdocs/comm/propal.php
    M htdocs/core/lib/files.lib.php
    M htdocs/expedition/fiche.php

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

Conflicts:
        htdocs/comm/propal.php
        htdocs/core/lib/files.lib.php


Compare: 
https://github.com/Dolibarr/dolibarr/compare/a5e66ab7ba3b...3c23a717fd32

reply via email to

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