Commit Graph

16067 Commits

Author SHA1 Message Date
Joas Schilling d95cab632b Extend margin to avoid displaying a scrollbar 2014-01-10 10:17:19 +01:00
Joas Schilling 3ae17d0785 Fix unallowed child elements 2014-01-10 10:17:19 +01:00
Joan 2abea96462 Disabled internet checking as mentioned when in proxy mode 2014-01-10 09:33:35 +01:00
ben-denham 30f77f53d5 updated the unit test for OCP\Share::unshareAll() to verify that shares by all users are removed for an item. 2014-01-10 14:08:29 +13:00
Andreas Fischer acd81f6c69 Readd support for memcached_server config variable. 2014-01-10 00:57:40 +01:00
Andreas Fischer 320353c237 Add support for multiple memcached servers. 2014-01-10 00:57:34 +01:00
Vincent Petry 4faba49f0a Fix calculated folder size to use unencrypted size
The encrypted size was used when calculating folder sizes.
This fix now also sums up the unencrypted size and shows that one when
available.
2014-01-09 17:47:50 +01:00
Vincent Petry b24c21b00f Merge pull request #6687 from owncloud/sharing-fixpartfilehandling
Removed special handling of part files in shared storage rename
2014-01-09 06:16:43 -08:00
Robin Appelman 5d456c7cc2 Merge branch 'master' into memcache-public 2014-01-09 13:54:58 +01:00
Robin Appelman d50c7391d8 Use $server->getMemCacheFactory() in ldap connection 2014-01-09 13:54:50 +01:00
Thomas Müller e0dbc1b67e Merge pull request #6693 from owncloud/fixing-apache-login
Fixing apache login
2014-01-09 03:32:17 -08:00
Jan-Christoph Borchardt 76a7ae77a8 fix email template l10n, emphasize filename 2014-01-09 10:54:23 +01:00
Thomas Müller c3829dfa61 rename user-id to loginname to stay consistent 2014-01-09 10:29:21 +01:00
Thomas Müller 22bd69f75c set login name within apache auth backend 2014-01-09 10:28:24 +01:00
Thomas Müller 9b7c3a5c66 fixing PHPDoc and use cameCase names 2014-01-09 10:27:47 +01:00
blizzz d8b8abb429 Merge pull request #6681 from owncloud/userreport
add command line option to get user number statistics
2014-01-08 10:41:39 -08:00
Arthur Schiwon 4585b4ea3f Infowarning about 32bit 2014-01-08 19:41:10 +01:00
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