Commit Graph

12218 Commits

Author SHA1 Message Date
Roeland Jago Douma 172f6cd714 Fix carddav unit tests 2016-01-13 15:00:05 +01:00
Erik Pellikka ace66057f2 Fixed issue #21452
removed whitespace

removed whitespace

Changed it based on PVince81's suggestion
2016-01-13 14:47:00 +01:00
Roeland Jago Douma 4a3b6da183 Fix mock call to download
We can only mock public and protected functions in phpunit.
2016-01-13 12:27:48 +01:00
Thomas Müller 4cff03f56b Add missing dispatcher 2016-01-13 12:18:46 +01:00
Thomas Müller f0c869d22e Merge pull request #21662 from owncloud/external-list-non-admin
Allow non admins to list their own mounts
2016-01-13 11:01:27 +01:00
Thomas Müller cddc1ae9cb Merge pull request #21655 from owncloud/remove-listener-plugin
Remove the listener dav plugin
2016-01-13 10:39:27 +01:00
Thomas Müller 7a569a0915 Merge pull request #21392 from owncloud/files_external-import
Add import command for files external
2016-01-13 10:35:10 +01:00
Thomas Müller e0aa6e01ab Merge pull request #21612 from owncloud/fix_21598
fix public link sharing if the master key is enabled
2016-01-13 10:34:48 +01:00
Thomas Müller a5e46226ef Merge pull request #21615 from owncloud/shared-islocal
implement isLocal for shared storage
2016-01-13 10:34:23 +01:00
Thomas Müller 1e0ea46e9e Merge pull request #21620 from owncloud/fix-wrong-classname-in-phpdoc
fix wrong class name in phpdoc
2016-01-13 10:34:07 +01:00
Thomas Müller 5565b19382 Merge pull request #21648 from owncloud/smb-statcache-cap
cap the number of entries we cache in smb's statcache
2016-01-13 10:33:43 +01:00
Joas Schilling 3bdcfef395 Remove the listener plugin 2016-01-13 10:33:08 +01:00
Thomas Müller a11f6093b7 Merge pull request #21663 from owncloud/occ-external-mountpoint
allow setting mountpoint with occ files_external:config
2016-01-13 10:30:17 +01:00
Thomas Müller c5a200c419 Merge pull request #21653 from owncloud/update-license-headers-2016
Update license headers 2016
2016-01-13 08:29:42 +01:00
Thomas Müller 59e9b93be6 Merge pull request #20948 from owncloud/fed-sync-contacts
Syncing system addressbooks across federated ownClouds
2016-01-13 08:27:51 +01:00
Jenkins for ownCloud eb90fa78ad [tx-robot] updated from transifex 2016-01-13 01:55:56 -05:00
Robin Appelman b1a706999f Allow non admins to list their own mounts 2016-01-12 17:46:53 +01:00
Robin Appelman 1861dda313 allow setting mountpoint with occ files_external:config 2016-01-12 17:34:22 +01:00
Thomas Müller 682821c71e Happy new year! 2016-01-12 15:02:18 +01:00
Thomas Müller eac5d9fb3a Merge pull request #21336 from owncloud/system-root-certs
Allow admins to add system wide root certificates
2016-01-12 15:01:46 +01:00
Thomas Müller bf1a2f28c2 Reuse backend as provided by the app container 2016-01-12 14:27:50 +01:00
Thomas Müller 23a8c93fd2 Fix ctor call 2016-01-12 14:24:47 +01:00
Björn Schießle e7a8be2588 fix doc-block 2016-01-12 14:24:47 +01:00
Björn Schießle fa561071d2 create urls in a way that sabredav handles it correctly 2016-01-12 14:24:47 +01:00
Thomas Müller 94856cb892 Catch exceptions during sync 2016-01-12 14:24:47 +01:00
Thomas Müller ca8c9f6ad5 federation has to be of type filesystem so that we load this app for webdav requests 2016-01-12 14:24:47 +01:00
Thomas Müller 693617d8a5 Inject DbHandler .... 2016-01-12 14:24:47 +01:00
Thomas Müller 6d223df2f4 md5 -> sha1 2016-01-12 14:24:47 +01:00
Thomas Müller 06dac9726e Address comments 2016-01-12 14:24:47 +01:00
Thomas Müller 451ab84d11 Adding unit tests for the sync service 2016-01-12 14:24:47 +01:00
Thomas Müller 1a20af253b Adding tests and adjust PHPDoc 2016-01-12 14:24:47 +01:00
Thomas Müller 0bf026ccea Fix registration of sync command 2016-01-12 14:24:47 +01:00
Thomas Müller 90d9834c8c Decouple federation and dav app 2016-01-12 14:24:47 +01:00
Thomas Müller dbddbb634b Use EventDispatcher to allow additional setup of auth backends - move federation auth to federation app 2016-01-12 14:24:01 +01:00
Thomas Müller cdc536c423 Allow trusted servers to authenticate 2016-01-12 14:24:01 +01:00
Thomas Müller 4fc0fbe8d0 Merge pull request #21616 from owncloud/introduce-dav-application-class
Unit test contact provider registration
2016-01-12 14:22:46 +01:00
Robin Appelman d8d6368dd7 cap the number of entries we cache in smb's statcache 2016-01-12 13:26:58 +01:00
Robin Appelman c15cab7ed6 Allow admins to add system wide root certificates 2016-01-12 12:50:59 +01:00
Roeland Jago Douma be8125b8e2 Add unit tests to make sure we do not lower the search 2016-01-12 10:34:38 +01:00
Roeland Jago Douma 71976a095f Do not lower the sharee search
Fixes #21639

When lowering the remote search it break remotes that have uppercase
letters like foo@example.com/ownCloud/

Backends do the mathcing so they should also make sure that the search
string is converted to the format they require.
2016-01-12 10:05:09 +01:00
Thomas Müller 3ec8789c77 Merge pull request #21628 from owncloud/deprecated_secure_random_funcions
Replace deprecated function calls to SecureRandom
2016-01-12 09:12:13 +01:00
Jenkins for ownCloud 44e91bb90a [tx-robot] updated from transifex 2016-01-12 01:56:33 -05:00
Roeland Jago Douma 07fd3889b1 Fix unit tests 2016-01-11 20:29:48 +01:00
Roeland Jago Douma 876fb83ddc getMediumStrengthGenerator is deprecated and does not do anything anymore 2016-01-11 20:06:30 +01:00
Roeland Jago Douma 98c4951f45 getLowStrengthGenerator does not do anything anymore 2016-01-11 19:59:15 +01:00
blizzz 89e5556c60 fix wrong class name in phpdoc 2016-01-11 15:15:21 +01:00
Thomas Müller 6f526e638c Unit test contact provider registration 2016-01-11 14:36:20 +01:00
Thomas Müller 3143555256 Merge pull request #21613 from owncloud/dav-fix-constructor
fix principal constructor for dav
2016-01-11 14:21:31 +01:00
Robin Appelman af1e810607 implement isLocal for shared storage 2016-01-11 13:58:22 +01:00
Thomas Müller c1d8a03662 Merge pull request #21517 from owncloud/ext-oauth-fix
Fix OAuth external storage auth for step 2
2016-01-11 13:36:58 +01:00
Robin Appelman 56c3686ad6 fix principal constructor for dav 2016-01-11 13:36:26 +01:00
Björn Schießle 46f6c289ca only use master key ID if a user is logged in. Otherwise keep the public link share key 2016-01-11 13:09:06 +01:00
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
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