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

15999 commits

This branch
This branch
All branches
Author SHA1 Message Date
Vincent Petry
8eaa39f4e2 Removed special handling of part files in shared storage rename 
This fixes the issue introduced by the transfer id which itself wasn't
taken into account by the shortcut code for part file in the shared
storage class.
 2014-01-08 18:43:20 +01:00
Jan-Christoph Borchardt
0e7283ef39 Merge pull request #6686 from owncloud/fixes-6685-master 
Fix ownCloud for php5.3.x
 2014-01-08 07:33:12 -08:00
Thomas Müller
e35bca1c26 Fix ownCloud for php5.3.x 2014-01-08 16:07:01 +01:00
Robin Appelman
5a2a0426a6 Also update the OCP\IServerContainer 2014-01-08 15:51:40 +01:00
Robin Appelman
be7837402d get the memorycache factory from OCP\Server instead of a cache instance 
this allows apps to specify a prefix to use
 2014-01-08 15:18:12 +01:00
Thomas Müller
0bc0a60a93 Merge pull request #6680 from owncloud/core-preventunlinkstorageroot 
Prevent deleting storage root
 2014-01-08 05:32:36 -08:00
Arthur Schiwon
d7cb5ab080 add tests for user counting 2014-01-08 13:26:48 +01:00
Arthur Schiwon
cb6a3e2617 if backends have the same class name, sum their users up instead of overwriting 2014-01-08 13:24:28 +01:00
Vincent Petry
f642ad3961 Prevent deleting storage root 
Storage mount points are not deletable, so make sure that the unlink
operation and its hooks aren't run in such cases.

Note that some storages might recursively delete their contents when
calling unlink on their root. This fix prevents that as well.
 2014-01-08 13:17:36 +01:00
Thomas Müller
bb443ae937 Merge pull request #6515 from owncloud/autotest-enforcephpunitversion 
Enforce required phpunit version
 2014-01-08 03:30:05 -08:00
Arthur Schiwon
677d83d45f LDAP: add tests for countUsers 2014-01-08 12:24:29 +01:00
Arthur Schiwon
53498bc876 remove unnecessary line 2014-01-08 12:20:56 +01:00
Arthur Schiwon
b669e1a3c1 LDAP: implement userCount action. This required to (finally) clean up and refactor the search method, which will have a positive performance impact on paged search. 2014-01-08 12:07:57 +01:00
Vincent Petry
5f11bdfe08 Merge pull request #6675 from owncloud/disable-mod_pagespeed 
turn off mod_pagespeed
 2014-01-08 02:52:03 -08:00
Thomas Müller
a8d20e0919 Merge pull request #5238 from owncloud/externalstorage-owncloudbackend 
Added ownCloud backend for external storage
 2014-01-08 01:49:15 -08:00
Thomas Müller
4c93b00990 Merge branch 'master' into disable-mod_pagespeed 2014-01-08 10:19:16 +01:00
Thomas Müller
eac9c45fed Merge pull request #6677 from owncloud/fixing-3rdparty-submodule 
Fix submodule 3rdparty - translation sync broke that
 2014-01-08 01:16:38 -08:00
Vincent Petry
1614ad42b3 Merge pull request #6673 from owncloud/master-quota-insufficientstorageforfilesfix 
Now also preventing to override "files" dir size with -1
 2014-01-08 00:55:11 -08:00
Thomas Müller
b1dfc514e2 Fix submodule 3rdparty - translation sync broke that 2014-01-08 09:42:37 +01:00
Thomas Müller
5eef107344 turn off mod_pagespeed 2014-01-08 07:56:08 +01:00
Jenkins for ownCloud
6be2dee5bc [tx-robot] updated from transifex 2014-01-08 01:55:41 -05:00
Jörn Friedrich Dreyer
f356894aa3 Merge pull request #6594 from owncloud/kill-index.php-from-url 
Kill index.php from url
 2014-01-07 22:28:58 -08:00
Thomas Müller
a7d0ab96c1 Merge pull request #6565 from owncloud/enable-ldap-unit-tests-master-2 
enable ldap tests
 2014-01-07 22:27:47 -08:00
