[Dolibarr-git] [Dolibarr/dolibarr] 7904e9: FIX When disconnected, the search box jump to logi...

[Laurent Destailleur]

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 7904e994a7f2ed39f24d27ea01b6cae0759b68c2
      
https://github.com/Dolibarr/dolibarr/commit/7904e994a7f2ed39f24d27ea01b6cae0759b68c2
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-07-22 (Sat, 22 Jul 2017)

  Changed paths:
    M htdocs/core/ajax/selectsearchbox.php
    M htdocs/langs/en_US/other.lang
    M htdocs/main.inc.php

  Log Message:
  -----------
  FIX When disconnected, the search box jump to login instead of error.


  Commit: 0963a649b7c359d825d27c0054f3099980275fa0
      
https://github.com/Dolibarr/dolibarr/commit/0963a649b7c359d825d27c0054f3099980275fa0
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-07-22 (Sat, 22 Jul 2017)

  Changed paths:
    M ChangeLog

  Log Message:
  -----------
  Update doc


  Commit: 0aed9ecd7c17966f360fd6600b7de5f83170b4bc
      
https://github.com/Dolibarr/dolibarr/commit/0aed9ecd7c17966f360fd6600b7de5f83170b4bc
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-07-23 (Sun, 23 Jul 2017)

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

  Log Message:
  -----------
  Fix ckeditor is now ok since there is no more jmobile.


  Commit: 6421ec3139641b30d7efeb793ab315309969b066
      
https://github.com/Dolibarr/dolibarr/commit/6421ec3139641b30d7efeb793ab315309969b066
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-07-23 (Sun, 23 Jul 2017)

  Changed paths:
    M ChangeLog
    M htdocs/core/ajax/selectsearchbox.php
    M htdocs/core/class/doleditor.class.php
    M htdocs/langs/en_US/other.lang
    M htdocs/main.inc.php

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

Conflicts:
        htdocs/core/class/doleditor.class.php


Compare: 
https://github.com/Dolibarr/dolibarr/compare/f3de6cfd3275...6421ec313964