wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
29849 commits 157 branches 562 tags 714 MiB
Commit graph

12324 commits

Author SHA1 Message Date
Thomas Müller
45baf03a2a Test ownCloud CardDAV sharing using CalDAVTester 2016-01-18 22:14:51 +01:00
Thomas Müller
1448215055 Call ctors properly 2016-01-18 22:14:51 +01:00
Thomas Müller
992ccc899a Fix unit test - optimize code 2016-01-18 22:14:30 +01:00
Thomas Müller
8b8edc1f5d Show group shared addressbooks 2016-01-18 22:14:30 +01:00
Thomas Müller
816df90aec Merge pull request #21700 from owncloud/update-system-addressbook-on-user-change 
Updating system addressbook as soon as a user is added or removed
 2016-01-18 20:28:11 +01:00
Thomas Müller
11e774dd7b Merge pull request #21770 from owncloud/files_external-export 
Add files_external:export command
 2016-01-18 16:58:26 +01:00
Thomas Müller
e895ce69fe Merge pull request #21757 from owncloud/files-external-applicable-db-fix 
Correctly remove global applicable
 2016-01-18 16:58:08 +01:00
Thomas Müller
e3b6642a91 Merge pull request #21754 from owncloud/ocs_share_api_add_share_owner 
[Share 2.0] Add share owner information to OCS Share API
 2016-01-18 16:57:48 +01:00
Thomas Müller
14c98b4df7 Merge pull request #21519 from owncloud/propagate-folder-size 
propagate folder size in the same query for write updates
 2016-01-18 16:57:30 +01:00
Robin Appelman
1fcb36cc39 Add files_external:export command 2016-01-18 14:17:27 +01:00
Thomas Müller
a32f8aa87a Merge pull request #21732 from owncloud/gdrive-stream-download 
Use Guzzle stream to download files from GDrive
 2016-01-18 14:16:19 +01:00
Robin Appelman
15451b29da bumb app version 2016-01-18 12:09:44 +01:00
Robin Appelman
7ba715d144 fix test 2016-01-18 12:08:58 +01:00
Robin Appelman
7e01f32c27 Pass the user when updating external storage status 2016-01-18 11:10:41 +01:00
Robin McCorkell
3fe802d931 Introduce 'login credentials' auth mechanism 
Stores user credentials in the database after user login, uses the new
CredentialsManager class
 2016-01-18 11:10:41 +01:00
Robin Appelman
97a2fb8a54 Put nodes from Directory->getChildren in the ObjectTree cache 2016-01-17 09:33:05 +01:00
Jenkins for ownCloud
2095a31000 [tx-robot] updated from transifex 2016-01-17 01:54:53 -05:00
Robin McCorkell
0b7fc9fd11 Correctly remove global applicable 2016-01-15 23:17:22 +00:00
Robin McCorkell
df7db3685e Remove faulty directory permissions test 2016-01-15 20:46:39 +00:00
Roeland Jago Douma
d33e578665 [Share 2.0] Add share owner information to OCS Share API 2016-01-15 20:21:47 +01:00
Thomas Müller
3a9dbc88ec Merge pull request #21739 from owncloud/issue_21110 
Fix bug issue 21110
 2016-01-15 20:15:03 +01:00
Robin McCorkell
a49aff2db7 Only check selection for delete permissions, not parent folder 2016-01-15 16:52:51 +00:00
Robin Appelman
30d6222e64 handle noopscanner in shared scanner 2016-01-15 15:37:31 +01:00
Robin Appelman
ddbbe1742f propagate folder size in the same query for write updates 2016-01-15 15:36:52 +01:00
Scrutinizer Auto-Fixer
83a8e75614 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2016-01-15 12:54:26 +00:00
Thomas Müller
6a7be4d277 Merge pull request #20927 from owncloud/handle-return-code-on-webdav-put 
Handle return code of streamCopy in WebDAV put
 2016-01-15 13:33:01 +01:00
Thomas Müller
6824704699 Merge pull request #21117 from owncloud/owner-file-exists 
Only return an owner if the file exists + improved getUidAndFilename
 2016-01-15 13:31:56 +01:00
