Skip to content
Snippets Groups Projects
  • Andreas Fischer's avatar
    c205d8d1
    Merge remote-tracking branch 'owncloud/master' into fixing-3417-master · c205d8d1
    Andreas Fischer authored
    * owncloud/master: (1989 commits)
      [tx-robot] updated from transifex
      dont try to register background jobs if we haven't upgraded yet
      adjust test
      coding style
      coding style
      On webdav sesssions, loginname was compared to username which does not need to match necessarily
      rely only on php DateTime to parse the db datetime string
      LDAP: fix method behind save button on advancend and expert tabs, fixes at least Home Folder setinng
      Fix webroot for update page
      Update 3rdparty ref
      update 3rdparty
      toggle select all checkbox
      remove unneeded ; in comment
      LDAP: the browser shall not autofill userdn and password, usually login credentials are inserted. fixes #6283
      Add test for having utf8 filenames in the cache
      fix fallback overwriting result of getHome
      [tx-robot] updated from transifex
      fix smbclient directory listing parser
      cache the home folder of a User
      Send "SET NAMES utf8" to MySQL for PHP below 5.3.6
      ...
    
    Conflicts:
    	lib/util.php
    c205d8d1
    History
    Merge remote-tracking branch 'owncloud/master' into fixing-3417-master
    Andreas Fischer authored
    * owncloud/master: (1989 commits)
      [tx-robot] updated from transifex
      dont try to register background jobs if we haven't upgraded yet
      adjust test
      coding style
      coding style
      On webdav sesssions, loginname was compared to username which does not need to match necessarily
      rely only on php DateTime to parse the db datetime string
      LDAP: fix method behind save button on advancend and expert tabs, fixes at least Home Folder setinng
      Fix webroot for update page
      Update 3rdparty ref
      update 3rdparty
      toggle select all checkbox
      remove unneeded ; in comment
      LDAP: the browser shall not autofill userdn and password, usually login credentials are inserted. fixes #6283
      Add test for having utf8 filenames in the cache
      fix fallback overwriting result of getHome
      [tx-robot] updated from transifex
      fix smbclient directory listing parser
      cache the home folder of a User
      Send "SET NAMES utf8" to MySQL for PHP below 5.3.6
      ...
    
    Conflicts:
    	lib/util.php