Commit Graph

12570 Commits

Author SHA1 Message Date
Morris Jobke 43f5d8ab70 Handle return code of streamCopy in WebDAV put
* throw a different exception if streamCopy failed
2016-01-11 12:13:01 +01:00
Robin Appelman 50857e6d7b Add import command for files external 2016-01-11 11:55:00 +01:00
Thomas Müller df2abda814 Merge pull request #21438 from owncloud/settings-anchors
remove unneeded 'goto' prefix from settings anchors
2016-01-11 11:53:40 +01:00
Robin Appelman 94200b682c removed unused imports 2016-01-11 11:40:58 +01:00
Robin Appelman 282f67dad1 improve handling of non existing files in the trashbin 2016-01-11 11:40:58 +01:00
Robin Appelman 8890c88c11 handle not found in trash hook 2016-01-11 11:40:58 +01:00
Robin Appelman 300eb54c87 de-deplicate getUidAndFilename 2016-01-11 11:40:58 +01:00
Thomas Müller 05f9b40419 Merge pull request #21589 from owncloud/mobile-webDAV-select
webDAV select bug fixed
2016-01-11 11:31:33 +01:00
Thomas Müller 2ee39cf4cf Merge pull request #21573 from owncloud/fix_21535_21534
Do not increase filecount in web on file update
2016-01-11 11:22:09 +01:00
Arthur Schiwon 1ed6132899 LDAP: do not attempt to process user records without display name, fixes fatal error 2016-01-11 11:21:02 +01:00
Julian Müller 0249911536 webDAV select bug fixed 2016-01-11 08:41:16 +01:00
Jenkins for ownCloud 77a8085f84 [tx-robot] updated from transifex 2016-01-11 01:55:34 -05:00
Jenkins for ownCloud 580deb09f8 [tx-robot] updated from transifex 2016-01-10 01:55:57 -05:00
Roeland Jago Douma 665d7b25b0 Add unit test for file update 2016-01-09 22:47:26 +01:00
Roeland Jago Douma 86735c6b5a Updating a file should not update the summary 2016-01-09 22:07:34 +01:00
Jenkins for ownCloud 72b34575df [tx-robot] updated from transifex 2016-01-09 01:55:50 -05:00
Roeland Jago Douma 17a066c18e Properly close db cursors 2016-01-08 20:27:01 +01:00
Roeland Jago Douma 629bac22fd Make sure to respect deleted group shares by user 2016-01-08 20:27:01 +01:00
Roeland Jago Douma 066e3770bb Make sure that permissions stay in sync for share_type 2
When a file/folder is shared with a group and one of the group members
moves this file/folder an extra entry is created in the share table.

When the permission of the group share is updated we used to only
sometimes update the shares for individual users.

* Added intergration tests
2016-01-08 20:27:01 +01:00
Thomas Müller d7d0cfc775 Merge pull request #21008 from owncloud/UoM-ResPlat-DevOps-swift-acl-shared-containers
Allowing access to Swift containers shared by ACL
2016-01-08 20:13:13 +01:00
Thomas Müller ea227aadf2 Merge pull request #20961 from owncloud/provis-api-group-special-char
Remove unnecessary group name validation in provisioning_api
2016-01-08 20:11:20 +01:00
Thomas Müller 1f21f0eb73 Merge pull request #21491 from owncloud/webdav_auth_no_basic_auth
Also allow 'only cookie' auth to webdav
2016-01-08 20:09:16 +01:00
Thomas Müller 2659661cb0 Merge pull request #21546 from owncloud/jsunit-stubportinpublicappspec
Fix public page URL JS test
2016-01-08 20:08:01 +01:00
Thomas Müller 977e104cd4 Merge pull request #21553 from owncloud/gwdg-master
Respect user enumeration
2016-01-08 18:21:15 +01:00
Thomas Müller 37265fd094 Merge pull request #21467 from owncloud/external-status-check-userglobal
Fix checking external storage status as non admin user
2016-01-08 18:19:48 +01:00
Thomas Müller 5618e9a8b1 Merge pull request #21468 from owncloud/getmount-id-filter
Filter getStorage to make sure the user has access to it
2016-01-08 18:19:28 +01:00
Thomas Müller 173c1640c0 Merge pull request #21540 from owncloud/group-principals
Adding group principals to new dav endpoint
2016-01-08 18:18:57 +01:00
Thomas Müller 0f281cdd30 Merge pull request #21286 from owncloud/use-owncloud-mail-when-sending-caldav-schedule-mails
Adding IMip scheduling which uses ownClouds mail delivery
2016-01-08 17:58:33 +01:00
Ralph Krimmel 26d0f42dac Respect user enumeration
Respect shareapi_allow_share_dialog_user_enumeration in user_ldap filter
generation function to increase search performance in sharing dialog.
2016-01-08 15:32:31 +01:00
Thomas Müller bb01efdcbd Adding unit tests for SystemPrincipalBackend 2016-01-08 15:31:33 +01:00
Robin Appelman 88bfe1477d Filter getStorage to make sure the user has access to it 2016-01-08 15:30:45 +01:00
Thomas Müller 427dbdabba Merge pull request #21215 from owncloud/files_external-db-set-mountpoint
fix setting mountpoint and auth backend of external storages
2016-01-08 13:36:30 +01:00
Tom Needham 3327857c1a Update log message when error occurs during addGroup 2016-01-08 13:35:00 +01:00
Roeland Jago Douma 1af3bca720 Fix provisioning API unit test 2016-01-08 13:35:00 +01:00
Tom Needham 673a8a1e4a Remove unnecessary group name validation 2016-01-08 13:35:00 +01:00
Vincent Petry 9b595474af Fix public page URL JS test
Stub the port so it doesn't use the one configured by karma
2016-01-08 13:25:38 +01:00
Robin Appelman cb3d3ebf50 set etag and permission fields for trashbin entries 2016-01-08 13:07:23 +01:00
Robin Appelman a696d6c561 Fix checking external storage status as non admin user 2016-01-08 12:42:22 +01:00
Thomas Müller 074a7fd475 Merge pull request #21027 from owncloud/fix-undefined-behaviour
Fix PHPDoc + Add handling for error cases
2016-01-08 12:35:26 +01:00
Thomas Müller 70b58cf367 Merge pull request #17924 from owncloud/ldap-fix-appending-port
ensure an LDAP URL is used, append the port to the host URL when necessary, and just in one place
2016-01-08 12:34:15 +01:00
Thomas Müller b3550db02d Adding IMip scheduling which uses ownClouds mail delivery 2016-01-08 12:21:41 +01:00
Thomas Müller f9c08112da Adding group principals to new dav endpoint 2016-01-08 12:11:02 +01:00
Robin Appelman 68bd003e4b correctly set applicables when updating user storage 2016-01-08 11:54:32 +01:00
Robin Appelman 8da3c3f125 update tests 2016-01-08 11:54:32 +01:00
Robin Appelman 3895ab8451 improve setting applicable for personal mounts 2016-01-08 11:54:31 +01:00
Robin Appelman ab549970ca fix setting mountpoint and auth backend of external storages 2016-01-08 11:54:31 +01:00
Tim Dettrick 8799d5563f Allowing access to Swift containers shared by ACL
To avoid a confusing extra field, the bucket field is overloaded to
optionally take a URL.
2016-01-08 11:42:28 +01:00
Roeland Jago Douma 791c7a6dcc Bump vobject version in carddav unittest 2016-01-08 11:30:28 +01:00
Jenkins for ownCloud 88c4cba1f5 [tx-robot] updated from transifex 2016-01-08 01:56:39 -05:00
Lukas Reschke 0654d37da8 Remove undefined variable 2016-01-07 21:30:44 +01:00
Lukas Reschke 00a01a8de2 Fix PHPDoc + Add handling for error cases
Makes static code analyzers happier.
2016-01-07 21:30:44 +01:00
Thomas Müller 1cc6fddead Merge pull request #21498 from owncloud/cleanup-OC_DB
Cleanup OC_DB methods
2016-01-07 20:13:16 +01:00
Robin McCorkell 430c5df6c4 Fix OAuth external storage auth for step 2
Parameters are only available after the onCompletion promise is run
2016-01-07 16:44:17 +00:00
Thomas Müller 6a796ff3cc Merge pull request #21066 from owncloud/behat_capabilities_changing_server_configuration
Added new capabilities test with changes in server configuration
2016-01-07 17:07:29 +01:00
Thomas Müller 46107f82d4 Merge pull request #21506 from owncloud/issue-20218-min-max-owncloud-version-warning
Issue 20218 min max owncloud version warning
2016-01-07 16:51:00 +01:00
Thomas Müller 629061d00a Merge pull request #21481 from owncloud/ext-smb-dependencies
Check libsmbclient-php as well as smbclient binary
2016-01-07 16:19:20 +01:00
Thomas Müller fddbdbd0e6 Merge pull request #21455 from owncloud/fix-method-signature
Fix method call + undefined variable
2016-01-07 16:18:02 +01:00
Joas Schilling ae285c0654 Remove deprecated shipped flag from info.xml which has no use anymore 2016-01-07 15:15:58 +01:00
Joas Schilling 40f786060e Add ownCloud min and max version for shipped apps 2016-01-07 15:11:49 +01:00
Thomas Müller 601457d221 Merge pull request #20773 from owncloud/share2.0_create
[Sharing 2.0] create share
2016-01-07 14:57:05 +01:00
Morris Jobke 547fbfdb76 Remove OC_DB::dropTable 2016-01-07 14:54:54 +01:00
Thomas Müller 29416b07ac Merge pull request #21359 from owncloud/check-changes
remove mention of 'filesystem_check_changes' => 2 from the config sample
2016-01-07 14:07:38 +01:00
Vincent Petry 9742e9b113 Add token in webdav download link of public page 2016-01-07 13:37:18 +01:00
Lukas Reschke fb12063ae5 Fix method call + undefined variable
1. Variable is not defined
2. Method does not expect any parameters

