Commit Graph

12062 Commits

Author SHA1 Message Date
Vincent Petry 7ecb9696ba Use showBusyState for upload into folder
This makes sure that the original icon will be restored properly in case
it's not the default folder icon
2015-12-18 18:09:54 +01:00
Vincent Petry d27826bac0 Correctly render uploadtext indicator only on folders 2015-12-18 18:09:46 +01:00
Roeland Jago Douma b460bde7c6 Removed deprecated OC_Helper::mimeTypeIcon function 2015-12-18 14:00:20 +01:00
Roeland Jago Douma 4f20e3bac0 Removed deprecated OC_Helper::getSecureMimeType 2015-12-18 13:42:59 +01:00
Thomas Müller 9e97bef935 Merge pull request #21268 from owncloud/cleanup-OC_Helper-getFileNameMimeType
Use proper public API for OC_Helper::getFileNameMimeType
2015-12-18 10:15:33 +01:00
Thomas Müller 551e553bf4 Merge pull request #21264 from owncloud/deprecated_oc_user_methods
Cleanup OC_User deprecated methods
2015-12-18 10:15:18 +01:00
Thomas Müller 67e9506261 Fix failing unit tests 2015-12-18 09:18:38 +01:00
Thomas Müller aac06a33f1 Fix carddav sharing plugin + adding unit tests 2015-12-18 09:18:38 +01:00
Morris Jobke ecdf88e41b Use proper public API for OC_Helper::getFileNameMimeType 2015-12-17 17:07:48 +01:00
Thomas Müller 792b270f22 Merge pull request #20696 from owncloud/add-carddav-backends-to-ocp-contactsmanager
Add carddav backend to OCP\ContactsManager
2015-12-17 16:36:48 +01:00
Roeland Jago Douma 1f715289bf Removed deprecated function OC_User::deleteUser
Replaced with proper OCP calls
2015-12-17 16:18:40 +01:00
Roeland Jago Douma 835911bce5 Removed deprecated private OC_User::createUser
All function calls are replaced with the recommended (which was already
the body of the function).
2015-12-17 16:18:40 +01:00
Roeland Jago Douma 7e44ea5da0 Remove deprecated function OC_User::getManager
Private deprecated function => removed
Replaced all instances with suggested replacement
2015-12-17 16:18:34 +01:00
Thomas Müller 1285b78086 Merge pull request #21200 from owncloud/files-authorizationheader
Use Authorization headers for public webdav in web UI
2015-12-17 15:30:13 +01:00
Thomas Müller 38f4407761 Merge pull request #21201 from mmattel/scanFiles_stat_output_II
Statistics output for ./occ files:scan (rework)
2015-12-17 14:43:55 +01:00
Jenkins for ownCloud a7cd8103b5 [tx-robot] updated from transifex 2015-12-17 01:55:09 -05:00
Morris Jobke 89233cab83 add unit test for #21230 2015-12-16 15:03:50 +01:00
Morris Jobke 66c0f4eb59 Use name of ICollection for exception message
* fixes #21230
2015-12-16 14:44:28 +01:00
Jenkins for ownCloud 1d932e4c98 [tx-robot] updated from transifex 2015-12-16 01:55:55 -05:00
martin.mattel@diemattels.at b7e8258d99 Statistics output for ./occ files:scan 2015-12-15 19:05:05 +01:00
C. Montero Luque a376fec984 Merge pull request #21133 from owncloud/fix-shared-files-of-deleted-users
Fix shared files of deleted users, detect DN change when checking for existence on LDAP
2015-12-15 12:14:58 -05:00
Björn Schießle 3ce845e2b1 avoid duplicates on search 2015-12-15 15:40:47 +01:00
Thomas Müller 70e9e31497 Fix last Oracle issue 2015-12-15 14:52:27 +01:00
Thomas Müller e5469a1121 Fix Oracle insert error 2015-12-15 14:52:27 +01:00
Björn Schießle cd55a19034 implement delete, create, update, search, get permissions 2015-12-15 14:52:27 +01:00
Robin Appelman 667d7383e1 clear statcache after fopen for smb 2015-12-15 14:24:02 +01:00
Thomas Müller 1ecda59c24 Merge pull request #21189 from owncloud/fix_21187
File shares can't have create permissions
2015-12-15 13:18:22 +01:00
Thomas Müller 67263ef8b4 Merge pull request #21067 from owncloud/fix_20296
don't allow to create a federated share if source and target are the same
2015-12-15 13:18:04 +01:00
Morris Jobke 7608af6f7d Remove unneeded upgrade code
stable8.2 has version 0.7.0 of the user_ldap app
2015-12-15 09:38:29 +01:00
Arthur Schiwon e39415c946 fix find DN by UUID for AD 2015-12-14 22:42:27 +01:00
Vincent Petry 1d37e7abfc Fixed JS unit tests for fed owner display name 2015-12-14 18:00:35 +01:00
Vincent Petry ab9849e72f Use Authorization headers for public webdav instead of URL
Instead of prepending the token as username in the URL, use the
Authorization header instead. This is because IE9 considers this a
cross-domain call and refuses to do it in the first place.
2015-12-14 17:42:13 +01:00
Björn Schießle c4b65170f2 show display name but internally use the user name 2015-12-14 17:25:10 +01:00
Björn Schießle efc030aa25 don't allow to create a federated share if source and target server are the same 2015-12-14 17:16:14 +01:00
Roeland Jago Douma 843cf906b1 File shares can't have create permissions
fixes #21187
2015-12-14 14:03:14 +01:00
Robin Appelman f27e98a3e2 Migrate files external for the user that the filesystem is being setup for 2015-12-14 13:38:54 +01:00
Vincent Petry 4d9e12b8bc Fix mount type root detection
Since Webdav doesn't contain that information, we need to rely on the
parent folder's mount type to find out whether a child item is a
shared/external root or not.

