Commit Graph

32751 Commits

Author SHA1 Message Date
Vincent Petry 4fd55c255f Merge pull request #25007 from owncloud/gdrive-fixuploadsamenameasfolder
Fix GDrive upload file which name might match the one of a folder
2016-06-08 09:46:15 +02:00
Joas Schilling 68a7aed27b
Adjust test to work with phpunit < 5.2 2016-06-08 09:24:00 +02:00
Christoph Wurst 4bff16e52d
darker background image for better font contrast 2016-06-08 08:34:08 +02:00
Roeland Jago Douma 4a3c67fdb4
Bring back sharedstorage hooks 2016-06-08 08:19:32 +02:00
Jenkins for ownCloud bbd61cd98a [tx-robot] updated from transifex 2016-06-08 01:54:57 -04:00
Vincent Petry fb087a0261
Use temporary htaccesstest.txt for data dir security check 2016-06-07 18:36:13 +02:00
Juan Pablo Villafáñez a2b00582bc Fix test 2016-06-07 18:27:10 +02:00
Juan Pablo Villafáñez 110edd3d3c Rename variable 2016-06-07 18:25:17 +02:00
Joas Schilling 3e3b326c85
Allow to cancel 2FA after login 2016-06-07 18:17:29 +02:00
Robin Appelman 2cf7ad8c55 make sure $data['mtime'] is always a timestamp 2016-06-07 17:09:24 +02:00
Juan Pablo Villafáñez 8526bbb347 Add support to know where the storage test comes from 2016-06-07 16:53:16 +02:00
Vincent Petry 15fffb2b10
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-07 16:29:23 +02:00
Roeland Jago Douma 72c5535492
Extend unit tests 2016-06-07 15:09:26 +02:00
Roeland Jago Douma 2e2ece753f
Fix unit tests 2016-06-07 15:09:25 +02:00
Roeland Jago Douma 7c040c0bf9
Show the path relative to the requesting user
A share can only be requested by 3 'types' of people

* owner
* initiator
* recipient

So we have to get the path as the current user. Since that is the only
path that has any meaning to the user.
2016-06-07 15:09:19 +02:00
Robin Appelman 6822689e38 don't update storage mtime if we can't get the modified date 2016-06-07 15:04:24 +02:00
Robin Appelman f119769c26 Better handling of forbidden files in dav 2016-06-07 14:01:55 +02:00
Robin Appelman 73547f29be Ignore forbidden files while scanning 2016-06-07 14:01:55 +02:00
Robin Appelman 7b1b723e5b dissalow symlinks in local storages that point outside the datadir 2016-06-07 14:01:53 +02:00
Joas Schilling 77db6d3dbd
Improve the UX for "not found" perma links 2016-06-07 13:53:16 +02:00
Vincent Petry 46fe2ddf2e Merge pull request #23845 from owncloud/smb-rename
implement specific rename handling for SMB
2016-06-07 12:32:51 +02:00
Jörn Friedrich Dreyer 2989584b45 decrease initial users to load to 50
Prevents timeouts on the initial loading of users. proper fix will be in https://github.com/owncloud/core/pull/10994
Workaround for https://github.com/owncloud/core/issues/24734
2016-06-07 11:40:04 +02:00
Sergio Bertolín 67c9e598ae Fixed reviews 2016-06-07 07:55:28 +00:00
Vincent Petry bf917d7063 Merge pull request #24813 from owncloud/delete-ghost-files
allow deleting "ghost files" trough the View and Node api
2016-06-07 09:34:16 +02:00
Joas Schilling d4ba982131
Allow to decrypt user '0' files only 2016-06-07 09:13:11 +02:00
Christoph Wurst 8f7a4aaa4d
do not generate device token if 2FA is enable for user 2016-06-07 09:09:51 +02:00
Jenkins for ownCloud f28f6ad2df [tx-robot] updated from transifex 2016-06-07 01:55:08 -04:00
William Bargent 6256bbdd20 Remove background from curved logo (#24980) 2016-06-06 17:06:28 +02:00
Robin Appelman 7a0254b15b handle path not being set in shared cache (#24993) 2016-06-06 17:01:55 +02:00
Thomas Müller 371a07e3ab Fix checkMove() implementation for dav v2 - fixes #24776 (#24971) 2016-06-06 17:01:27 +02:00
davitol f9b3865093 Comments fixed 2016-06-06 16:10:49 +02:00
davitol eaeb5d606d Fix Decrypt message via occ 2016-06-06 15:28:49 +02:00
Roeland Jago Douma 1b5368bbaf
Wrap publicwebdav in sharePermission mask
Fixes #24868

The writable mask was a bit misleading. We should wrap with the
sharepermissions (as they are used everywhere else). The
PERMISSIONS_SHARE are added since that is required for the public link
check plugin.
2016-06-06 14:39:02 +02:00
Joas Schilling 7d31ae9909 Fix second check for quota size (#24989) 2016-06-06 13:47:53 +02:00
Jenkins for ownCloud fb5fb6a9b5 [tx-robot] updated from transifex 2016-06-06 06:51:58 -04:00
Joas Schilling 911fd3ead4
Do not allow to store boolean configs, they behave unexpected on postgres 2016-06-06 12:38:20 +02:00
Vincent Petry 2867d7a0f8 Merge pull request #24964 from owncloud/issue-24961-public-upload-unlimited
Allow public upload when the quota is unlimited
2016-06-06 11:28:52 +02:00
Jenkins for ownCloud c0a91ddca7 [tx-robot] updated from transifex 2016-06-05 02:00:36 -04:00
Jenkins for ownCloud 4234892a60 [tx-robot] updated from transifex 2016-06-04 02:01:18 -04:00
Martin 1059315e09 .htaccess update making two rules non-capturing 2016-06-03 16:34:26 +02:00
Robin Appelman 3bd5073251 add test for deleting ghost files over dav 2016-06-03 13:37:52 +02:00
Robin Appelman 6bc8305edd Fix warnings when trying to get mtime of non existing files 2016-06-03 13:35:27 +02:00
Robin Appelman 14f96f86e7 return success when deleting ghost files 2016-06-03 13:34:54 +02:00
Robin Appelman 63408fa6ef allow deleting "ghost files" trough the View and Node api 2016-06-03 13:30:59 +02:00
Vincent Petry 2d5bee0661 Merge pull request #24954 from owncloud/issue-24536-language-name-reused-for-fallback-languages
Do not use the language name, when it's not the one from the language…
2016-06-03 10:50:59 +02:00
Vincent Petry f2064232ef Merge pull request #24673 from owncloud/construct-path
Construct path to the version file from the current directory and fil…
2016-06-03 10:50:35 +02:00
Vincent Petry eb6ae84cee Merge pull request #24564 from owncloud/fix_21173_take_2
normalize path in getInternalPath
2016-06-03 10:50:18 +02:00
Jenkins for ownCloud 63132483ca [tx-robot] updated from transifex 2016-06-03 02:19:30 -04:00
Georg Ehrke 89a10fdb2d
normalize path in getInternalPath 2016-06-02 19:11:35 +02:00
Victor Dubiniuk d82df7e490
Construct path to the version file from the current directory and filename. Fixes #22450 2016-06-02 15:47:12 +02:00