```
Undefined variable: user at /Users/lukasreschke/Documents/Programming/master/apps/encryption/settings/settings-admin.php#45
```
2016-01-07 13:22:06 +01:00
Roeland Jago Douma 4a38793d11 Allow only cookie auth to webdav 2016-01-07 10:44:26 +01:00
Morris Jobke 06708cc172 fix js unit tests 2016-01-07 08:57:15 +01:00
Robin Appelman dbafec0c28 Also remove it from the web interface 2016-01-07 08:57:15 +01:00
Robin McCorkell fc52327d2c Check libsmbclient-php as well as smbclient binary 2016-01-07 08:56:45 +01:00
Thomas Müller 470bf234c5 Merge pull request #21343 from owncloud/ldap-showremnants-json-output
Add an option to occ ldap:showremnants to output a json encoded array…
2016-01-07 08:45:06 +01:00
Jenkins for ownCloud 27dfa74d89 [tx-robot] updated from transifex 2016-01-07 01:55:48 -05:00
Roeland Jago Douma 26280e1f19 [Sharing 2.0] Add L10N instance to manager for translated errors 2016-01-06 14:53:43 +01:00
Roeland Jago Douma 527b434cd2 [Sharing 2.0] Do not use static function to get numeric storage id 2016-01-06 14:53:43 +01:00
Roeland Jago Douma 0ab227310f [Sharing 2.0] General exceptions return 403
This is the same as the old behaviour
2016-01-06 14:53:43 +01:00
Roeland Jago Douma 38d3a638ed [Share 2.0] Enable share creation via OCS API 2016-01-06 14:53:43 +01:00
Morris Jobke 553a981980 Make LDAP more robust to exceptions and log them properly 2016-01-06 13:46:55 +01:00
Lukas Reschke 88c7face07 Inject OCSClient
Fixes https://github.com/owncloud/core/issues/21451
2016-01-06 11:40:22 +01:00
Jenkins for ownCloud c77917f48c [tx-robot] updated from transifex 2016-01-06 01:55:16 -05:00
Morris Jobke 80e75aae49 Use color instead of transparency for proper tooltip appearance
* fixes #21436
2016-01-05 09:39:24 +01:00
Jenkins for ownCloud d4034ffca0 [tx-robot] updated from transifex 2016-01-05 01:57:14 -05:00
Jan-Christoph Borchardt bfee488c56 remove unneeded 'goto' prefix from settings anchors 2016-01-04 12:59:32 +01:00
Jenkins for ownCloud 157bb50a39 [tx-robot] updated from transifex 2016-01-04 01:55:05 -05:00
Jenkins for ownCloud 970495a067 [tx-robot] updated from transifex 2015-12-31 01:55:16 -05:00
Thomas Müller edd051dc02 Merge pull request #21291 from owncloud/refactor-call-check
Refactor OC_Util::callCheck
2015-12-28 10:21:44 +01:00
Thomas Müller 7693c6d84a Merge pull request #21254 from owncloud/files-uploadcanceliconfix
Correctly render uploadtext indicator only on folders
2015-12-28 10:21:38 +01:00
Thomas Müller 24271cf953 Merge pull request #21216 from owncloud/fopen-statcache
Clear SMB statcache after fopen
2015-12-28 10:21:26 +01:00
Jenkins for ownCloud 89584716f8 [tx-robot] updated from transifex 2015-12-28 01:55:10 -05:00
Jenkins for ownCloud 6fe60569f5 [tx-robot] updated from transifex 2015-12-27 01:54:38 -05:00
Jenkins for ownCloud 33a83a0926 [tx-robot] updated from transifex 2015-12-25 01:55:16 -05:00
Robin Appelman 5f3c462743 Merge pull request #21093 from owncloud/migrate-no-user
Dont break the files_external migrator if no user is logged in
2015-12-24 16:43:28 +01:00
Jenkins for ownCloud 726f7e5fa8 [tx-robot] updated from transifex 2015-12-23 02:02:31 -05:00
Stephen Colebrook 064580a56e Add an option to occ ldap:showremnants to output a json encoded array for use in scripts and other tools. 2015-12-22 16:28:32 -05:00
Vincent Petry ca14277fca Make a modifiable copy of the webdav properties in JS file list
Plugins can extend _getWebdavProperties to add custom properties.
These should not be added to the original properties list, so now the
FileList makes a copy of the array.
2015-12-22 11:17:24 +01:00
Thomas Müller d17c2fb8d9 Merge pull request #21287 from owncloud/travis-dav-caldavtester
Adding integration tests for CalDAV
2015-12-22 10:52:54 +01:00
Morris Jobke 6f00729124 Refactor OC_Util::callCheck 2015-12-22 09:32:14 +01:00
Robin Appelman ef9a231f6c Add error logging to federated sharing handshake 2015-12-21 16:37:54 +01:00
Thomas Müller d3883ca9d4 Adding integration tests for CalDAV 2015-12-21 16:04:27 +01:00
Thomas Müller 38a006b1e8 Merge pull request #21293 from owncloud/restructure-travis-dav-testing
Restructure travis tests
2015-12-21 12:07:21 +01:00
Thomas Müller ac78d248b7 Sleep in carddavtester as well 2015-12-21 11:43:15 +01:00
Thomas Müller 40d796dde9 Merge pull request #21195 from owncloud/test-carddav-sharing-plugin
Fix carddav sharing plugin + adding unit tests
2015-12-21 11:40:03 +01:00
Thomas Müller 0b597c37b3 Restructure travis tests 2015-12-21 11:35:48 +01:00
Jenkins for ownCloud bc25015bf9 [tx-robot] updated from transifex 2015-12-21 01:55:07 -05:00
Jenkins for ownCloud 7080594670 [tx-robot] updated from transifex 2015-12-20 01:55:09 -05:00
Jenkins for ownCloud d0cb4c9ab3 [tx-robot] updated from transifex 2015-12-19 01:55:14 -05:00
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
Daniel Tosello 41f1feaf23 Fixing swift fopen by ensuring stream is a valid resource 2015-12-10 16:40:17 +11:00
Tim Dettrick cb9a4d4cdc Streaming download from Swift external storage
Speeds up downloads as they no longer need to buffer completely on the
ownCloud server before being sent to the client.
2015-12-10 15:55:45 +11: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
Jenkins for ownCloud f0b1ba713d [tx-robot] updated from transifex 2015-12-05 01:55:14 -05:00
Arthur Schiwon 86fcb08745 wizard should also detect protocol errors, as side effect enforces LDAPv3 2015-12-05 00:43:38 +01:00
Arthur Schiwon a32b002cff always use an LDAP URL when connecting to LDAP 2015-12-05 00:09:15 +01: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
Jesús Macias 98f5c50aa4 Migrate storate status code to storagenotavailablexception 2015-12-03 09:59:45 +01:00
Jesús Macias 4ead2bc861 Fix code from PR comments 2015-12-03 09:58:55 +01:00
Jesús Macias 9d1ec02c5a Change exception catch order 2015-12-03 09:58:30 +01:00
Jesús Macias 332c6748f9 Delete unnecessary storage status constans 2015-12-03 09:58:10 +01:00
Jesús Macias 7cd13f462a Add new external storage exceptions for different errors 2015-12-03 09:57:59 +01:00
Jesús Macias b17f26834d Add different storage status codes managed by StoragedNotAvailableException 2015-12-03 09:57:54 +01:00
Thomas Müller 7fefd4f4d9 Merge pull request #20860 from owncloud/use-user-getEMailAddress-all-over-the-place
User IUser::getEMailAddress() all over the place
2015-12-03 09:21:53 +01:00
Thomas Müller 6b4f48e0f3 Merge pull request #20900 from owncloud/share-group-only-with-exact-match
Only return the exact match, when it's allowed
2015-12-03 09:21:29 +01:00
Jenkins for ownCloud 5c178a2719 [tx-robot] updated from transifex 2015-12-03 01:55:12 -05:00
Thomas Müller e1bf50edd2 Merge pull request #20905 from owncloud/allow-framing-itself
Allow framing 'self'
2015-12-02 21:55:12 +01:00
Thomas Müller 09600058d0 Merge pull request #20901 from owncloud/get-rid-of-more-legacy-config-stuff
Replace old config code with usage of proper APIs
2015-12-02 21:54:42 +01:00
Thomas Müller eebe2b9c23 User IUser::getEMailAddress() all over the place 2015-12-02 21:25:05 +01:00
Lukas Reschke 8aaab0dbad Allow framing 'self'
This is required by the pdf viewer, since the files app on master uses the AppFramework it had applied the more strict defaults which made it not work on master.
2015-12-02 17:30:40 +01:00
Thomas Müller df5872ec50 Merge pull request #20719 from owncloud/adding-system-addressbook-of-users
Adding system addressbook for users of this instance - a occ command …
2015-12-02 16:17:58 +01:00
Joas Schilling 372f54075f Only return the exact match, when it's allowed 2015-12-02 16:01:01 +01:00
Morris Jobke 37ecde065b Replace old config code with usage of proper APIs 2015-12-02 15:56:59 +01:00
Thomas Müller 28ceab2f61 Fix endless recursion 2015-12-02 14:44:41 +01:00
Thomas Müller 8d218bf3ef Merge pull request #20875 from owncloud/remove-changepropagator
remove old propagation logic
2015-12-02 13:03:31 +01:00
Thomas Müller f558ac7dd5 Fix update of avatar image 2015-12-02 11:09:15 +01:00
Thomas Müller d4abbb10d3 Merge pull request #20884 from owncloud/fix_20713
Respect disabled incoming federated shares
2015-12-02 10:56:59 +01:00
Thomas Müller 4c695e63c0 Fix comments 2015-12-02 09:20:58 +01:00
Thomas Müller 6abc02cb88 Proposal: add enumeration function to IUserManager which simply calls a callbask for each user in all backends 2015-12-02 09:14:41 +01:00
Thomas Müller 599ba31edc Specify the email type and set name properly 2015-12-02 09:14:41 +01:00
Thomas Müller 906777dc9c Add converter to generate/update a vcard from a given user 2015-12-02 09:14:41 +01:00
Thomas Müller 1e8ad65288 Add system principal to cal of each card 2015-12-02 09:14:41 +01:00
Thomas Müller df6fc6cc70 Add the user's cloud id to the vCard 2015-12-02 09:14:41 +01:00
Thomas Müller 7c8a84e7ac Add user's email address to vCard 2015-12-02 09:14:41 +01:00
Thomas Müller 079ae9b7a9 Update addressbook home configuration for CalDAVTester 2015-12-02 09:14:41 +01:00
Thomas Müller 6a2dde6400 user and system addressbooks are now living in sub folders 2015-12-02 09:14:41 +01:00
Thomas Müller dcfd089a6c Adding a second principal backend which holds system principals - as of now only one principals/system/system 2015-12-02 09:14:41 +01:00
Thomas Müller dad6470baa Add IUser::getAvatarImage() for easy access 2015-12-02 09:14:41 +01:00
Thomas Müller c91192fb73 Adding system addressbook for users of this instance - a occ command is supplied for synchronizing 2015-12-02 09:08:27 +01:00
Roeland Jago Douma 1e19661daa [Sharing] Respect disabled incoming federated shares
Only fetch the incoming federated shares if incoming shares are actually
enabled.