Fixed the mount type detection logic and added unit test.

Also added a fix that ignores detection if no parent folder exists (ex:
shared file list, favorites, etc)
2015-12-14 10:44:47 +01:00
Jenkins for ownCloud 74de12c698 [tx-robot] updated from transifex 2015-12-13 01:54:51 -05:00
Jenkins for ownCloud f2ac1a80d8 [tx-robot] updated from transifex 2015-12-12 01:55:39 -05:00
Thomas Müller 32525fa977 save wip 2015-12-11 17:39:27 +01:00
Arthur Schiwon 35a2639701 unit test on getHome in combination with OfflineUser 2015-12-11 17:25:57 +01:00
Joas Schilling 7d3e40c065 Add an OCS app for testing instead of using sudo and exec 2015-12-11 16:20:04 +01:00
Thomas Müller aee4887224 Merge pull request #21153 from owncloud/files-deleteactiontext
Bring back file delete action text to be based on context
2015-12-11 16:04:06 +01:00
Vincent Petry baa5a69c55 Bring back file delete action text to be based on context
For received shares, the delete action becomes "Unshare" and for
personal mounts it becomes "Disconnect storage".

This also makes it possible from now on to pass a function to a file
action's "displayName" attribute.
2015-12-11 15:14:30 +01:00
Robin Appelman 5b2957bad1 skip test if we cant use the filesystem when not logged in 2015-12-11 14:29:38 +01:00
Robin Appelman 415cf92784 Fix thrashbin wrapper when no user is loggedin 2015-12-11 14:27:37 +01:00
Arthur Schiwon aedbc0c626 adjust unit test 2015-12-11 12:52:12 +01:00
Thomas Müller f799b27f0e Merge pull request #21144 from owncloud/dav-auth-checkduplicateheader
Properly check X-Requested-With header in case of multiple values
2015-12-11 11:44:43 +01:00
Thomas Müller 6317ba8cb4 Merge pull request #21135 from owncloud/add-polyfill
Add polyfills for PHP55, PHP56 and PHP70 functionalities
2015-12-11 11:40:51 +01:00
Thomas Müller c14f4e8506 Merge pull request #21045 from owncloud/scrutinizer-patch-1
Scrutinizer Auto-Fixes
2015-12-11 11:39:25 +01:00
Vincent Petry 13ec2bda2d Properly check X-Requested-With header in case of multiple values
Saw this happening in IE8...
2015-12-11 11:22:38 +01:00
Lukas Reschke f3360d51c6 Use PHP polyfills 2015-12-11 08:47:36 +01:00
Arthur Schiwon 4020d5b77a look for DN changes before marking a user as deleted 2015-12-11 01:56:53 +01:00
Arthur Schiwon 8c79300156 throw NoUserException in getHome when the requested user does not exist anymore 2015-12-11 00:12:41 +01:00
Thomas Müller 19d1e0ebb9 adjust PHPDoc 2015-12-10 16:43:37 +01:00
Scrutinizer Auto-Fixer ffc49a24f0 Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2015-12-10 16:43:37 +01:00
Vincent Petry 174f7599e5 Catch exception when querying direct download link 2015-12-10 16:17:44 +01:00
Thomas Müller 7094ed05ad Merge pull request #21114 from owncloud/group-propagation-tests
Add test case for group share propagation
2015-12-10 16:16:20 +01:00
Robin Appelman 3d5a7b307f Add test case for group share propagation 2015-12-10 13:53:50 +01:00
Morris Jobke fb87441fd9 Deduplicate version expire jobs
* versionSize is calculated anyway in the expire job - > dropped
* offset/neededSpace was needed for expiry before the file is moved to the versions -> now this is included already in the currently used space because the expiry job is defered to a point in time after the version creation
* fixes #21108
2015-12-10 11:21:28 +01:00
Thomas Müller e5dbddaab8 Merge pull request #21071 from owncloud/fix-swift-unit-test-execution-master
Looks like ceph requires more time to come up ....
2015-12-10 10:59:58 +01:00
Jenkins for ownCloud 078ca149b5 [tx-robot] updated from transifex 2015-12-10 01:55:17 -05:00
Thomas Müller d4a4270adb Merge pull request #21077 from owncloud/external-index-names
Let doctrine generate index names for files_external
2015-12-09 18:22:55 +01:00
Thomas Müller 5cf376ccb7 Looks like ceph requires more time to come up ....
Use sed - not replace