Arthur Schiwon
bc1235d325 Add command line tool to show numbers of users and user directories 2014-01-07 23:06:37 +01:00
Arthur Schiwon
1e1ced7772 Introduce user count action to user management 2014-01-07 23:05:37 +01:00
Vincent Petry
5be4af9f51 Now also preventing to override "files" dir size with -1 
Fixes #6526
 2014-01-07 22:34:01 +01:00
Thomas Müller
b6474506eb Merge pull request #6660 from owncloud/fixing-disabled-function-checks 
Fixing disabled function checks
 2014-01-07 11:10:45 -08:00
Thomas Müller
2d5427efa9 Merge pull request #6290 from owncloud/files-androidcontentdisposition 
Files androidcontentdisposition
 2014-01-07 11:06:20 -08:00
Thomas Müller
09d7882571 trimming all array elements 2014-01-07 19:47:01 +01:00
Thomas Müller
f2fbfbc665 Merge pull request #6642 from owncloud/update-SabreDAV 
Update sabre dav to 1.7.9
 2014-01-07 08:04:13 -08:00
Thomas Müller
3abe4c3e88 Merge pull request #6663 from owncloud/fix_empty_mimetypes 
remove duplicate exe mimetype, add correct msi mimetype
 2014-01-07 07:31:12 -08:00
Thomas Müller
e0bd7e145c Remove @ in order to get proper error handling 2014-01-07 16:24:05 +01:00
Jörn Friedrich Dreyer
9404a8f40c remove duplicate exe mimetype, add correct msi mimetype 2014-01-07 15:51:08 +01:00
Thomas Müller
9d869ab596 we shall explode on ',' only 2014-01-07 14:53:02 +01:00
Thomas Müller
07a84aa5eb reuse existing helper function OC_Helper::is_function_enabled 2014-01-07 14:52:18 +01:00
Thomas Müller
970eed2867 Merge pull request #6530 from owncloud/prevent-corruption-on-parallel-upload-master 
Adding a random postfix to the part file.
 2014-01-07 03:25:26 -08:00
Thomas Müller
ed469a7d2c in order to work properly with encryption ocTransferId is added to the file path - questionable usage of magic string 2014-01-07 11:53:33 +01:00
Jenkins for ownCloud
d2f2645a6a [tx-robot] updated from transifex 2014-01-07 01:56:11 -05:00
Robin Appelman
4d65a80892 Remove the static dependency on OC_Util from Memcache 2014-01-06 13:11:38 +01:00
Robin Appelman
cd147bb37a Use APCIterator for Memcache\APC::clear() 2014-01-06 12:58:43 +01:00
Robin Appelman
1df1b55b66 expose memory cache in public api 2014-01-06 12:55:56 +01:00
Jenkins for ownCloud
0e843b9d7d [tx-robot] updated from transifex 2014-01-06 01:55:59 -05:00
ben-denham
baccc8f584 Unshare all will now delete all shares for the item, instead of only for a single owner. 2014-01-06 11:14:43 +13:00
Thomas Müller
fc79662eca reference 3rdparty branch with SabreDAV 1.7.9 installed using composer 2014-01-05 21:49:50 +01:00
Thomas Müller
214aecac78 require composer's autoload.php if present 2014-01-05 21:49:08 +01:00
Morris Jobke
ce3df44699 Merge pull request #6031 from s0taka/master 
No decimal points for Kilobyte and Byte #5371.
 2014-01-05 11:52:10 -08:00
Thomas Müller
e2d739fa21 Merge pull request #6580 from monreal/master 
Silence output of 'which' command used in smbclient detection
 2014-01-05 04:32:30 -08:00
Jenkins for ownCloud
e4616199df [tx-robot] updated from transifex 2014-01-05 01:55:53 -05:00
Jenkins for ownCloud
aaa48576ee [tx-robot] updated from transifex 2014-01-04 01:55:57 -05:00
icewind1991
f016a3ead3 Merge pull request #6610 from owncloud/apcu-clear 
Fix APCIterator syntax in \OC\Memcache\APCu::clear
 2014-01-03 05:30:49 -08:00