Fixes #20713
2015-12-02 09:00:21 +01:00
Jenkins for ownCloud 4f4b91a9ec [tx-robot] updated from transifex 2015-12-02 02:00:28 -05:00
Robin Appelman 62cc316c6a remove old propagation logic 2015-12-01 16:50:20 +01:00
Thomas Müller 27da63886f Merge pull request #20710 from owncloud/files_external_config_command
Add command to get and set config for external mounts
2015-12-01 15:27:32 +01:00
Robin Appelman 1347e3332b return non 0 status code in case of missing mount 2015-12-01 13:47:56 +01:00
Robin Appelman 2dd0066b0e Add command to set mount options for external storages 2015-12-01 13:47:32 +01:00
Robin Appelman d5ffbc9401 Add command to get and set config for external mounts 2015-12-01 13:47:32 +01:00
Morris Jobke 0655f3d102 Revert "Fix column width of mtime column" 2015-12-01 13:45:30 +01:00
Jesús Macias a79ae4ae08 Delete js unit test. Another issue has been created to create js test 2015-12-01 12:58:01 +01:00
Thomas Müller 634859e6ed Merge pull request #20825 from owncloud/scrutinizer-patch-1
Scrutinizer Auto-Fixes
2015-12-01 09:26:22 +01:00
Jenkins for ownCloud 8421a43df1 [tx-robot] updated from transifex 2015-12-01 01:55:07 -05:00
Thomas Müller d6da0396d0 Adjust patches 2015-11-30 23:00:51 +01:00
Scrutinizer Auto-Fixer dcbd603514 Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2015-11-30 22:50:09 +01:00
Thomas Müller 802f226d8a Merge pull request #20842 from owncloud/fix-date-time-column
Fix column width of mtime column
2015-11-30 22:47:36 +01:00
Thomas Müller 060673a8b3 Merge pull request #20487 from owncloud/activity-oracle-sql-error-for-favorites
Activity oracle sql error for favorites
2015-11-30 22:43:06 +01:00
Thomas Müller 63a87c631b Merge pull request #20843 from owncloud/fix-share-with-input
Fix the width of the share with input
2015-11-30 17:38:27 +01:00
Joas Schilling 23046ca5b7 Inject the database connection 2015-11-30 17:14:47 +01:00
Joas Schilling e9094b8a41 Only require the interface 2015-11-30 17:14:47 +01:00
Joas Schilling 6e0596432c Add a unit test that executes the query 2015-11-30 17:14:47 +01:00
Joas Schilling 2cdec74e8a Correctly escape the paths so we only display favorites instead of wildcards 2015-11-30 17:12:48 +01:00
Joas Schilling 623d34972d Oracle can not return statements but only values
So evaluate the condition directly and return 1 or 0
2015-11-30 17:12:48 +01:00
Thomas Müller b9faba8857 Merge pull request #20837 from owncloud/fix-mountoptions-dropdown
Fix ext storage mount options dropdown
2015-11-30 16:53:26 +01:00
Morris Jobke 00fcb95d86 Fix the width of the share with input
* the ID of this has changed to #shareWith-viewNUMBER and shouldn't
  be used in CSS
