c01949ec0e
Merge branch 'master' into fileinfo
2014-01-14 16:31:08 +01:00
c3a0b0d7f3
Merge pull request #6704 from owncloud/encryptedfoldersizecalc
...
Fix calculated folder size to use unencrypted size
2014-01-14 07:20:16 -08:00
ab21c25e38
Merge pull request #6759 from owncloud/extstorage-smbtimezonefix
...
Fixed timezone issue with SMB storage
2014-01-14 06:03:24 -08:00
a2a5ed3f4f
Merge pull request #6767 from owncloud/sharing_error_messages
...
it is not an urgent error... a DEBUG message is enough at this point
2014-01-14 06:02:48 -08:00
fa7f53e89d
it is not an urgent error... a DEBUG message is enough at this point
2014-01-14 13:38:41 +01:00
3c0e4a3bc6
Merge pull request #6752 from owncloud/silence-test-listener
...
no warnings within unlinkDir() within the TestCleanupListener
2014-01-13 15:47:39 -08:00
cb071a9f35
Merge pull request #6755 from owncloud/remove-ru_RU-master
...
remove ru_RU - it has bee removed from transifex
* owncloud/remove-ru_RU-master:
remove ru_RU - it has bee removed from transifex
2014-01-14 00:44:34 +01:00
1eb5ebd58c
Fixed timezone issue with SMB storage
...
Now forcing smbclient to also run on UTC
2014-01-14 00:37:57 +01:00
d1b47021f1
don't unshare on delete
2014-01-13 16:49:16 +01:00
92969052d7
remove ru_RU - it has bee removed from transifex
2014-01-13 16:41:10 +01:00
5e04b7f284
Merge pull request #6422 from ccerrillo/fixing-6301-external-mount-webdav-blank-files
...
Fixing Issue #6301 on master branch
2014-01-13 07:09:01 -08:00
e706cf6c06
add Support for passing a FileInfo instance to View->putFileInfo
2014-01-13 15:57:49 +01:00
82c840b3e6
Merge pull request #6734 from st3so/redirectfix
...
fixing typo in redirection query string
2014-01-13 06:55:52 -08:00
70650a004a
no warnings within unlinkDir() within the TestCleanupListener
2014-01-13 15:32:11 +01:00
82762bb462
remove ArrayAccess, JsonSerializable from the public part of FileInfo
2014-01-13 15:13:45 +01:00
39d2c18793
Extends phpdoc for \OCP\File\FileInfo
2014-01-13 14:42:14 +01:00
617acbd6f9
Add a FileInfo class which holds all info of a file and return that from getFileInfo, getDirectoryContent and search
2014-01-13 14:28:49 +01:00
fcf6653e64
Merge pull request #6694 from owncloud/fix-email-template-l10n
...
fix email template l10n, emphasize filename
2014-01-13 04:34:28 -08:00
a2cae551f3
fixing typo in redirection query string
2014-01-12 15:49:32 +01:00
85e00ad35a
Merge pull request #6713 from owncloud/files-filenameescapingfixes
...
Fixed various file name escaping issues in core apps
2014-01-12 03:45:30 -08:00
1042733634
Fixed various file name escaping issues in core apps
...
- Refactored file tr lookup into FileList.findFileEl that uses
filterAttr to avoid escaping issues in jQuery selectors
- Fixed versions and sharing app to properly escape file names in
attributes
2014-01-10 15:02:26 +01:00
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
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
e0dbc1b67e
Merge pull request #6693 from owncloud/fixing-apache-login
...
Fixing apache login
2014-01-09 03:32:17 -08:00
76a7ae77a8
fix email template l10n, emphasize filename
2014-01-09 10:54:23 +01:00
c3829dfa61
rename user-id to loginname to stay consistent
2014-01-09 10:29:21 +01:00
22bd69f75c
set login name within apache auth backend
2014-01-09 10:28:24 +01:00
9b7c3a5c66
fixing PHPDoc and use cameCase names
2014-01-09 10:27:47 +01:00
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
4585b4ea3f
Infowarning about 32bit
2014-01-08 19:41:10 +01:00
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
0e7283ef39
Merge pull request #6686 from owncloud/fixes-6685-master
...
Fix ownCloud for php5.3.x
2014-01-08 07:33:12 -08:00
e35bca1c26
Fix ownCloud for php5.3.x
2014-01-08 16:07:01 +01:00
0bc0a60a93
Merge pull request #6680 from owncloud/core-preventunlinkstorageroot
...
Prevent deleting storage root
2014-01-08 05:32:36 -08:00
d7cb5ab080
add tests for user counting
2014-01-08 13:26:48 +01:00
cb6a3e2617
if backends have the same class name, sum their users up instead of overwriting
2014-01-08 13:24:28 +01:00
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
bb443ae937
Merge pull request #6515 from owncloud/autotest-enforcephpunitversion
...
Enforce required phpunit version
2014-01-08 03:30:05 -08:00
677d83d45f
LDAP: add tests for countUsers
2014-01-08 12:24:29 +01:00
53498bc876
remove unnecessary line
2014-01-08 12:20:56 +01:00
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
5f11bdfe08
Merge pull request #6675 from owncloud/disable-mod_pagespeed
...
turn off mod_pagespeed
2014-01-08 02:52:03 -08:00
a8d20e0919
Merge pull request #5238 from owncloud/externalstorage-owncloudbackend
...
Added ownCloud backend for external storage
2014-01-08 01:49:15 -08:00
4c93b00990
Merge branch 'master' into disable-mod_pagespeed
2014-01-08 10:19:16 +01:00
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
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
b1dfc514e2
Fix submodule 3rdparty - translation sync broke that
2014-01-08 09:42:37 +01:00
5eef107344
turn off mod_pagespeed
2014-01-08 07:56:08 +01:00
6be2dee5bc
[tx-robot] updated from transifex
2014-01-08 01:55:41 -05:00
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
Robin Appelman
Vincent Petry
Björn Schießle
Thomas Müller
Andreas Fischer
Frank Karlitschek
st3so
Lukas Reschke
Jan-Christoph Borchardt
blizzz
Jörn Friedrich Dreyer