[Dolibarr-git] [Dolibarr/dolibarr] 87da1d: mysql 5.5.41 is still bugged returning "lost conne...

[Laurent Destailleur]

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 87da1d734e9b104d4e92c1407cea20c3a171a61e
      
https://github.com/Dolibarr/dolibarr/commit/87da1d734e9b104d4e92c1407cea20c3a171a61e
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-03-22 (Sun, 22 Mar 2015)

  Changed paths:
    M htdocs/install/upgrade.php

  Log Message:
  -----------
  mysql 5.5.41 is still bugged returning "lost connexion" during migration
but there is no more data loss so we can allow this version. A database
upgrade to 5.6 will be required if this occurs.


  Commit: 15ac0894c9c3adb47cdc93b8b30da74f80202db7
      
https://github.com/Dolibarr/dolibarr/commit/15ac0894c9c3adb47cdc93b8b30da74f80202db7
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-03-22 (Sun, 22 Mar 2015)

  Changed paths:
    M ChangeLog

  Log Message:
  -----------
  Prepare 3.7 release


  Commit: f4b1d95b3ef460bd30be09d0b554014c81261f70
      
https://github.com/Dolibarr/dolibarr/commit/f4b1d95b3ef460bd30be09d0b554014c81261f70
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-03-23 (Mon, 23 Mar 2015)

  Changed paths:
    M htdocs/conf/conf.php.example
    M htdocs/user/card.php

  Log Message:
  -----------
  Some fix for multicompany module


  Commit: 042556a9cf84ca356020c41d0dbbdfb1a77613b2
      
https://github.com/Dolibarr/dolibarr/commit/042556a9cf84ca356020c41d0dbbdfb1a77613b2
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-03-23 (Mon, 23 Mar 2015)

  Changed paths:
    M htdocs/conf/conf.php.example
    M htdocs/core/login/functions_ldap.php
    M htdocs/user/card.php

  Log Message:
  -----------
  Better comments


  Commit: e269aa83b5a84e8bc18d95208eeaef5849530c7c
      
https://github.com/Dolibarr/dolibarr/commit/e269aa83b5a84e8bc18d95208eeaef5849530c7c
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-03-23 (Mon, 23 Mar 2015)

  Changed paths:
    M htdocs/core/login/functions_dolibarr.php
    M htdocs/core/login/functions_ldap.php

  Log Message:
  -----------
  More comments


  Commit: 7ad0a325599776231ca235afc65493ffba6e7e33
      
https://github.com/Dolibarr/dolibarr/commit/7ad0a325599776231ca235afc65493ffba6e7e33
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-03-23 (Mon, 23 Mar 2015)

  Changed paths:
    M htdocs/user/home.php
    M htdocs/user/index.php

  Log Message:
  -----------
  Fix for multicompany users.


  Commit: 5d2e09ec5146b366dc8fb99f6277887d065baad1
      
https://github.com/Dolibarr/dolibarr/commit/5d2e09ec5146b366dc8fb99f6277887d065baad1
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-03-23 (Mon, 23 Mar 2015)

  Changed paths:
    M htdocs/product/popuprop.php

  Log Message:
  -----------
  Fix: navigation in page was wrong and typo errors.


  Commit: b7a466c95fd0408abb64a082467e3992c631cacb
      
https://github.com/Dolibarr/dolibarr/commit/b7a466c95fd0408abb64a082467e3992c631cacb
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-03-23 (Mon, 23 Mar 2015)

  Changed paths:
    M htdocs/core/boxes/box_activity.php

  Log Message:
  -----------
  Fix bad style for total


  Commit: dc0d3504dd48243856791c07297f81448bbe5e14
      
https://github.com/Dolibarr/dolibarr/commit/dc0d3504dd48243856791c07297f81448bbe5e14
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-03-23 (Mon, 23 Mar 2015)

  Changed paths:
    M htdocs/fourn/commande/card.php

  Log Message:
  -----------
  Fix: Bad notification key


  Commit: 3844d4e6f74ad21bb74e5342daa5f05a8e78925a
      
https://github.com/Dolibarr/dolibarr/commit/3844d4e6f74ad21bb74e5342daa5f05a8e78925a
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-03-23 (Mon, 23 Mar 2015)

  Changed paths:
    M ChangeLog
    M htdocs/conf/conf.php.example
    M htdocs/core/boxes/box_activity.php
    M htdocs/core/login/functions_dolibarr.php
    M htdocs/core/login/functions_ldap.php
    M htdocs/fourn/commande/card.php
    M htdocs/install/upgrade.php
    M htdocs/product/popuprop.php
    M htdocs/user/card.php
    M htdocs/user/home.php
    M htdocs/user/index.php

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

Conflicts:
        ChangeLog
        htdocs/core/boxes/box_activity.php
        htdocs/fourn/commande/card.php
        htdocs/user/card.php


Compare: 
https://github.com/Dolibarr/dolibarr/compare/72ce60ff366a...3844d4e6f74a