Thomas Müller
13ce6d0f1c Merge pull request #21544 from owncloud/trashbin-permissions 
set etag and permission fields for trashbin entries
 2016-01-15 13:22:54 +01:00
Jesús Macias
3ae928c661 Change icon only on WND and Sharepoint external storages 2016-01-15 13:06:12 +01:00
Thomas Müller
d8867f7692 Merge pull request #21723 from owncloud/prevent-group-enable-for-apps 
Prevent group enable for apps
 2016-01-15 12:26:43 +01:00
Thomas Müller
64fb3c0606 Merge pull request #21735 from owncloud/files-external-checkbox-settings 
Consolidate user mounting check code
 2016-01-15 12:25:27 +01:00
Jesús Macias
5aa5d3a9ae Fis bug issue 21110 2016-01-15 12:13:16 +01:00
Thomas Müller
52040a3f23 Merge pull request #20898 from owncloud/cache-interfaces 
Public Cache interfaces
 2016-01-15 12:02:31 +01:00
Jenkins for ownCloud
cd840f01ae [tx-robot] updated from transifex 2016-01-15 01:54:57 -05:00
Robin McCorkell
4ffe8d70fa Consolidate user mounting check code 2016-01-14 22:13:28 +00:00
Vincent Petry
d608c37c90 Use Guzzle stream to download files from GDrive 
The API library does not support streaming and always reads the full
file into memory.

This workaround copies the signed headers to a Guzzle request and
returns the response as stream.
 2016-01-14 17:52:30 +01:00
Joas Schilling
0461b9dbb9 Add a new app type that can not be enabled for groups 2016-01-14 15:45:47 +01:00
Thomas Müller
01a6656c37 Fix ctor 2016-01-14 14:46:51 +01:00
Thomas Müller
052583bcb6 Unit tests for updateUser and deleteUser 2016-01-14 13:01:10 +01:00
Robin Appelman
a3d50ef49a add watcher interface 2016-01-14 12:54:42 +01:00
Robin Appelman
5fae07f422 add scanner interface 2016-01-14 12:54:42 +01:00
Robin Appelman
6d321f5f6b Return a class from cache operations instead of an array 2016-01-14 12:54:42 +01:00
Robin Appelman
5d0451b848 Safe teardowns 2016-01-14 12:54:42 +01:00
Thomas Müller
fbfca80f42 Add test for ensureSystemAddressBookExists 2016-01-14 12:21:42 +01:00
Thomas Müller
a91954907b Start updating system addressbook 2016-01-14 12:10:45 +01:00
Thomas Müller
8f89e3520d Merge pull request #21679 from owncloud/bump-sabre-3.0.7 
[3rdparty] Bump sabre to 3.0.7 (PHP7 support)
 2016-01-14 11:55:46 +01:00
Jenkins for ownCloud
205fbcbfa3 [tx-robot] updated from transifex 2016-01-14 01:55:43 -05:00
Thomas Müller
d0a690fde4 Merge pull request #21692 from owncloud/external-add-global 
Fix adding global applicable when removing all other applicables
 2016-01-13 17:36:52 +01:00
Roeland Jago Douma
cbd3050f4c [Share 2.0] Use full share id (providerId:shareId) 
Now that we support multiple managers we communicate shares to the
outside as 'providerId:shareId'. This makes sures that id's are unique
when references from the OCS API.

However, since we do not want to break the OCS API v1 we need to
somewhat hack around this.

When we switch to OCS API v2 (which we should when we support more
custom providers). We will change the id to always be the fullShareId.
 2016-01-13 16:35:15 +01:00
Roeland Jago Douma
67b7ebccd1 [Share 2.0] Add share provider factory 
* Add providers
* Add share manager to server container
* Use share manager from server container
* Properly get the share manager
 2016-01-13 16:35:14 +01:00
Roeland Jago Douma
b4de427c1e [Share 2.0] Allow registering of share providers 
* Properly register the default share provider
 2016-01-13 16:35:07 +01:00
Robin Appelman
b613db9e16 Fix adding global applicable when removing all other applicables 2016-01-13 15:31:26 +01:00
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
Daniel Tosello
8783eb99f7 Modified swift handling to explicitly set 404 responses to false 2016-01-12 16:47:52 +11: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
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