apply btrfs hack
2015-12-09 16:06:25 +01:00
Robin Appelman ce3adb8121 Let doctrine generate index names 2015-12-09 15:38:49 +01:00
Thomas Müller 54dbe5b8d5 Merge pull request #20989 from owncloud/fix_20769
Update parent when moving share into recieved share
2015-12-09 13:07:57 +01:00
Thomas Müller bffd7a1d93 Merge pull request #21059 from owncloud/remove-deaed-code-mount-config
Remove dead code
2015-12-09 13:05:14 +01:00
Thomas Müller 7fb2f7f5fe Merge pull request #21068 from owncloud/fix-exit-code-autotest-external
Fix exit code autotest external
2015-12-09 13:02:25 +01:00
Thomas Müller 4d86466aec Use default timeout on connection test 2015-12-09 12:18:51 +01:00
Thomas Müller 1dfa93367d Merge pull request #20995 from owncloud/fix-18734
ensure multiselect always receives an array when setting its value, f…
2015-12-09 11:27:46 +01:00
Thomas Müller 51b5498be8 Merge pull request #21003 from owncloud/personal-mount-mountid
Dont set the string storage id to the numeric storage id for personal mounts
2015-12-09 10:05:36 +01:00
Thomas Müller bc744ff6de Merge pull request #21038 from owncloud/share-computesharepermissions-notstore
Fix (re)share permission checks in a few code paths
2015-12-09 10:04:56 +01:00
Lukas Reschke 025f021fd4 Remove dead code
Silences two other security warnings, also I cleaned up the PHPDoc a little bit.
2015-12-09 08:18:47 +01:00
Jenkins for ownCloud dda9525c4b [tx-robot] updated from transifex 2015-12-09 01:55:14 -05:00
Robin Appelman 8c1afb8fb9 Add tests 2015-12-08 18:01:44 +01:00
Vincent Petry 28e9bc1156 Fix more unit tests to pass a mock storage instead of null to FileInfo 2015-12-08 16:33:39 +01:00
Thomas Müller 13993c4a6d Merge pull request #21037 from owncloud/fix-irritating-ldap-log-entry
passing an empty base in this diagnosis call will not result  in LDAP…
2015-12-08 16:24:50 +01:00
Thomas Müller 0dd111ca2e Merge pull request #21018 from owncloud/scrutinizer-patch-1
Scrutinizer Auto-Fixes
2015-12-08 14:51:57 +01:00
Thomas Müller 85409b6701 Merge pull request #20786 from owncloud/systemtags-dav
DAV endpoint for system tags
2015-12-08 13:51:25 +01:00
Vincent Petry 6e4006d139 Add reshare permission checks
Added in isSharable() in incoming remote share.
Added in isSharable() in regular incoming share.
Added in FileInfo to make sure the proper attributes are returned to the
clients.
2015-12-08 13:13:26 +01:00
Vincent Petry e241d26316 Compute share permissions in the view
The share permissions are now computed in the View/FileInfo instead of
storing them directly/permanently on the storage
2015-12-08 13:04:22 +01:00
Arthur Schiwon b91c9851a3 passing an empty base in this diagnosis call will not result in LDAP errors
Neither in "Invalid DN syntax" nor in "Object not found"
2015-12-08 12:32:02 +01:00
Lukas Reschke f55a56ff6c Use proper PHPDoc reference 2015-12-08 09:45:20 +01:00
Joas Schilling 5453daab03 More fixes to the docs 2015-12-08 09:11:50 +01:00
Jenkins for ownCloud 736e133c04 [tx-robot] updated from transifex 2015-12-08 01:56:19 -05:00
Scrutinizer Auto-Fixer 0f1be1b601 Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2015-12-07 20:08:20 +00:00
Thomas Müller bec34f1275 Merge pull request #21006 from owncloud/scrutinizer-patch-1
Scrutinizer Auto-Fixes
2015-12-07 17:49:43 +01:00
Thomas Müller 000523a7fe Merge pull request #18212 from ryno83/treat_LDAP_users_not_available_by_user_filter_as_deleted
treat LDAP users not available by user filter as deleted
2015-12-07 17:47:10 +01:00
Thomas Müller 7dd1874188 Merge pull request #20980 from owncloud/UoM-ResPlat-DevOps-swift-improved-fopen
Improving fopen behaviour for Swift backend
2015-12-07 16:50:07 +01:00
Scrutinizer Auto-Fixer 453e1bf66e Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2015-12-07 15:43:36 +00:00
Roeland Jago Douma d38949f423 Update parent when moving share into recieved share
Fixes #20769

