[Dolibarr-git] [Dolibarr/dolibarr] ed724b: Fix: We must not define language var if parm not d...

[Regis Houssin]

  Branch: refs/heads/3.2.1
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: ed724b82d36a4c858c356954f31e37435482e54f
      
https://github.com/Dolibarr/dolibarr/commit/ed724b82d36a4c858c356954f31e37435482e54f
  Author: Laurent Destailleur <address@hidden>
  Date:   2012-06-20 (Wed, 20 Jun 2012)

  Changed paths:
    M htdocs/master.inc.php

  Log Message:
  -----------
  Fix: We must not define language var if parm not defined.

Conflicts:
        htdocs/master.inc.php


  Commit: 56f7d31d112049096f04115bb4a07b1ff11a0330
      
https://github.com/Dolibarr/dolibarr/commit/56f7d31d112049096f04115bb4a07b1ff11a0330
  Author: Regis Houssin <address@hidden>
  Date:   2012-06-21 (Thu, 21 Jun 2012)

  Changed paths:
    M htdocs/master.inc.php

  Log Message:
  -----------
  Merge branch '3.2' of git+ssh://address@hidden/Dolibarr/dolibarr.git into 
3.2.1


  Commit: 8deeac403a718e457bbd1016224064741cb9fe71
      
https://github.com/Dolibarr/dolibarr/commit/8deeac403a718e457bbd1016224064741cb9fe71
  Author: Laurent Destailleur <address@hidden>
  Date:   2012-06-23 (Sat, 23 Jun 2012)

  Changed paths:
    M htdocs/core/modules/action/rapport.pdf.php

  Log Message:
  -----------
  Fix: Label was not translated


  Commit: 06c17b806e49511458f2e9a29dd6bb822e991202
      
https://github.com/Dolibarr/dolibarr/commit/06c17b806e49511458f2e9a29dd6bb822e991202
  Author: Laurent Destailleur <address@hidden>
  Date:   2012-06-23 (Sat, 23 Jun 2012)

  Changed paths:
    M htdocs/main.inc.php

  Log Message:
  -----------
  Fix: fckeditor ko on linux package


  Commit: a67f6cc732fbc95a061889d248f4952c55c8f0db
      
https://github.com/Dolibarr/dolibarr/commit/a67f6cc732fbc95a061889d248f4952c55c8f0db
  Author: Laurent Destailleur <address@hidden>
  Date:   2012-06-23 (Sat, 23 Jun 2012)

  Changed paths:
    M htdocs/admin/expedition.php

  Log Message:
  -----------
  Fix: Preview of shiping receipts


  Commit: 5e490f8530b8d0ce1faa38583fa14eb9a2aaf584
      
https://github.com/Dolibarr/dolibarr/commit/5e490f8530b8d0ce1faa38583fa14eb9a2aaf584
  Author: Laurent Destailleur <address@hidden>
  Date:   2012-06-24 (Sun, 24 Jun 2012)

  Changed paths:
    M htdocs/admin/workflow.php

  Log Message:
  -----------
  Fix: Remove warning


  Commit: 643e077c6855d2cc8d13dc0920fafb65a201b53a
      
https://github.com/Dolibarr/dolibarr/commit/643e077c6855d2cc8d13dc0920fafb65a201b53a
  Author: Laurent Destailleur <address@hidden>
  Date:   2012-06-24 (Sun, 24 Jun 2012)

  Changed paths:
    M htdocs/langs/tr_TR/admin.lang
    M htdocs/langs/tr_TR/main.lang

  Log Message:
  -----------
  Fix: turkish language


  Commit: 62f14e3dd5eee68fe37ffa0ef73640a32e6c57b8
      
https://github.com/Dolibarr/dolibarr/commit/62f14e3dd5eee68fe37ffa0ef73640a32e6c57b8
  Author: Laurent Destailleur <address@hidden>
  Date:   2012-06-26 (Tue, 26 Jun 2012)

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

  Log Message:
  -----------
  Fix: Removed warning. Fix compatibility.


  Commit: 3164b5615caa08a6c339c9e34206f6fa6c7c33d7
      
https://github.com/Dolibarr/dolibarr/commit/3164b5615caa08a6c339c9e34206f6fa6c7c33d7
  Author: Regis Houssin <address@hidden>
  Date:   2012-06-27 (Wed, 27 Jun 2012)

  Changed paths:
    M htdocs/admin/expedition.php
    M htdocs/admin/workflow.php
    M htdocs/core/class/commonobject.class.php
    M htdocs/core/modules/action/rapport.pdf.php
    M htdocs/langs/tr_TR/admin.lang
    M htdocs/langs/tr_TR/main.lang
    M htdocs/main.inc.php

  Log Message:
  -----------
  Merge branch '3.2' of git+ssh://address@hidden/Dolibarr/dolibarr.git into 
3.2.1


  Commit: 11f78c1913b2e47ff9ff394c5db9ced326cc3c94
      
https://github.com/Dolibarr/dolibarr/commit/11f78c1913b2e47ff9ff394c5db9ced326cc3c94
  Author: Regis Houssin <address@hidden>
  Date:   2012-06-27 (Wed, 27 Jun 2012)

  Changed paths:
    M htdocs/theme/auguria/ckeditor/config.js
    M htdocs/theme/bureau2crea/ckeditor/config.js
    M htdocs/theme/cameleo/ckeditor/config.js
    M htdocs/theme/eldy/ckeditor/config.js

  Log Message:
  -----------
  Fix: add ckeditor create div option with dolibarr_mailings toolbar


Compare: 
https://github.com/Dolibarr/dolibarr/compare/d941d1efeede...11f78c1913b2