[Dolibarr-git] [Dolibarr/dolibarr] 2f4822: Merge

[Laurent Destailleur]

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 2f4822e73b834fd026c7627ff61adee6a6c456a6
      
https://github.com/Dolibarr/dolibarr/commit/2f4822e73b834fd026c7627ff61adee6a6c456a6
  Author: aspangaro <address@hidden>
  Date:   2014-10-15 (Wed, 15 Oct 2014)

  Changed paths:
    M htdocs/projet/tasks/time.php

  Log Message:
  -----------
  Merge


  Commit: c1d016a5312ed9ef945ba41a2d9424fd96cf6389
      
https://github.com/Dolibarr/dolibarr/commit/c1d016a5312ed9ef945ba41a2d9424fd96cf6389
  Author: aspangaro <address@hidden>
  Date:   2014-10-16 (Thu, 16 Oct 2014)

  Changed paths:
    M htdocs/comm/action/index.php
    M htdocs/langs/en_US/users.lang
    M htdocs/user/agenda_extsites.php
    M htdocs/user/card.php
    M htdocs/user/class/user.class.php

  Log Message:
  -----------
  Add field to select color of the user in user's card


  Commit: 18426ab8fc99549f818570c571c8a4ea42ef85e7
      
https://github.com/Dolibarr/dolibarr/commit/18426ab8fc99549f818570c571c8a4ea42ef85e7
  Author: aspangaro <address@hidden>
  Date:   2014-10-16 (Thu, 16 Oct 2014)

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

  Log Message:
  -----------
  Merge remote-tracking branch 'Upstream/develop' into develop-usercolor


  Commit: 01957de5a2a840b25167798245df08b1fb17db17
      
https://github.com/Dolibarr/dolibarr/commit/01957de5a2a840b25167798245df08b1fb17db17
  Author: aspangaro <address@hidden>
  Date:   2014-10-16 (Thu, 16 Oct 2014)

  Changed paths:
    M ChangeLog
    M htdocs/core/class/translate.class.php

  Log Message:
  -----------
  Merge remote-tracking branch 'Upstream/develop' into develop-usercolor


  Commit: b4a9e6a119d3712f106bda6d9c893b52579cee90
      
https://github.com/Dolibarr/dolibarr/commit/b4a9e6a119d3712f106bda6d9c893b52579cee90
  Author: aspangaro <address@hidden>
  Date:   2014-10-16 (Thu, 16 Oct 2014)

  Changed paths:
    M htdocs/user/class/user.class.php

  Log Message:
  -----------
  Fix :: Administrator not created on new install


  Commit: 85ce8f8fefbe299f6737090597cb56bc717b3230
      
https://github.com/Dolibarr/dolibarr/commit/85ce8f8fefbe299f6737090597cb56bc717b3230
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-10-18 (Sat, 18 Oct 2014)

  Changed paths:
    M htdocs/comm/action/index.php
    M htdocs/langs/en_US/users.lang
    M htdocs/user/agenda_extsites.php
    M htdocs/user/card.php
    M htdocs/user/class/user.class.php

  Log Message:
  -----------
  Merge pull request #1959 from aspangaro/develop-usercolor

Add field to select color of the user in user's card


Compare: 
https://github.com/Dolibarr/dolibarr/compare/97f98d7e1659...85ce8f8fefbe