When I receive a share and move a share of myself into that share (which
is allowed currently) I effectively hand over ownership of the files I
move. So we need to update the share I move to have as a parent the
share I move it into. Else our mounting system gets confused.
2015-12-07 16:28:33 +01:00
Robin Appelman eec4f82cf0 Dont set the string storage id to the numeric storage id for personal mounts 2015-12-07 16:15:37 +01:00
Arthur Schiwon 952f1f3e60 ensure multiselect always receives an array when setting its value, fixes #18734 2015-12-07 15:14:57 +01:00
Scrutinizer Auto-Fixer 97f9213da9 Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2015-12-07 12:05:27 +00:00
Thomas Müller e44b164f40 Merge pull request #20569 from owncloud/issue_20427
Show external storage status in file list + prompt credentials if different
2015-12-07 10:27:35 +01:00
Thomas Müller 22843fc6e3 Merge pull request #20796 from owncloud/cleanup-trashbin-code
Cleanup trashbin expire code
2015-12-07 10:24:09 +01:00
Thomas Müller 00b592f2a6 Merge pull request #20581 from owncloud/public-page-preview-hidpi-scale
Fix hidpi previews on public page
2015-12-07 10:23:58 +01:00
Thomas Müller f3d49a89fe Merge pull request #11131 from owncloud/use-phpini-wrapper
Replacing ini_get instances with inigetwrapper usages
2015-12-07 10:20:59 +01:00
Tim Dettrick 35ab7f0e64 Improving fopen behaviour for Swift backend 2015-12-07 10:20:09 +01:00
Jenkins for ownCloud d14f128329 [tx-robot] updated from transifex 2015-12-06 01:54:33 -05:00