dolibarr-git
[Top][All Lists]
Advanced

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

[Dolibarr-git] [Dolibarr/dolibarr] 398733: Fix syntax error


From: Laurent Destailleur
Subject: [Dolibarr-git] [Dolibarr/dolibarr] 398733: Fix syntax error
Date: Sun, 20 Aug 2017 15:49:41 -0700

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 398733ff9a336113da9ada8ff6276dccc6227e05
      
https://github.com/Dolibarr/dolibarr/commit/398733ff9a336113da9ada8ff6276dccc6227e05
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-08-17 (Thu, 17 Aug 2017)

  Changed paths:
    M htdocs/compta/bank/bankentries.php

  Log Message:
  -----------
  Fix syntax error


  Commit: 1101a1094f1ee8a38409a83f1a5fefc9506a279d
      
https://github.com/Dolibarr/dolibarr/commit/1101a1094f1ee8a38409a83f1a5fefc9506a279d
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-08-20 (Sun, 20 Aug 2017)

  Changed paths:
    M htdocs/cron/admin/cron.php
    M htdocs/install/mysql/migration/5.0.0-6.0.0.sql
    M htdocs/langs/en_US/admin.lang

  Log Message:
  -----------
  Fix translation and migration


  Commit: aeba02fb2230df5a7750a1903bc1385c2ee43bd0
      
https://github.com/Dolibarr/dolibarr/commit/aeba02fb2230df5a7750a1903bc1385c2ee43bd0
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-08-20 (Sun, 20 Aug 2017)

  Changed paths:
    M htdocs/index.php

  Log Message:
  -----------
  Fix bad table alignement


  Commit: ac3a270e170a8d3373a447b5e5e8bc0e080ce928
      
https://github.com/Dolibarr/dolibarr/commit/ac3a270e170a8d3373a447b5e5e8bc0e080ce928
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-08-21 (Mon, 21 Aug 2017)

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

  Log Message:
  -----------
  FIX Do not delete files into sym links

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


  Commit: 5a0641a30ea9c6e4afee6c976a0b0f14d08d769a
      
https://github.com/Dolibarr/dolibarr/commit/5a0641a30ea9c6e4afee6c976a0b0f14d08d769a
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-08-21 (Mon, 21 Aug 2017)

  Changed paths:
    M ChangeLog

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

Conflicts:
        htdocs/compta/bank/bankentries.php


  Commit: 4f6363bff89bb8fbee52d4eda4e45d7baac70983
      
https://github.com/Dolibarr/dolibarr/commit/4f6363bff89bb8fbee52d4eda4e45d7baac70983
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-08-21 (Mon, 21 Aug 2017)

  Changed paths:
    M ChangeLog
    M htdocs/cron/admin/cron.php
    M htdocs/index.php
    M htdocs/install/mysql/migration/5.0.0-6.0.0.sql
    M htdocs/langs/en_US/admin.lang

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


Compare: 
https://github.com/Dolibarr/dolibarr/compare/a9b033e82fef...4f6363bff89b

reply via email to

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