* now uses the proper classes
2015-11-30 16:46:51 +01:00
Morris Jobke 11d2d7a1bb Fix column width of mtime column
* in some translations (e.g. german) the header of this column otherwise
  got truncated
  "Zeitpunkt der Freigabe" vs "Zeitpunkt der Freig"
2015-11-30 16:29:15 +01:00
Thomas Müller fd79511d68 Merge pull request #20688 from owncloud/publiclink-getdownloadurl-webdav
Fix public link getDownloadUrl to return Webdav public link
2015-11-30 15:07:36 +01:00
Vincent Petry dc962a1203 Fix ext storage mount options dropdown 2015-11-30 14:59:06 +01:00
Morris Jobke 574d0d08bb Cleanup trashbin expire code
* requested by @schiesbn
2015-11-30 11:54:03 +01:00
Thomas Müller 318e5e2864 More group DB 2015-11-30 10:55:13 +01:00
Thomas Müller f9fc254672 Add DB group to some files_external tests
Adding group Db to federation tests and ldap tests

Add group DB to Test_UrlGenerator

Adding group DB to trashbin and versions tests

Adding group DB to Test_Util_CheckServer for pg
2015-11-30 10:55:10 +01:00
Thomas Müller 757aa45db7 Adding more DB groups to test suits
Adding more DB groups to test suits
2015-11-30 10:55:06 +01:00
Thomas Müller e265e982bf External storage tests require DB as well 2015-11-30 10:55:05 +01:00
Thomas Müller 1480964768 Adding more test suites to group DB 2015-11-30 10:55:05 +01:00
Thomas Müller 58cc3000c6 Prevent redefinition warning of PHPUNIT_RUN 2015-11-30 10:55:05 +01:00
Thomas Müller 3bb6dcea64 Apply DB group annotation ... 2015-11-30 10:55:05 +01:00
Jenkins for ownCloud 5a9b892b2e [tx-robot] updated from transifex 2015-11-30 01:55:24 -05:00
Jenkins for ownCloud 188b72a9f3 [tx-robot] updated from transifex 2015-11-29 01:55:05 -05:00
Lukas Reschke 6614ea91c3 Fix some PHPDocs
Some classes included via `use` did not even exist anymore.
2015-11-28 13:17:34 +01:00
Lukas Reschke 391bc49dab Move files/ajax/scan.php to background job
The background job will now be executed in chunks of 500 users all 10 minutes.
2015-11-28 13:06:53 +01:00
Jenkins for ownCloud d305412a35 [tx-robot] updated from transifex 2015-11-28 01:55:16 -05:00
Thomas Müller c4a79746ea Merge pull request #20799 from owncloud/scrutinizer-patch-1
Scrutinizer Auto-Fixes
2015-11-28 01:16:02 +01:00
Robin Appelman 4c4331982c Merge pull request #20789 from owncloud/scanner-skip-not-available
Skip unavailable storages in scanner
2015-11-27 22:57:47 +01:00
Scrutinizer Auto-Fixer be4c3a8b56 Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2015-11-27 15:32:44 +00:00
Thomas Müller 99c28a6ce6 Merge pull request #20790 from owncloud/deduplicate-trashbin-jobs
Deduplicate queued trashbin expire jobs
2015-11-27 16:04:03 +01:00
Morris Jobke 7aa07bcf1c Deduplicate queued trashbin expire jobs
* fixes #20425
* this removes the argument trashbin size from the expire job - it is now
  calculated in the expire job
* the queue now detects properly that the job is already queue and doesn't
  add it again
2015-11-27 14:40:31 +01:00
Robin Appelman ae71f80f4a Skip unavailable storages in scanner 2015-11-27 14:02:50 +01:00
Thomas Müller 1d30f0fcdb Merge pull request #20760 from owncloud/webdav-authredirectfix
Only reject ajax auth if user is really logged out
2015-11-27 13:16:01 +01:00
Jenkins for ownCloud 39fb320bae [tx-robot] updated from transifex 2015-11-27 01:55:14 -05:00
Vincent Petry d02e0eaaf1 Only reject ajax auth if user is really logged out 2015-11-26 17:04:21 +01:00
Thomas Müller 80c43ffc6c Merge pull request #20702 from owncloud/move-user-principal-into-subfolder
Users are available under it's own principal resource named 'principa…
2015-11-26 16:49:49 +01:00
Renaud Fortier f864b55323 Remove of useless code 2015-11-26 10:00:15 -05:00
Thomas Müller cc8c38e8ba Fix principal collection for CavDAVTester 2015-11-26 12:15:11 +01:00
Thomas Müller ff7d1eb931 Merge pull request #20707 from owncloud/files_external_table_status
Fix status icon styling for external storages
2015-11-26 12:01:53 +01:00
Thomas Müller 5a33390a69 Merge pull request #20731 from owncloud/per-storage-updater
Make Cache\Updater per storage
2015-11-26 12:01:44 +01:00
Jenkins for ownCloud dd18ea611b [tx-robot] updated from transifex 2015-11-26 01:55:22 -05:00
Thomas Müller b799e42b4e Introduce \OCP\IUser::getEMailAddress() 2015-11-25 22:23:34 +01:00
Thomas Müller c25a7cc4da Users are available under it's own principal resource named 'principals/users' this will allow us to introduce e.g. groups as principals (one day) and system specific principals (needed for federation) 2015-11-25 22:23:34 +01:00
Thomas Müller b02dea29e6 CardDavBackEnd requires principalBackend on ctor 2015-11-25 21:14:16 +01:00
Thomas Müller 06c85dd1eb Output owncloud.log to the console 2015-11-25 21:14:15 +01:00
Thomas Müller d28390a649 Adding sync support - including dav tests 2015-11-25 21:14:15 +01:00
Thomas Müller 6b5460f755 Merge pull request #20733 from owncloud/scan-eventsource-no-paths
Dont output paths in scan.php
2015-11-25 20:01:52 +01:00
Vincent Petry 42091cecf9 Fix public link getDownloadUrl to return Webdav public link
This is for apps that use getDownloadUrl() to access the Webdav endpoint
for example for streaming.
Also happens when clicking on the download action of a file.

