]>
source.dussan.org Git - nextcloud-server.git/log
Vincent Petry [Thu, 21 Nov 2013 18:15:11 +0000 (19:15 +0100)]
Return plausible isReadable() default impl for ext storage
When an ext storage doesn't implement isReadable(), always returning
true made the file scanner believe that the file exists and creates a
cache entry with the size zero.
This fix makes the default impl of isReadable() use file_exists().
Backport of
a49e873d3fa513136bfdf1d71bbc2bbcd61d3650
Morris Jobke [Tue, 26 Nov 2013 07:37:42 +0000 (23:37 -0800)]
Merge pull request #5962 from owncloud/clean_permissions_cache_on_filescan
clean permissions cache on filescan
Robin Appelman [Thu, 19 Sep 2013 19:37:52 +0000 (21:37 +0200)]
clear permissions cache when scanning a file
Conflicts:
lib/files/cache/scanner.php
Vincent Petry [Fri, 22 Nov 2013 16:34:58 +0000 (08:34 -0800)]
Merge pull request #5934 from owncloud/stable5-excludeextstoragefromquota
[Stable5] Exclude ext storage from quota
Thomas Müller [Fri, 22 Nov 2013 16:09:59 +0000 (08:09 -0800)]
Merge pull request #4957 from owncloud/fixing-4866-stable5
Backport of #4869 to stable5 (recreate an etag within the scanner if the cache contains an empty etag)
Thomas Müller [Fri, 22 Nov 2013 14:45:27 +0000 (15:45 +0100)]
Merge branch 'fixing-4866-stable5' of github.com:owncloud/core into fixing-4866-stable5
Thomas Müller [Fri, 22 Nov 2013 14:44:59 +0000 (15:44 +0100)]
Merge branch 'stable5' into fixing-4866-stable5
Vincent Petry [Fri, 22 Nov 2013 13:53:56 +0000 (14:53 +0100)]
Fixed testTouch unit test to work with stable5
Calling getFileInfo() would trigger checkUpdate() and would return the
real file mtime because the test value 500 was in the past.
This fix makes this test work with the stable5 behavior.
Removed "storage_mtime" references which don't exist in stable5.
Robin Appelman [Sun, 10 Feb 2013 11:44:27 +0000 (12:44 +0100)]
Emulate touch() for backends that don't support it
Backport of
9738fae3cf1ad18593d21eb62e138e00c01f5f36
Jörn Friedrich Dreyer [Thu, 21 Nov 2013 14:34:35 +0000 (15:34 +0100)]
<default></default> and <notnull>true</notnull> contradict each other
Andreas Fischer [Mon, 23 Sep 2013 14:13:12 +0000 (07:13 -0700)]
Cherry-pick of
5d671a8 onto stable5.
recreate an etag within the scanner if the cache contains an empty etag
Conflicts:
lib/files/cache/cache.php
tests/lib/files/cache/scanner.php
Vincent Petry [Tue, 19 Nov 2013 15:09:11 +0000 (07:09 -0800)]
Merge pull request #5893 from owncloud/stable5-extstorage-smbfixes
[stable5] External storage SMB fixes for stat and unlink backport
Vincent Petry [Wed, 6 Nov 2013 09:55:19 +0000 (10:55 +0100)]
Fixed storage stats to be based on current directory
Previously, the storage statistics were always for the root dir.
This means that the upload button would always show the limit for the
root dir, even when uploading to a shared dir or external storage.
This fix adds a "dir" argument to getstoragestats.php.
Partial backport of
31181e4348b9af2625cf4d6ad38cf4cd81db3c1f
Vincent Petry [Tue, 19 Nov 2013 10:04:41 +0000 (11:04 +0100)]
Fixed ext storage free space to not be restricted by quota
Vincent Petry [Tue, 19 Nov 2013 09:05:50 +0000 (10:05 +0100)]
Fixed quota calculation to also exclude ext storage
Vincent Petry [Mon, 18 Nov 2013 16:29:30 +0000 (17:29 +0100)]
External storage space is now not counted in total space
Added argument to getFileInfo() to disable adding the size of
mountpoints to a directory's size.
Backport of
614e4d485c8b74f6879c401f8cbb93e9335bf9b3
Morris Jobke [Mon, 18 Nov 2013 23:24:01 +0000 (15:24 -0800)]
Merge pull request #5921 from owncloud/search_scrollto_stable5
backport search scrollto & filter to stable5
Thomas Müller [Mon, 18 Nov 2013 14:03:22 +0000 (15:03 +0100)]
fixing js error in case the file name is a number
Jörn Friedrich Dreyer [Mon, 18 Nov 2013 13:18:08 +0000 (14:18 +0100)]
backport search scrollto & filter to stable5
Vincent Petry [Thu, 14 Nov 2013 17:39:39 +0000 (18:39 +0100)]
Fixed SMB file deletion success detection
Since unlink() smb4php doesn't return true on deletion success, we need
to check whether the file was deleted to confirm success.
Fixes #5866
Backport of
eefd91355d54b7e49dd328cef9a9561ee51b0194
Vincent Petry [Thu, 14 Nov 2013 15:52:00 +0000 (16:52 +0100)]
Removing trailing dot in path that samba doesn't seem to like
Fixes #5778
Added unit test for getId() and constructUrl()
Backport of
f66ec8a02271e73755cb965107eca60f027ffe78
Vincent Petry [Fri, 15 Nov 2013 11:57:27 +0000 (03:57 -0800)]
Merge pull request #5883 from owncloud/stable5-singledotdirs
Stable5 single dot dirs
Frank Karlitschek [Fri, 15 Nov 2013 09:42:08 +0000 (01:42 -0800)]
Merge pull request #5307 from nicokaiser/fixing-3694-stable5
Fix OC_User::getDisplayName to persist between (browser) sessions. Fixes #3694
Vincent Petry [Thu, 14 Nov 2013 14:36:03 +0000 (15:36 +0100)]
Added missing test with leading backslash
Vincent Petry [Thu, 14 Nov 2013 12:22:53 +0000 (13:22 +0100)]
Files app backend now normalizes paths before rendering templates
Before rendering breadcrumbs or the file list, the paths are now
normalized. This prevents the UI to show "." breadcrumbs in case the
path contains sections with "/./"
Fixes #5848
Backport of
008c3b80d6cca6a15299afe01f150f075813df8c
Vincent Petry [Thu, 14 Nov 2013 12:15:03 +0000 (13:15 +0100)]
Fixed normalizePath() to strip out single dot dirs
Now removing "/./" and trailing "/." from the paths when normalizing.
Backport of
c06d8bb0071839480f9e458e58630ca0c205b9cb
Thomas Müller [Mon, 11 Nov 2013 22:29:16 +0000 (14:29 -0800)]
Merge pull request #5811 from owncloud/fixing-5808-stable5
fixing Fatal error: Call to a member function logicToPhysical() on a non-object
Thomas Müller [Mon, 11 Nov 2013 18:43:57 +0000 (19:43 +0100)]
fixes #5808
Thomas Müller [Mon, 11 Nov 2013 15:05:22 +0000 (07:05 -0800)]
Merge pull request #5725 from owncloud/fix_enabling_apps_on_oracle_cornercase
fix enabling apps for oracle - cornercase
Thomas Müller [Fri, 8 Nov 2013 15:55:01 +0000 (16:55 +0100)]
add missing argument $query
Jörn Friedrich Dreyer [Fri, 8 Nov 2013 13:57:05 +0000 (14:57 +0100)]
use empty to check for null and ''
Owen Winkler [Thu, 7 Nov 2013 17:07:30 +0000 (09:07 -0800)]
Merge pull request #5723 from owncloud/stable5-strayremembermecookiesfix
Now removing stray old cookies from 5.0.12
Morris Jobke [Wed, 6 Nov 2013 21:39:14 +0000 (13:39 -0800)]
Merge pull request #5726 from owncloud/more_debug_output_stable5
add debug output related to app enablement
Jörn Friedrich Dreyer [Wed, 6 Nov 2013 17:28:26 +0000 (18:28 +0100)]
fix enabling apps for oracle cornercase
Jörn Friedrich Dreyer [Wed, 6 Nov 2013 17:14:43 +0000 (18:14 +0100)]
add debug output related to app enablement
Vincent Petry [Wed, 6 Nov 2013 16:37:35 +0000 (17:37 +0100)]
Now removing stray old cookies from 5.0.12
Cookies from 5.0.12 seemed to have an extra slash in the path.
Firefox doesn't allow to remove them if the trailing slash isn't there,
thus making it impossible to logout correctly.
This fix adds extra code to delete such stray cookies.
Frank Karlitschek [Tue, 5 Nov 2013 19:40:25 +0000 (20:40 +0100)]
let's increase the version number once more
Frank Karlitschek [Tue, 5 Nov 2013 19:39:38 +0000 (11:39 -0800)]
Merge pull request #5704 from owncloud/fixing-5663-stable5
we create the cookies for the url path \OC::$WEBROOT - as a result we sh...
Thomas Müller [Tue, 5 Nov 2013 14:00:28 +0000 (15:00 +0100)]
we create the cookies for the url path \OC::$WEBROOT - as a result we shall 'remove' them with the same path
unsetMagicInCookie() is supposed to be static
Frank Karlitschek [Tue, 5 Nov 2013 02:52:16 +0000 (03:52 +0100)]
5.0.13
Bart Visscher [Fri, 25 Oct 2013 13:38:08 +0000 (15:38 +0200)]
When updating an appstore app, execute a database update
See #5202
Frank Karlitschek [Fri, 1 Nov 2013 02:12:21 +0000 (03:12 +0100)]
5.0.13 RC1
Thomas Müller [Thu, 31 Oct 2013 22:09:01 +0000 (15:09 -0700)]
Merge pull request #5583 from frisco82/backportCookieChanges
Backport of #3985 (Invalid remember me token)
Thomas Müller [Thu, 31 Oct 2013 17:28:49 +0000 (10:28 -0700)]
Merge pull request #5640 from owncloud/backport_executeaudited_stable5
Backport executeaudited stable5
Thomas Müller [Thu, 31 Oct 2013 16:42:50 +0000 (09:42 -0700)]
Merge pull request #5647 from owncloud/fix4390_stable5
Fix4390 stable5
Jörn Friedrich Dreyer [Thu, 31 Oct 2013 14:53:07 +0000 (15:53 +0100)]
use closest instead of parent
Thomas Müller [Thu, 31 Oct 2013 11:59:50 +0000 (04:59 -0700)]
Merge pull request #5574 from owncloud/fixing-5271-stable5
we should check if a user is logged in before we check for admin privile...
Thomas Müller [Thu, 31 Oct 2013 11:44:51 +0000 (12:44 +0100)]
adding second argument to DatabaseException
updated some PHPDoc comments
fixing undefined variable in line 789 - actually unrelated but well ....
Thomas Müller [Thu, 31 Oct 2013 11:30:48 +0000 (04:30 -0700)]
Merge pull request #5579 from owncloud/backport_5496
backport of #5496, fixes #5421 for stable5
Thomas Müller [Thu, 31 Oct 2013 11:27:04 +0000 (04:27 -0700)]
Merge pull request #5327 from owncloud/backport-4867-stable5
[stable5] Adding detection of aborted uploads for chunked uploads
Jörn Friedrich Dreyer [Thu, 31 Oct 2013 10:55:58 +0000 (11:55 +0100)]
extend unit test to directories starting or ending in whitespace
Thomas Müller [Thu, 31 Oct 2013 10:32:23 +0000 (03:32 -0700)]
Merge pull request #5630 from owncloud/backport_home_storage_stable5
backport home storage to stable5
Jörn Friedrich Dreyer [Thu, 31 Oct 2013 10:19:58 +0000 (11:19 +0100)]
disable MDB2_PORTABILITY_RTRIM
fixes dnd into folders ending in whitespace on oracle
unnecessary portability option because only affects fixed length character columns. luckily we dont have that kind of columns: the text datatype is transformed into varchar by MDB2
Jörn Friedrich Dreyer [Thu, 31 Oct 2013 10:15:12 +0000 (11:15 +0100)]
allow dnd into folders starting with whitespace
Jörn Friedrich Dreyer [Thu, 31 Oct 2013 09:27:42 +0000 (10:27 +0100)]
remove leftover execute() and unused variables
Thomas Müller [Wed, 30 Oct 2013 21:55:48 +0000 (22:55 +0100)]
call \OC_Util::checkLoggedIn() on checkSubAdminUser() as well
Jörn Friedrich Dreyer [Wed, 30 Oct 2013 18:52:48 +0000 (19:52 +0100)]
use executeAudited() for all cache queries
Conflicts:
lib/files/cache/cache.php
Jörn Friedrich Dreyer [Wed, 30 Oct 2013 18:52:10 +0000 (19:52 +0100)]
backport executeAudited()
Bjoern Schiessle [Wed, 30 Oct 2013 16:03:53 +0000 (17:03 +0100)]
allow to share a file/folder as public link also if one of it parents was already shared as link
Frank Karlitschek [Wed, 30 Oct 2013 16:42:21 +0000 (09:42 -0700)]
Merge pull request #5487 from owncloud/backport_search_in_shared_files_to_stable5
backport search in shared files to stable5
Jörn Friedrich Dreyer [Wed, 30 Oct 2013 16:10:23 +0000 (09:10 -0700)]
Merge pull request #5613 from owncloud/upload_to_shared
fix check if we upload to /Shared
Jörn Friedrich Dreyer [Wed, 30 Oct 2013 15:52:17 +0000 (16:52 +0100)]
backport home storage to stable5
Jörn Friedrich Dreyer [Wed, 30 Oct 2013 14:02:35 +0000 (15:02 +0100)]
fix placholder counting
Bjoern Schiessle [Wed, 30 Oct 2013 10:39:30 +0000 (11:39 +0100)]
remove unused variable
Bjoern Schiessle [Wed, 30 Oct 2013 10:28:36 +0000 (11:28 +0100)]
if the database doesn't contain any information about the recovery mode than we assume that it is disabled
Bjoern Schiessle [Tue, 29 Oct 2013 21:49:12 +0000 (22:49 +0100)]
fix check if we upload to /Shared
Thomas Müller [Tue, 29 Oct 2013 15:40:18 +0000 (16:40 +0100)]
fixes #5367
Conflicts:
lib/connector/sabre/file.php
Jörn Friedrich Dreyer [Tue, 29 Oct 2013 12:34:53 +0000 (13:34 +0100)]
cleanup PR
- extract method,
- introduce MAX CHUNK SIZE const with 999 (reduce this by the number of additional query parameters),
- fix whitespace
Björn Schießle [Tue, 29 Oct 2013 13:40:07 +0000 (06:40 -0700)]
Merge pull request #5513 from owncloud/fix_file_cache_updater
Fix file cache updater
Bjoern Schiessle [Tue, 29 Oct 2013 13:39:44 +0000 (14:39 +0100)]
make getUidAndFilename() private
Bjoern Schiessle [Tue, 29 Oct 2013 10:47:06 +0000 (11:47 +0100)]
disable encryption app for file cache updater test since the test doesn't use a completely initialized oc filesystem
Bjoern Schiessle [Tue, 29 Oct 2013 10:45:40 +0000 (11:45 +0100)]
make sure that hooks are only executed when the app is enabled
Bjoern Schiessle [Tue, 29 Oct 2013 09:12:53 +0000 (10:12 +0100)]
tests should work if I explicitely log-in as a user
Bjoern Schiessle [Tue, 29 Oct 2013 08:55:40 +0000 (09:55 +0100)]
make sure that we operate on the owners Path because this path needs to be updated
check the storage for every iteration to make sure that we update the correct cache entry
Thomas Müller [Thu, 17 Oct 2013 18:20:13 +0000 (20:20 +0200)]
fixes #5367
Conflicts:
lib/connector/sabre/file.php
Thomas Müller [Mon, 28 Oct 2013 20:51:25 +0000 (21:51 +0100)]
Merge branch 'stable5' into backport-4867-stable5
Ramiro Aparicio [Mon, 28 Oct 2013 14:43:53 +0000 (15:43 +0100)]
Fix logout issue with tokens
Jörn Friedrich Dreyer [Mon, 28 Oct 2013 13:24:34 +0000 (14:24 +0100)]
backport of #5496, fixes #5421 for stable5
Bjoern Schiessle [Mon, 28 Oct 2013 11:00:48 +0000 (12:00 +0100)]
remove debug output, add comment
Bjoern Schiessle [Mon, 28 Oct 2013 11:00:16 +0000 (12:00 +0100)]
Share Updater doesn't need to call the cache updaters correctFolder method, this method always expect a path relativ to the current user
Bjoern Schiessle [Mon, 28 Oct 2013 10:37:22 +0000 (11:37 +0100)]
check storage for every iteration
Thomas Müller [Mon, 28 Oct 2013 10:32:43 +0000 (11:32 +0100)]
we should check if a user is logged in before we check for admin privilege
Thomas Müller [Sun, 27 Oct 2013 22:20:02 +0000 (15:20 -0700)]
Merge pull request #5465 from owncloud/create-custom-logfile-stable5
Stable5: Try to create custom log file before falling back to default.
Vincent Petry [Sun, 27 Oct 2013 18:43:51 +0000 (19:43 +0100)]
Fixed group management dropdown in IE9
There is a syntax error in the "em" tag that isn't close that seem
to mess up in IE9.
- Fix was found in
0bcb0439 for multiselect.js, so backported this partially.
- Fixes #2569
blizzz [Fri, 25 Oct 2013 09:10:23 +0000 (02:10 -0700)]
Merge pull request #5425 from buczek/fix-ldap-login
Fix ldap login
Bjoern Schiessle [Thu, 24 Oct 2013 15:24:49 +0000 (17:24 +0200)]
changed the logic, this should fix the tests
Bjoern Schiessle [Thu, 24 Oct 2013 14:14:34 +0000 (16:14 +0200)]
remove debug code
Bjoern Schiessle [Thu, 24 Oct 2013 10:27:22 +0000 (12:27 +0200)]
resolvePath() needs to resolve the path for the owner, otherwise it doesn't work for Shared files
correctFolder() correct folder for the owner of the file. The Shared folder for the other users gets updated by the files_sharing app
Bjoern Schiessle [Thu, 24 Oct 2013 10:26:38 +0000 (12:26 +0200)]
return -1 if file is empty otherwise we run into infinite loops
Thomas Müller [Wed, 23 Oct 2013 21:51:32 +0000 (14:51 -0700)]
Merge pull request #5457 from owncloud/fix5438
LDAP: cookies from Paged Search must only be used once, as stated in RFC...
Björn Schießle [Wed, 23 Oct 2013 14:31:56 +0000 (07:31 -0700)]
Merge pull request #5416 from owncloud/sharing_fix_infinite_loop
sharing: fix infinite loop
Björn Schießle [Wed, 23 Oct 2013 14:11:45 +0000 (07:11 -0700)]
Merge pull request #5145 from guruz/files_encryption_511_fix_chunk_calc
files_encryption: Fix getFileSize()
Jörn Friedrich Dreyer [Wed, 23 Oct 2013 12:40:47 +0000 (14:40 +0200)]
OC5 does not have executeAudited
Bjoern Schiessle [Wed, 23 Oct 2013 12:30:14 +0000 (14:30 +0200)]
Merge branch 'stable5' into sharing_fix_infinite_loop
Jörn Friedrich Dreyer [Wed, 23 Oct 2013 10:33:23 +0000 (12:33 +0200)]
backport search in shared files to stable5
Andreas Fischer [Wed, 23 Oct 2013 09:55:18 +0000 (11:55 +0200)]
Merge pull request #5485 from owncloud/fixing-oci-stable5
adding backticks to satisfy Oracle
* owncloud/fixing-oci-stable5:
adding backticks to satisfy Oracle
Thomas Müller [Wed, 23 Oct 2013 09:00:29 +0000 (11:00 +0200)]
adding backticks to satisfy Oracle
Bjoern Schiessle [Mon, 14 Oct 2013 14:43:18 +0000 (16:43 +0200)]
fix array key
Bjoern Schiessle [Mon, 14 Oct 2013 14:34:14 +0000 (16:34 +0200)]
try to fix unencrypted file size if it doesn't look plausible
Andreas Fischer [Sun, 20 Oct 2013 21:58:07 +0000 (23:58 +0200)]
Try to create custom log file before falling back to default.