dolibarr-git
[Top][All Lists]
Advanced
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Dolibarr-git] [Dolibarr/dolibarr] 33355c: FIX When we make a direct ass

From: Laurent Destailleur
Subject: [Dolibarr-git] [Dolibarr/dolibarr] 33355c: FIX When we make a direct assignement on a task to...
Date: Thu, 28 Jan 2016 03:20:57 -0800 
  Branch: refs/heads/3.9
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 33355c613a89d353a558ead78d944faa2290c65c
      
https://github.com/Dolibarr/dolibarr/commit/33355c613a89d353a558ead78d944faa2290c65c
  Author: Laurent Destailleur <address@hidden>
  Date:   2016-01-26 (Tue, 26 Jan 2016)

  Changed paths:
    M htdocs/projet/activity/perday.php
    M htdocs/projet/activity/perweek.php

  Log Message:
  -----------
  FIX When we make a direct assignement on a task to a user, we must check
he is also assigned to project (and if not assign it)


  Commit: 25924f31ad5283a3af9db5a68a488048384e361a
      
https://github.com/Dolibarr/dolibarr/commit/25924f31ad5283a3af9db5a68a488048384e361a
  Author: Laurent Destailleur <address@hidden>
  Date:   2016-01-26 (Tue, 26 Jan 2016)

  Changed paths:
    M htdocs/langs/en_US/projects.lang
    M htdocs/projet/tasks/time.php

  Log Message:
  -----------
  Bad translation


  Commit: 5fd6057c6cb4a145b4b43acb4f52ccf284d702ff
      
https://github.com/Dolibarr/dolibarr/commit/5fd6057c6cb4a145b4b43acb4f52ccf284d702ff
  Author: Laurent Destailleur <address@hidden>
  Date:   2016-01-26 (Tue, 26 Jan 2016)

  Changed paths:
    M htdocs/contrat/card.php
    M htdocs/contrat/class/contrat.class.php

  Log Message:
  -----------
  FIX Deadlock situation. Can't edit anymore contract.
FIX List of automatic events was not visible.


  Commit: e0683681ffa16ce8d0cf9c7b699c4babf342c329
      
https://github.com/Dolibarr/dolibarr/commit/e0683681ffa16ce8d0cf9c7b699c4babf342c329
  Author: Laurent Destailleur <address@hidden>
  Date:   2016-01-26 (Tue, 26 Jan 2016)

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


  Commit: fccecc902dd239360ccbdc049697a100399e6cf3
      
https://github.com/Dolibarr/dolibarr/commit/fccecc902dd239360ccbdc049697a100399e6cf3
  Author: Laurent Destailleur <address@hidden>
  Date:   2016-01-26 (Tue, 26 Jan 2016)

  Changed paths:
    M htdocs/main.inc.php

  Log Message:
  -----------
  Merge branch '3.8' of github.com:Dolibarr/dolibarr into 3.8


  Commit: 45656c18e8391368b71e9063a007600f258e909c
      
https://github.com/Dolibarr/dolibarr/commit/45656c18e8391368b71e9063a007600f258e909c
  Author: Laurent Destailleur <address@hidden>
  Date:   2016-01-27 (Wed, 27 Jan 2016)

  Changed paths:
    M htdocs/theme/eldy/style.css.php

  Log Message:
  -----------
  Fix hover css


  Commit: 20e110a882df243aeb219e92040bb133feeb4482
      
https://github.com/Dolibarr/dolibarr/commit/20e110a882df243aeb219e92040bb133feeb4482
  Author: Laurent Destailleur <address@hidden>
  Date:   2016-01-27 (Wed, 27 Jan 2016)

  Changed paths:
    M htdocs/contrat/card.php
    M htdocs/contrat/class/contrat.class.php
    M htdocs/langs/en_US/projects.lang
    M htdocs/projet/activity/perday.php
    M htdocs/projet/activity/perweek.php
    M htdocs/projet/tasks/time.php

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


  Commit: c8d232e05648547bf16f57e57c2b6780c99f7abb
      
https://github.com/Dolibarr/dolibarr/commit/c8d232e05648547bf16f57e57c2b6780c99f7abb
  Author: Laurent Destailleur <address@hidden>
  Date:   2016-01-28 (Thu, 28 Jan 2016)

  Changed paths:
    M htdocs/contrat/card.php
    M htdocs/contrat/class/contrat.class.php
    M htdocs/langs/en_US/projects.lang
    M htdocs/projet/activity/perday.php
    M htdocs/projet/activity/perweek.php
    M htdocs/projet/tasks/time.php
    M htdocs/theme/eldy/style.css.php

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/3.8' into 3.9

Conflicts:
        htdocs/contrat/card.php


  Commit: c09fa6e0dd3370f629111a78b886f41893dce420
      
https://github.com/Dolibarr/dolibarr/commit/c09fa6e0dd3370f629111a78b886f41893dce420
  Author: Laurent Destailleur <address@hidden>
  Date:   2016-01-28 (Thu, 28 Jan 2016)

  Changed paths:
    M htdocs/core/class/extrafields.class.php

  Log Message:
  -----------
  Fix empty keys are not allowed into select


  Commit: 99b22362601d5f57aa0bcb805977ea6772229f55
      
https://github.com/Dolibarr/dolibarr/commit/99b22362601d5f57aa0bcb805977ea6772229f55
  Author: Laurent Destailleur <address@hidden>
  Date:   2016-01-28 (Thu, 28 Jan 2016)

  Changed paths:
    M htdocs/contrat/card.php
    M htdocs/core/class/html.form.class.php
    M htdocs/core/class/html.formprojet.class.php
    M htdocs/fichinter/class/fichinter.class.php
    M htdocs/fourn/commande/card.php
    M htdocs/fourn/facture/card.php
    M htdocs/langs/en_US/projects.lang

  Log Message:
  -----------
  FIX Selection of project must no show closed project


  Commit: 83e8efa910274e3adccf51684cc3d12789ce8407
      
https://github.com/Dolibarr/dolibarr/commit/83e8efa910274e3adccf51684cc3d12789ce8407
  Author: Laurent Destailleur <address@hidden>
  Date:   2016-01-28 (Thu, 28 Jan 2016)

  Changed paths:
    M htdocs/theme/md/img/object_project.png
    M htdocs/theme/md/img/object_projectpub.png

  Log Message:
  -----------
  Fix picto private project was same than public project


Compare: 
https://github.com/Dolibarr/dolibarr/compare/d33548e32cd8...83e8efa91027
reply via email to
[Prev in Thread] Current Thread [Next in Thread]