dolibarr-git
[Top][All Lists]
Advanced

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

[Dolibarr-git] [Dolibarr/dolibarr] 84f621: Fix migration on pgsql


From: Laurent Destailleur
Subject: [Dolibarr-git] [Dolibarr/dolibarr] 84f621: Fix migration on pgsql
Date: Thu, 20 Jul 2017 09:32:09 -0700

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 84f621fde33ae245fc014b889242a03b41b131cb
      
https://github.com/Dolibarr/dolibarr/commit/84f621fde33ae245fc014b889242a03b41b131cb
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-07-19 (Wed, 19 Jul 2017)

  Changed paths:
    M htdocs/install/mysql/migration/5.0.0-6.0.0.sql
    M htdocs/install/pgsql/functions/functions.sql

  Log Message:
  -----------
  Fix migration on pgsql


  Commit: 3b8f60f90e0a22460ff177448e6d94d159fc7997
      
https://github.com/Dolibarr/dolibarr/commit/3b8f60f90e0a22460ff177448e6d94d159fc7997
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-07-20 (Thu, 20 Jul 2017)

  Changed paths:
    M htdocs/core/lib/website.lib.php
    A htdocs/core/website.inc.php
    M htdocs/langs/en_US/website.lang
    M htdocs/public/websites/index.php
    M htdocs/theme/eldy/style.css.php
    M htdocs/theme/md/style.css.php
    M htdocs/websites/class/website.class.php
    M htdocs/websites/index.php

  Log Message:
  -----------
  Fix pb of recursive include in website module


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

  Changed paths:
    M htdocs/websites/class/website.class.php

  Log Message:
  -----------
  Fix sql syntax


  Commit: 7760594643e35d4dc9abd903a99e5bef5d3b154e
      
https://github.com/Dolibarr/dolibarr/commit/7760594643e35d4dc9abd903a99e5bef5d3b154e
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-07-20 (Thu, 20 Jul 2017)

  Changed paths:
    M htdocs/core/lib/website.lib.php
    A htdocs/core/website.inc.php
    M htdocs/install/mysql/migration/5.0.0-6.0.0.sql
    M htdocs/install/pgsql/functions/functions.sql
    M htdocs/langs/en_US/website.lang
    M htdocs/public/websites/index.php
    M htdocs/theme/eldy/style.css.php
    M htdocs/theme/md/style.css.php
    M htdocs/websites/class/website.class.php
    M htdocs/websites/index.php

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

Conflicts:
        htdocs/langs/en_US/website.lang
        htdocs/theme/eldy/style.css.php
        htdocs/websites/class/website.class.php
        htdocs/websites/index.php


Compare: 
https://github.com/Dolibarr/dolibarr/compare/2f3128410bb2...7760594643e3

reply via email to

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