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

12160 commits

Author SHA1 Message Date
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