Note that the regular visible download URL is still the same.
2015-11-25 17:39:49 +01:00
Jan-Christoph Borchardt 38abdc1007 add icon for Federation app 2015-11-25 16:06:36 +01:00
Thomas Müller 7c68be6494 Merge pull request #20712 from owncloud/replace-netcat-php
Replace shitty netcat use with dedicated PHP script
2015-11-25 15:29:09 +01:00
Thomas Müller 9ec2f8886e Merge pull request #20691 from owncloud/share2.0_di_fixes
[Sharing 2.0] di fixes
2015-11-25 15:25:50 +01:00
Robin Appelman 10df0780ea Dont output paths in scan.php 2015-11-25 15:21:01 +01:00
Robin Appelman b025f07fb7 Make Cache\Updater per storage 2015-11-25 14:16:00 +01:00
Thomas Müller 50f6817ce9 Merge pull request #20439 from owncloud/etag-propagate-in-storage
Take submount etag into account for folder etags
2015-11-25 12:49:54 +01:00
Jenkins for ownCloud 6e60c0f0c4 [tx-robot] updated from transifex 2015-11-25 01:55:37 -05:00
Robin McCorkell 125b090627 Replace shitty netcat use with dedicated PHP script 2015-11-24 16:05:08 +00:00
Thomas Müller 89b9f5518b Merge pull request #20636 from owncloud/savre-3.0
sabre/dav 3.0 and related
2015-11-24 16:20:48 +01:00
Thomas Müller 4bb346a1e6 Merge pull request #20692 from owncloud/federation_auto_add_servers
auto-add ownClouds to the list of trusted servers
2015-11-24 16:19:39 +01:00
Thomas Müller 9a8bdeb7fb Remove invalid use statement 2015-11-24 16:19:25 +01:00
Thomas Müller 4978a785fa Merge pull request #18294 from esakol/issue17173
Fix RHDS ldap paged search, Issue #17173
2015-11-24 16:04:23 +01:00
Thomas Müller 6ce6e27560 Merge pull request #20595 from owncloud/fix-double-slashes
Avoid double slashes in URL when trying to add an remote share
2015-11-24 16:04:03 +01:00
Thomas Müller 9385eef31a Merge pull request #18999 from owncloud/ext-config-listadmin
Improvements to external storages list rendering
2015-11-24 16:03:35 +01:00
Thomas Müller ae36c01b95 Adjust sabre changes in core 2015-11-24 15:11:54 +01:00
Robin Appelman d316802fcf Fix status icon styling for external storages 2015-11-24 13:57:12 +01:00
Robin Appelman 95f2e15f83 Merge pull request #20574 from owncloud/files_external_list_command
Add files_external:list command to list configured external storages
2015-11-24 13:34:59 +01:00
Björn Schießle 9546b21d7e always store server url without a trailing slash 2015-11-24 13:15:55 +01:00
Jesús Macias 70071c8865 Fix css selector and bug checking personal mounts status 2015-11-24 11:55:33 +01:00
Björn Schießle 964fa1fce3 use hooks to auto add server to the list of trusted servers once a federated share was created 2015-11-24 11:34:38 +01:00
Roeland Jago Douma 8d309767d7 [Sharing 2.0] Use the rootfolder to get the path of a share
We need to use the rootfolder here since we also other people than the
shareOwner can request a share.
2015-11-24 10:26:36 +01:00
Roeland Jago Douma 85976b7293 [Sharing 2.0] Fix phpdoc etc 2015-11-24 10:26:36 +01:00
Roeland Jago Douma ab02b5c36e [Sharing 2.0] Move authentication to the OCS API 2015-11-24 10:26:36 +01:00
Roeland Jago Douma a2b8483779 [Sharing 2.0] Default share provider only generic DI
No injection of userfolders etc. Only generic DI components
(IRootFolder) etc should be used to make sure we can also run this from
the cli
2015-11-24 10:26:36 +01:00
Roeland Jago Douma aeae73b364 [Sharing 2.0] Removed unused DI stuff
The share manager etc should not care about filtering stuff. They should
return what is asked for them.
2015-11-24 10:26:36 +01:00
Jesús Macias 674bc8e9cb Add css to manage row status color 2015-11-24 08:52:02 +01:00
Jesús Macias e4a2da6c3d Merge branch 'issue_20427' of github.com:owncloud/core into issue_20427 2015-11-24 08:16:49 +01:00
Jesús Macias 5580b562a3 Fix code from PR comments 2015-11-24 08:16:14 +01:00
Jenkins for ownCloud cb69e6c201 [tx-robot] updated from transifex 2015-11-24 01:56:32 -05:00
Thomas Müller 7062e6636d Merge pull request #20684 from owncloud/more-time
webdav docker tests - wait at least 5 seconds after the full startup
2015-11-23 15:35:51 +01:00
Morris Jobke 4608e7134c webdav docker tests - wait at least 5 seconds after the full startup 2015-11-23 14:49:01 +01:00
Clark Tomlinson 9caf4ffbfc Replacing ini_get instances with inigetwrapper usages 2015-11-23 14:12:31 +01:00
Thomas Müller 7e9cf00e34 Merge pull request #20609 from owncloud/dav-donotauththroughajax
Do not authenticate over ajax Webdav
2015-11-23 13:33:08 +01:00
Robin Appelman 74dfc604d1 language fixes 2015-11-23 13:08:53 +01:00
Robin Appelman ff72eac927 truncate long values on default 2015-11-23 12:29:20 +01:00
Robin Appelman 0795f7d71b hide passwords and secrets on default 2015-11-23 12:24:24 +01:00
Robin Appelman 909b31ea58 use common --output option 2015-11-23 11:36:20 +01:00
Robin Appelman f5cdd27b22 Add files_external:list command to list configured external storages 2015-11-23 11:31:40 +01:00
Thomas Müller bf672d7e51 Merge pull request #20222 from owncloud/federated_sharing_auto_complete
federated sharing auto-complete, first step
2015-11-23 10:42:14 +01:00
Vincent Petry 055d58bfc3 Do not authenticate over ajax
This makes sure that whenever a Webdav call is done through Ajax, if the
session has expired, it will not send back a challenge but a simple 401
response. Without this fix, the default code would send back a challenge
and trigger the browser's basic auth dialog.
2015-11-23 09:44:30 +01:00
Thomas Müller 79bbda994b Merge pull request #16902 from owncloud/jsocclient
Web UI uses Webdav instead of ajax/* calls
2015-11-23 09:38:01 +01:00
Thomas Müller 57c9aa3ca7 Merge pull request #20558 from owncloud/remove-path-from-shared-with
Unset `path` for shared with me
2015-11-23 09:04:52 +01:00
Thomas Müller a32b861f18 Merge pull request #20649 from owncloud/scrutinizer-patch-1
Scrutinizer Auto-Fixes
2015-11-23 08:35:26 +01:00
Jenkins for ownCloud 56e05a90af [tx-robot] updated from transifex 2015-11-23 01:54:53 -05:00
Robin McCorkell 08839ce77d Defer initialisation of data until after complete construction 2015-11-22 17:25:32 +00:00
Vincent Petry 418fefc93c Update app version for Webdav impl of files GUI
This will make sure the cached JS gets properly updated.
Also, since this is a bigger change it also qualifies for a version
increase :-)
2015-11-22 16:05:52 +01:00
Vincent Petry ce897f80e6 Send download token as cookie to tell the UI that it started
This used to be done in the ajax download code. Now that single file
downloads are going through Webdav, the token handling needs to be done
here too.
2015-11-22 16:05:51 +01:00
Vincent Petry d3383adb71 Fix issue when renaming creates a separate entry 2015-11-22 16:05:51 +01:00
Vincent Petry ec3166742b Properly join path sections
This prevents double slashes that can mess up path comparisons in some
cases.
2015-11-22 16:05:51 +01:00
Thomas Müller ab1d786d87 Fix port issue - options.host already has the port attached 2015-11-22 16:05:51 +01:00
Thomas Müller 240ae46265 Fix js file load order 2015-11-22 16:05:51 +01:00
Vincent Petry 21da6271a8 Parse share owner from Webdav to display in UI 2015-11-22 16:05:50 +01:00
Vincent Petry dc8ce87a26 Query tags/favorite through Webdav in file list 2015-11-22 16:05:50 +01:00
Vincent Petry f20232d4bd Make public link share page work with Webdav and add operations
The public page now uses the public.php/webdav endpoint.

Also enabled more file operations like rename, move, delete and create
folder from the public page, which are now all possible thanks to the
public.php/webdav endpoint.
2015-11-22 16:05:50 +01:00
Vincent Petry fa2be0750c Make files app use Webdav for most operations 2015-11-22 16:05:50 +01:00
Jenkins for ownCloud 2321cc4854 [tx-robot] updated from transifex 2015-11-22 01:54:53 -05:00
Robin McCorkell ee7128b435 Clear highlight on RSA public key generation 2015-11-21 22:54:21 +00:00
Robin McCorkell c5966ed21b Only set value if it exists in the StorageConfig 2015-11-21 22:54:21 +00:00
Robin McCorkell be8afc2c12 Reset mountpoint input field when creating new mount 2015-11-21 22:54:21 +00:00
Robin McCorkell 6a2e7632d1 Fix JS unit tests 2015-11-21 22:54:21 +00:00
Robin McCorkell 8f4b780a90 Fix external storage priority logic 2015-11-21 22:54:21 +00:00
Robin McCorkell 2efffb810d Load applicable users/groups correctly 2015-11-21 22:54:21 +00:00
Robin McCorkell 28876bf463 Display applicable global storages in personal mount list 2015-11-21 22:54:21 +00:00
Robin McCorkell a1704c8623 Render external storages list in JS 2015-11-21 22:54:21 +00:00
Jenkins for ownCloud eb42340fa3 [tx-robot] updated from transifex 2015-11-21 01:54:59 -05:00
Scrutinizer Auto-Fixer 5573029485 Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2015-11-20 15:42:34 +00:00
Vincent Petry 5b9a693fbc Added some unit tests for the status manager 2015-11-20 16:00:16 +01:00
Björn Schießle a63a1043b6 unit tests 2015-11-20 15:48:20 +01:00
Robin Appelman 90ff4641e7 dont die if the external storage backend doesn't exist 2015-11-20 15:23:09 +01:00
Thomas Müller 308aaf89cd Merge pull request #14077 from owncloud/autotest-external-swift
[files_external] swift tests
2015-11-20 13:57:54 +01:00
Jesús Macias 31cfd43e8a Adding logic to show custom icon for current backends, waiting for icon files 2015-11-20 08:42:31 +01:00
Jenkins for ownCloud 764504de19 [tx-robot] updated from transifex 2015-11-20 01:55:32 -05:00
Thomas Müller f6446a64b6 fixing OCI and others 2015-11-19 18:07:39 +01:00
Björn Schießle 6f7aa3392f make sure that both server don't try to exchange the shared secret in parallel 2015-11-19 18:07:33 +01:00
Björn Schießle 2754afc074 add option to auto add servers to the list of trusted servers once a federated share was created and accepted successfully 2015-11-19 18:07:25 +01:00
Björn Schießle 8f55b1a27d add status to server list 2015-11-19 18:07:17 +01:00
Björn Schießle 698100d279 exchange shared secret 2015-11-19 18:06:51 +01:00
Björn Schießle ed039ee5eb added app "federation", allows you to connect ownClouds and exchange user lists 2015-11-19 18:06:38 +01:00
Robin Appelman 17f0fc78ee Fix image sizing for action icons in Edge 2015-11-19 17:50:20 +01:00
Thomas Müller fd28bda3d9 Merge pull request #20611 from owncloud/files-newmenuremovetextfile
Remove "Text file" entry in the "+" menu
2015-11-19 16:58:27 +01:00
Vincent Petry 8fc0e05564 Remove "Text file" entry in the "+" menu
The text editor app will register this instead.

Also made "fileList" a non-private attribute to make it possible for
plugins to access the attached file list object.
2015-11-19 15:36:21 +01:00
Robin Appelman a95d4c2b22 update tests 2015-11-19 13:32:04 +01:00
Robin Appelman 888df3933d take the etag of child mounts into account for the folder etag
this replaces shared etag propagation
2015-11-19 13:32:00 +01:00
Thomas Müller bcc486ffdc Adding an existing sharee is idempotent 2015-11-19 11:34:59 +01:00
Thomas Müller 0f434e0b9b Implement CSRF protection 2015-11-19 11:34:59 +01:00
Thomas Müller 4eb15885c9 Addressbook sharing added based on a simplified approach which is based on calendar sharing standard 2015-11-19 11:34:31 +01:00
Thomas Müller 3869db1290 Merge pull request #20537 from owncloud/add-internal-locking-to-new-webdav-endpoint
Add internal locking plugin
2015-11-19 10:55:07 +01:00
Thomas Müller 3cac07bedb Merge pull request #20594 from owncloud/use-proper-variable
Use proper variable
2015-11-19 10:41:14 +01:00
Jenkins for ownCloud c10be07c1b [tx-robot] updated from transifex 2015-11-19 01:55:13 -05:00
blizzz 5d2e1268cd Avoid double slashes in URL when trying to add an remote share
When being on a link share and clicking "Add to your ownCloud" a double slash might be inserted in the URL if the entered ownCloud host ended with a slash. Results in a server error.
2015-11-18 22:48:35 +01:00
Lukas Reschke 048ad25416 Use proper variable
`$shares` is not defined. Introduced with c3e7d324c5 and thus also in stable8.2
2015-11-18 22:28:48 +01:00
Robin Appelman da5285dc23 Merge pull request #20584 from owncloud/fileinfo-owner-external-share
Fix getOwner for external shares
2015-11-18 21:49:10 +01:00
Jesús Macias ae061bcbed Fix code from PR comments 2015-11-18 18:34:26 +01:00
Robin Appelman 1d82d93baa Implement getOwner for external share storage 2015-11-18 17:08:02 +01:00
Robin Appelman ee87f12c09 Fix hidpi previews on public page 2015-11-18 16:45:19 +01:00
Thomas Müller d8b73fde1a Merge pull request #20371 from owncloud/add-caldav-2
Introducing CalDAV into core
2015-11-18 16:32:19 +01:00
Jesús Macias fab13b7ca5 Add method to show custom icon and icon-error for each storage backend 2015-11-18 12:12:32 +01:00
Vincent Petry 978303e03e Add internal fileid to webdav response
Introduce a new property "oc:fileid" to return the internal file id.

This is because the original "oc:id" property is a compound and it is
not possible to extract the real id without knowing the instance id. The
instance id is not available to external clients.
2015-11-18 11:41:04 +01:00
Thomas Müller aba119951e Merge pull request #20494 from owncloud/storage-forbidden-exception
Allow storage wrappers to through a forbidden exception with retry information for clients
2015-11-18 09:13:45 +01:00
Thomas Müller 11f123c7d8 Merge pull request #20546 from owncloud/provision_api_fix
[provisioning api] Return empty list if group does not have subadmins
2015-11-18 09:13:13 +01:00
Jenkins for ownCloud cd4380c322 [tx-robot] updated from transifex 2015-11-18 01:55:08 -05:00
Lukas Reschke cbd94ce355 Unset `path` for shared with me
The original path is not required for a share recipient.
2015-11-17 14:09:29 +01:00
Thomas Müller 20c251a575 Merge pull request #20188 from owncloud/webdav-exposeshareowner
Expose share owner id and display name via files webdav
2015-11-17 13:40:25 +01:00
Joas Schilling e2cfcd992c Allow storage wrappers to through a forbidden exception with retry information 2015-11-17 10:39:52 +01:00
Roeland Jago Douma 6dcaac7e2c Return empty list if group does not have subadmins
Instead of throwing an error just return an empty list. Since that is
actually what it is.

Fixes #19789
2015-11-16 22:24:53 +01:00
Robin Appelman d49fc9a5fc fix ip detection for swift-ceph 2015-11-16 21:52:31 +01:00
Lukas Reschke daa388ce8d Move index.php from files to AppFramework
1. Allows it to use the more secure CSP rules of the AppFramework.
2. Adds some unit tests.
2015-11-16 21:10:11 +01:00
Thomas Müller e4568234a5 Use uri as displayname 2015-11-16 21:01:27 +01:00
Thomas Müller 5ec64c4fd7 Merge pull request #20292 from owncloud/provisioning_api_group_unittest
Moved grouptest over to pure unit tests
2015-11-16 18:00:03 +01:00
Thomas Müller a0b649442c components was not written to the database 2015-11-16 17:57:39 +01:00
Thomas Müller fc296aad5d Add occ command to create a new calendar 2015-11-16 16:29:01 +01:00
Robin Appelman cfc2d0b8fe Merge pull request #20534 from owncloud/sftp-parse-host
Fix parsing of sftp hosts when using ipv6
2015-11-16 16:14:06 +01:00
Thomas Müller 5fc414abfd Add internal locking plugin - fixes #20502 2015-11-16 16:09:04 +01:00
Thomas Müller 867fd94dc6 Add scheduling backend 2015-11-16 15:49:46 +01:00
Vincent Petry d62f410f92 Add "owner-id" and "owner-display-name" Webdav properties 2015-11-16 15:31:41 +01:00
Thomas Müller 23e7a62717 Fix Oracle 2015-11-16 15:28:34 +01:00
Thomas Müller 28ed2d8072 Merge pull request #20447 from owncloud/heading-styles
standardize sizes for headings
2015-11-16 15:01:00 +01:00
Thomas Müller 2cb94cd4eb Merge pull request #20356 from owncloud/share2.0_getShare
[Share2.0] OCS Share API getShare uses new code
2015-11-16 15:00:30 +01:00
Thomas Müller 10d2b68f8f Merge pull request #18605 from owncloud/api-adduser-for-subadmins
enable api addUser for subadmins
2015-11-16 14:57:27 +01:00
Robin Appelman 67710e62fa Fix parsing of sftp hosts when using ipv6 2015-11-16 14:56:03 +01:00
Jan-Christoph Borchardt 5b72d9026f standardize sizes for headings 2015-11-16 14:42:10 +01:00
Roeland Jago Douma 61425b7621 Moved grouptest over to pure unit tests 2015-11-16 14:40:01 +01:00
Roeland Jago Douma 1e9fc33212 [Share2.0] OCS Share API getShare uses new code 2015-11-16 13:32:28 +01:00
Thomas Müller 2b13c5db0f Introducing CalDAV into core 2015-11-16 13:24:50 +01:00
Thomas Müller 5e3d29b661 Merge pull request #20505 from owncloud/fakelocking-for-mac
Add fake locker plugin for WebDAVFS
2015-11-16 13:15:40 +01:00
Jenkins for ownCloud ae58409f22 [tx-robot] updated from transifex 2015-11-16 01:54:50 -05:00
Jenkins for ownCloud 19d0884b56 [tx-robot] updated from transifex 2015-11-15 01:55:08 -05:00
Jenkins for ownCloud 1b409228ab [tx-robot] updated from transifex 2015-11-14 01:55:13 -05:00
Lukas Reschke a3fc40921b Add fake locker plugin for WebDAVFS
WebDAVFS as used by Finder requires a Class 2 compatible WebDAV server. This change introduces a fake locking provider which will simply advertise Locking support when a request originates from WebDAVFS. It will also return successful LOCK and UNLOCK responses.
2015-11-13 23:31:08 +01:00
Jesús Macias a413f8eccc Add icon management capabilities (error icon) 2015-11-13 12:57:33 +01:00
Jenkins for ownCloud 1e9203cdef [tx-robot] updated from transifex 2015-11-13 01:57:12 -05:00
Roeland Jago Douma fc1f0233ff Added unit test for new functionality 2015-11-12 22:31:17 +01:00
michag86 3b88c469c7 enable api addUser for subadmins
* Fix existing unit tests
2015-11-12 22:31:17 +01:00
Thomas Müller 3fb440ecf3 Merge pull request #20469 from seal20/seal20-fix-one-string-in-user_ldap
changed 1.000 to 1,000
2015-11-12 13:48:55 +01:00
Jesús Macias 394d3eb0cd First working approach to show mount status 2015-11-12 13:40:28 +01:00
Thomas Müller e967d88dd7 Merge pull request #20460 from owncloud/file-handling-wording
fix layout and wording for file handling admin setting
2015-11-12 11:31:39 +01:00
Jenkins for ownCloud 9145aa607a [tx-robot] updated from transifex 2015-11-12 01:55:09 -05:00
sylvain ff17deecd2 changed 1.000 to 1,000
The string "More than 1,000 directory entries available." would mean only 1 entry, in english it should be 1,000 . Found it while translating
2015-11-12 15:39:57 +09:00
Jan-Christoph Borchardt 0de225e6a6 fix layout and wording for file handling admin setting 2015-11-11 16:45:40 +01:00
Jenkins for ownCloud 5dd59b4bd2 [tx-robot] updated from transifex 2015-11-11 01:55:47 -05:00
C. Montero Luque 98d3111c2d Merge pull request #20124 from owncloud/postscriptum-20093
remove uselessly used parameter, read all user attributes also when l…
2015-11-10 18:54:28 +01:00
Thomas Müller e4900c6c4c Merge pull request #20195 from owncloud/add-caldavtester
Add CalDAVTester to travis
2015-11-10 16:11:49 +01:00
Robin Appelman bbe2f5c2d5 Merge pull request #20224 from owncloud/fileinfo-owner
Add getOwner to FileInfo
2015-11-10 14:36:15 +01:00
Thomas Müller f77c6dbbed Merge pull request #20431 from owncloud/carddav-enforce-displayname
When creating addressbooks, make sure the displayname is set
2015-11-10 14:32:39 +01:00
Thomas Müller d7232557d9 Merge pull request #20422 from owncloud/fix-20421-master
Ensure the user folder exists
2015-11-10 11:58:33 +01:00
Arthur Schiwon 06d1685e75 When creating addressbooks, make sure the displayname is set 2015-11-10 11:41:27 +01:00
Thomas Müller bdd396aa3d Merge pull request #20415 from owncloud/fix-addressbook-home-set
Adding CardDAV plugin to provide addressbook-home-set property
2015-11-10 11:27:52 +01:00
Robin Appelman 20cad09f7f Add tests for FileInfo owner 2015-11-10 11:06:48 +01:00
Thomas Müller a394c1887f Ensure the user folder exists 2015-11-10 10:07:46 +01:00
Thomas Müller af94c880b3 Add CalDAVTester to travis 2015-11-10 09:48:05 +01:00
Jenkins for ownCloud f09db6451e [tx-robot] updated from transifex 2015-11-10 01:55:11 -05:00
Thomas Müller e0f2b86177 Adding CardDAV plugin to provide addressbook-home-set property 2015-11-10 07:27:34 +01:00
Thomas Müller baacb2cd30 Merge pull request #20333 from owncloud/fix-18956
[LDAP Wizard] make all the buttons beautiful
2015-11-10 00:27:54 +01:00
Mario Kolling 46a8eab772 Fix RHDS ldap paged search, Issue #17173
Change-Id: Ic804ea95401a9b49cb2b0866af722aa0d3ee58c5
2015-11-09 10:27:45 -02:00
Thomas Müller 836173289f Register DAVACL plugin to provide current-user-principal 2015-11-09 13:27:19 +01:00
Thomas Müller 77335ca403 Merge pull request #20360 from owncloud/extstorage-gdrive-forceapproval
Force approval in GDrive oauth to get refresh_token
2015-11-09 11:11:13 +01:00
Jenkins for ownCloud 113f9f80f3 [tx-robot] updated from transifex 2015-11-09 01:55:05 -05:00
Jenkins for ownCloud f8637b6082 [tx-robot] updated from transifex 2015-11-08 01:55:13 -05:00
Jenkins for ownCloud 49122e66dd [tx-robot] updated from transifex 2015-11-07 01:55:11 -05:00
Thomas Müller 71b8916f0f adding individual phpunit.xml and bootstrap.php 2015-11-06 19:11:29 +01:00
Thomas Müller 20e37bd38f Adding occ command to create an addressbook 2015-11-06 15:26:51 +01:00
Thomas Müller d8e965e59a Introducing CardDAV into core 2015-11-06 15:26:51 +01:00
Arthur Schiwon 133e3fe89d remove uselessly used parameter, read all user attributes also when looking up users in groups 2015-11-06 15:21:56 +01:00
Vincent Petry 26b01c7fff Force approval in GDrive oauth to get refresh_token
Forcing the approval of app permissions makes sure that the GDrive API
will always return a refresh_token.

In the case of apps that were already authorized for the current user/domain,
the API doesn't return the refresh_token which causes expiration issues.
2015-11-06 13:56:37 +01:00
Thomas Müller 75ff6c34ca Merge pull request #20358 from owncloud/extstorage-properlythrowexception
Properly throw exception in OC_Mount_Config::getBackendStatus
2015-11-06 13:36:26 +01:00
Vincent Petry 51d7527595 Properly throw exception in OC_Mount_Config::getBackendStatus 2015-11-06 12:29:24 +01:00
Thomas Müller dc96aa3849 Merge pull request #20340 from owncloud/fix-ocs-error-code
Revert OCS error code change from #20135
2015-11-06 11:56:34 +01:00
Thomas Müller bf941032a3 Merge pull request #20271 from owncloud/fix-18701
LDAP: attempt to connect to backup server again, if main server is no…
2015-11-06 10:01:06 +01:00
Jenkins for ownCloud f2b19333b9 [tx-robot] updated from transifex 2015-11-06 01:55:09 -05:00
Joas Schilling 960c9f386d Revert OCS error code change from #20135 2015-11-05 17:01:47 +01:00
Arthur Schiwon d9d8f7e569 make all the buttons beautiful 2015-11-05 16:32:07 +01:00
Roeland Jago Douma 0c566698a1 Use the old code for remote shares for now 2015-11-05 15:59:09 +01:00
Roeland Jago Douma 6624fa212a The new sharing code now handles deletion
OCS -> ShareManager -> DefaultShareProvider
2015-11-05 15:59:09 +01:00
Roeland Jago Douma 8b5179459a Prepare OCS Share endpoint 2015-11-05 15:59:09 +01:00
Thomas Müller 8bffc84766 Merge pull request #20301 from owncloud/fix-files_external-empty-user-mounting
[files_external] fix empty user mounts setting
2015-11-05 11:36:36 +01:00
Jenkins for ownCloud 2f4fa5b49c [tx-robot] updated from transifex 2015-11-05 01:55:14 -05:00
Thomas Müller ba02a3771b Merge pull request #20053 from owncloud/getfileinfo-locking
Don't lock if we're only reading cache metadata
2015-11-04 22:40:17 +01:00
Morris Jobke 2a35ecb9ba [files_external] fix empty user mounts setting
* fixes #19858
* if no backend is allowed to be mounted also the user mount setting should be disabled
2015-11-04 15:47:03 +01:00
Arthur Schiwon 8eeaf11d41 add port to host only, if an URL is used instead of a plain hostname 2015-11-04 12:34:30 +01:00
Arthur Schiwon 253e4bcf63 integration tests 2015-11-04 12:26:21 +01:00
Thomas Müller ed0da94d3b Merge pull request #20272 from owncloud/phil-davis-setEncryptHomeStorage
Correct the description of function setEncryptHomeStorage
2015-11-04 10:27:54 +01:00
Jenkins for ownCloud 7fe047425f [tx-robot] updated from transifex 2015-11-04 01:55:44 -05:00
Robin Appelman 0397871f7e Split checkUpdate 2015-11-03 18:23:22 +01:00
Phil Davis 46261b5ff1 Correct the description of function setEncryptHomeStorage 2015-11-03 22:47:55 +05:45
Arthur Schiwon 6b866fa917 LDAP: attempt to connect to backup server again, if main server is not available. Fixes #18701 2015-11-03 17:17:00 +01:00