Commit Graph

11947 Commits

Author SHA1 Message Date
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
Jenkins for ownCloud f0b1ba713d [tx-robot] updated from transifex 2015-12-05 01:55:14 -05:00
Vincent Petry 316b907a13 Fixed system tags DAV and API and docs 2015-12-04 17:30:50 +01:00
Robin Appelman a1898dc2bf db config backend for files_external 2015-12-04 13:48:21 +01:00
Thomas Müller 6af858c41b Delete no longer existing users from system addressbook 2015-12-04 11:51:45 +01:00
Thomas Müller 6034c9142d Merge pull request #20933 from owncloud/more-OC_Config-cleanups
More cleanups of OC_Config usage
2015-12-04 09:06:47 +01:00
Thomas Müller 561ca002ae Merge pull request #20931 from owncloud/dav-fixnamespaceoutput
Fix namespace XML output of files and tags dav
2015-12-04 08:31:21 +01:00
Jenkins for ownCloud a2848af625 [tx-robot] updated from transifex 2015-12-04 01:56:31 -05:00
Thomas Müller 2ceae43989 Merge pull request #20545 from owncloud/scan-storage-in-background-job
Move files/ajax/scan.php to background job
2015-12-03 16:53:46 +01:00
Morris Jobke c60c793cf2 More cleanups of OC_Config usage 2015-12-03 16:41:23 +01:00
Vincent Petry acdd106a24 Fix namespace XML output of files and tags dav 2015-12-03 15:55:10 +01:00
Vincent Petry fe95fd5bec Unit test for system tags plugin 2015-12-03 15:23:21 +01:00
Thomas Müller 502e454a69 Fix PHPDoc ... 2015-12-03 15:23:21 +01:00
Vincent Petry cc72c6a30d Added dav endpoints for system tags 2015-12-03 15:23:21 +01:00
Jesus Macias Portela dcfbbe4737 Merge branch 'master' into issue_20427 2015-12-03 12:35:49 +01:00
Jesús Macias f4f53e328d Fix duplicate use in storage controller 2015-12-03 10:00:01 +01:00