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
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
Thomas Müller
1ce45713bd
Merge pull request #6605 from owncloud/free_space_disabled
...
Return SPACE_UNKNOWN if disk_free_space is disabled
2014-01-02 08:19:52 -08:00
Thomas Müller
27d7fff580
Merge pull request #6609 from owncloud/avatar-test-user
...
Make OC_Avatar unit tests independent of currently loggedin user
2014-01-02 07:50:29 -08:00
Robin Appelman
83f968ace2
Fix APCIterator syntax in \OC\Memcache\APCU::clear
...
see http://www.php.net/manual/en/apciterator.construct.php
2014-01-02 16:12:56 +01:00
Robin Appelman
6f6c3d1e44
Make OC_Avatar unit tests independent of currently loggedin user
2014-01-02 16:08:08 +01:00
icewind1991
14e0b1b6d1
Merge pull request #6513 from owncloud/user-no-change-displayname
...
Re-add the config options to remove the ability for users to change their displayname
2014-01-02 05:04:27 -08:00
Robin Appelman
25370fcb82
Return SPACE_UNKNOWN if disk_free_space is disabled when getting the free space on a local storage
2014-01-02 13:19:10 +01:00
Jenkins for ownCloud
095f9b8ee0
[tx-robot] updated from transifex
2014-01-02 01:56:21 -05:00
Thomas Müller
25a9311e94
Merge pull request #6601 from AdamWill/pimple-include
...
don't specify path to 3rdparty directory when registering Pimple autoloader
2014-01-01 15:25:58 -08:00
Thomas Müller
ac3f83ca0d
Merge pull request #6598 from lolozere/master
...
Add support mimetype
2014-01-01 15:25:28 -08:00
Adam Williamson
9b4a827e0b
don't specify path to 3rdparty directory when registering Pimple autoloader
...
The core 3rdparty directory is in the include_path from lib/base.php anyway, so this is unnecessary, and causes problems for downstream distributors who unbundle Pimple.
2014-01-01 09:52:19 -08:00
lolozere
d5382ac05d
Add support mimetype
...
Add support mimetype for extension .sh, .bash and .sh-lib
2014-01-01 14:09:02 +01:00
Niklas Sombert
4c179850ab
Revert "Added support for extra backends (see pull request #5043 )"
...
This reverts commit 2d75914f2a
, reversing
changes made to 760fa9ea30
.
2014-01-01 13:43:23 +01:00
Niklas Sombert
2d75914f2a
Added support for extra backends (see pull request #5043 )
...
Somebody had forgotten "OC_User::setupBackends();"...
2014-01-01 11:53:27 +01:00