Commit Graph

10 Commits

Author SHA1 Message Date
blizzz 51fd2602a7 Revert "Downstream 2016-06-08" 2016-06-09 17:41:57 +02:00
Vincent Petry 8c7a32ccb9
Fix GDrive upload file which name might match the one of a folder
Whenever a file is uploaded to GDrive, there is a check for that file
with and without extension, due to Google Docs files having no
extension. This logic now only kicks in whenever the detected
extensionless file is really a Google Doc file, not a folder.

This makes it possible again to upload a file "test.txt" in a folder
that also has a folder called "test"
2016-06-09 14:00:01 +02:00
Lukas Reschke aba539703c
Update license headers 2016-05-26 19:57:24 +02:00
Vincent Petry f7d102ccc5 Merge pull request #24799 from owncloud/altyr-117-upstream
Update google-api-php-client to 1.1.7
2016-05-24 14:46:10 +02:00
Vincent Petry 648fc8d916 skip google map files (#24807) 2016-05-24 14:45:29 +02:00
Robin Appelman 8a40003169 fix phpdoc 2016-05-24 13:58:08 +02:00
Robin Appelman c031eafd84 Fix cert bundle path 2016-05-24 13:44:43 +02:00
Vincent Petry 4635ed7748
Fix autoloading for new google SDK lib 2016-05-24 12:22:30 +02:00
Francesco Rovelli 49bec94959
enable autoload of lib in google storage 2016-05-24 12:22:30 +02:00
Joas Schilling 4576891f10
Move Lib\Storage to PSR-4 2016-05-24 08:41:22 +02:00