]>
source.dussan.org Git - nextcloud-server.git/log
Morris Jobke [Thu, 17 Mar 2016 09:12:33 +0000 (10:12 +0100)]
Merge pull request #23311 from owncloud/check-syntax-travis-stable8.1
[stable8.1] Execute parallel-lint
Lukas Reschke [Wed, 16 Mar 2016 13:57:10 +0000 (14:57 +0100)]
[stable8.1] Execute parallel-lint
Backport of https://github.com/owncloud/core/pull/22994 and https://github.com/owncloud/core/pull/23303
Morris Jobke [Wed, 16 Mar 2016 14:32:33 +0000 (15:32 +0100)]
Merge pull request #23301 from owncloud/fix-video-viewer
[stable8.1] Backport OC.joinPaths to fix the Video Viewer
Vincent Petry [Fri, 10 Jul 2015 13:31:58 +0000 (15:31 +0200)]
More tests for joinPaths
Vincent Petry [Fri, 10 Jul 2015 11:01:01 +0000 (13:01 +0200)]
Add OC.joinPaths for convenient path joining
Morris Jobke [Wed, 16 Mar 2016 10:18:59 +0000 (11:18 +0100)]
Merge pull request #23267 from owncloud/fix_22907_8.1
allow group shares, even if not all public keys are available
Bjoern Schiessle [Tue, 15 Mar 2016 10:23:49 +0000 (11:23 +0100)]
allow group shares, even if not all public keys are available
Thomas Müller [Mon, 14 Mar 2016 15:15:10 +0000 (16:15 +0100)]
Merge pull request #22946 from owncloud/backport-22800-stable8.1
[8.1] don't hide server not available exception, fixes #20536
Vincent Petry [Mon, 14 Mar 2016 14:51:08 +0000 (15:51 +0100)]
Merge pull request #23149 from owncloud/stable8.1-fix-broken-interface
[stable8.1] Fix broken scanner call in ajax/scan.php
Morris Jobke [Fri, 11 Mar 2016 11:43:06 +0000 (12:43 +0100)]
Fix broken scanner call in ajax/scan.php
Morris Jobke [Wed, 9 Mar 2016 07:44:28 +0000 (08:44 +0100)]
Merge pull request #22843 from owncloud/stable81_22830
[Stable 8.1] Rename and move permissions are set when a file is updatable
C Montero-Luque [Tue, 8 Mar 2016 14:03:58 +0000 (09:03 -0500)]
8.1.6
Arthur Schiwon [Thu, 3 Mar 2016 00:15:36 +0000 (01:15 +0100)]
don't hide server not available exception, fixes #20536
C Montero-Luque [Fri, 4 Mar 2016 23:16:06 +0000 (18:16 -0500)]
8.1.6 RC2
C. Montero Luque [Fri, 4 Mar 2016 18:36:07 +0000 (13:36 -0500)]
Merge pull request #22863 from owncloud/stable8.1-trashbin-checkpath
[stable8.1] Properly check path validity before deleting to trash
Vincent Petry [Fri, 4 Mar 2016 14:27:31 +0000 (15:27 +0100)]
Properly check path validity before deleting to trash
This prevents deleting the whole "files" folder of the user whenever
$ownerPath is empty. This can happen in concurrency situations.
Roeland Jago Douma [Thu, 3 Mar 2016 18:47:35 +0000 (19:47 +0100)]
Rename and move permissions are set when a file is updatable
* Fix unit tests
C Montero-Luque [Wed, 2 Mar 2016 01:41:49 +0000 (20:41 -0500)]
8.1.6 RC1
Thomas Müller [Tue, 1 Mar 2016 13:47:35 +0000 (14:47 +0100)]
Merge pull request #22409 from owncloud/stable8.1-gdrive-reindexarraytoduetoduplicates
[stable8.1] Reindex array in GDrive after removing duplicates
Morris Jobke [Tue, 1 Mar 2016 12:43:22 +0000 (13:43 +0100)]
Merge pull request #22617 from owncloud/backport-22358-stable8.1
[backport][stable8.1] Fix race condition when switching filter mode
Roeland Douma [Mon, 29 Feb 2016 10:26:42 +0000 (11:26 +0100)]
Merge pull request #22630 from owncloud/stable8.1-fedshare-testremote-after-404
[stable8.1] Properly trigger testRemote after getting a 404 from remote fed share
Vincent Petry [Thu, 25 Feb 2016 15:49:23 +0000 (16:49 +0100)]
Merge pull request #22634 from owncloud/stable8.1-backport-22565
[stable8.1] Avoids scanning the root storage
Morris Jobke [Thu, 25 Feb 2016 14:30:45 +0000 (15:30 +0100)]
Merge pull request #22632 from owncloud/stable8.1-backport-18762
[stable8.1] Use "json_encode" and "json_decode" instead of unserialize
Björn Schießle [Thu, 25 Feb 2016 13:59:24 +0000 (14:59 +0100)]
Merge pull request #22627 from owncloud/fix_broken_unencrypted_size_8.1
[stable8.1] Heal unencrypted file sizes at download time
Bjoern Schiessle [Mon, 22 Feb 2016 16:28:53 +0000 (17:28 +0100)]
recalculate unencrypted size if we assume that the size stored in the db is not correct
Morris Jobke [Mon, 22 Feb 2016 13:30:32 +0000 (14:30 +0100)]
Avoids scanning the root storage
This check will skip the background scan for the root storage
because there is nothing in the root storage that isn't already
in another (mostly user-) storage.
Fixes #22501
Morris Jobke [Fri, 29 Jan 2016 06:51:16 +0000 (07:51 +0100)]
[user_ldap] properly decode cached objects
* fixes #21896
Vincent Petry [Thu, 18 Feb 2016 10:57:03 +0000 (11:57 +0100)]
Properly trigger testRemote after getting a 404 from remote fed share
Whenever a remote fed share's shareinfo call returns a 404, don't
directly assume the storage is not available by throwing
StorageNotAvailableException. We need to properly throw
NotFoundException to trigger the later logic that calls testRemote()
that verifies that the 404 is not from a broken server but really from
an obsolete share.
Lukas Reschke [Wed, 2 Sep 2015 10:12:31 +0000 (12:12 +0200)]
Use "json_encode" and "json_decode" instead of unserialize
Arthur Schiwon [Fri, 12 Feb 2016 20:51:06 +0000 (21:51 +0100)]
Fix race condition when switching filter mode. Fixes #22278
Morris Jobke [Wed, 24 Feb 2016 10:09:59 +0000 (11:09 +0100)]
Merge pull request #22572 from owncloud/stable8.1-backport-21544
[stable8.1] set etag and permission fields for trashbin entries
Roeland Douma [Mon, 22 Feb 2016 14:48:20 +0000 (15:48 +0100)]
Merge pull request #22558 from owncloud/backport-22496-share-group-problem-8.1
[8.1] Fix on shared groups assignment.
Robin Appelman [Fri, 8 Jan 2016 12:07:23 +0000 (13:07 +0100)]
set etag and permission fields for trashbin entries
Leonardo Diez [Fri, 12 Feb 2016 18:26:54 +0000 (19:26 +0100)]
Fix on shared groups assignment.
Morris Jobke [Tue, 16 Feb 2016 08:26:54 +0000 (09:26 +0100)]
Merge pull request #22373 from owncloud/stable8.1-backport-22369
[stable8.1] Fix BMP support
Roeland Douma [Mon, 15 Feb 2016 18:39:34 +0000 (19:39 +0100)]
Merge pull request #22363 from owncloud/backport-20152-stable8.1
[stable8.1] Remove invalid type-cast
Vincent Petry [Mon, 15 Feb 2016 16:47:19 +0000 (17:47 +0100)]
Reindex array in GDrive after removing duplicates
Whenever duplicates are removed from the array, the indices are not in
sequence. This seems to cause trouble with opendir/the dir wrapper and
make it skip valid entries.
This fix reindexes the array to make it work.
Morris Jobke [Sat, 13 Feb 2016 20:55:20 +0000 (21:55 +0100)]
Fix BMP support
* fixes #16461
Lukas Reschke [Thu, 29 Oct 2015 14:04:11 +0000 (15:04 +0100)]
Remove invalid type-cast
This is an `is_array` operation and not a `in_array` one. Thus this typecast is not required.
Fixes https://github.com/owncloud/core/issues/20095
Morris Jobke [Sat, 6 Feb 2016 08:27:13 +0000 (09:27 +0100)]
Merge pull request #22173 from owncloud/stable8.1-backport-22143
[Stable 8.1] When a user is removed we should remove the right shares
Roeland Jago Douma [Fri, 5 Feb 2016 09:01:59 +0000 (10:01 +0100)]
When a user is removed we should remove the right shares
* This means all the shares directly shared with them
* Or all group shares having a special share with them
This patch fixes the operator precedece (AND before OR).
So before this patch:
(share_with = <deleted user> AND share_type = 0) OR share_type=2
So it deleted all user specific shares
Now:
share_with = <deleted user> AND (share_type = 0 OR (share_type=2)
Morris Jobke [Mon, 25 Jan 2016 07:24:02 +0000 (08:24 +0100)]
Merge pull request #21864 from owncloud/sync-certificates-with-upstream-81
[stable8.1] Sync certificates with upstream
Lukas Reschke [Fri, 22 Jan 2016 21:12:21 +0000 (22:12 +0100)]
Sync certificates with upstream
Thomas Müller [Mon, 18 Jan 2016 13:16:09 +0000 (14:16 +0100)]
Merge pull request #21748 from owncloud/stable8.1-backport-20927
[stable8.1] Handle return code of streamCopy in WebDAV put
Morris Jobke [Thu, 3 Dec 2015 14:27:56 +0000 (15:27 +0100)]
Handle return code of streamCopy in WebDAV put
* throw a different exception if streamCopy failed
Thomas Müller [Fri, 15 Jan 2016 12:19:16 +0000 (13:19 +0100)]
Merge pull request #21694 from owncloud/stable8.1-users-scrolltop
[stable8.1] Keep scroll position in users page when sorting
Vincent Petry [Thu, 7 Jan 2016 14:48:59 +0000 (15:48 +0100)]
Keep scroll position in users page when sorting
When sorting, some browsers like Chrome will lose the scroll position,
possibly because the sorting code is touching the DOM elements.
This fix saves the scroll position before sorting and sets it back
afterwards.
Vincent Petry [Wed, 13 Jan 2016 09:45:16 +0000 (10:45 +0100)]
Merge pull request #21665 from owncloud/smb-statcache-cap-81
[8.1] cap the number of entries we cache in smb's statcache
Robin Appelman [Tue, 12 Jan 2016 12:14:04 +0000 (13:14 +0100)]
cap the number of entries we cache in smb's statcache
Morris Jobke [Tue, 12 Jan 2016 09:31:45 +0000 (10:31 +0100)]
Merge pull request #21632 from owncloud/backport-17924-stable8.1
[backport] [stable8.1] always use an LDAP URL when connecting to LDAP
Arthur Schiwon [Tue, 28 Jul 2015 10:14:05 +0000 (12:14 +0200)]
always use an LDAP URL when connecting to LDAP
Morris Jobke [Mon, 11 Jan 2016 10:33:47 +0000 (11:33 +0100)]
Merge pull request #21564 from owncloud/ext-smb-dep-stable8.1
[stable8.1] Check libsmbclient-php as well as smbclient binary
Robin McCorkell [Wed, 6 Jan 2016 11:51:56 +0000 (11:51 +0000)]
Check libsmbclient-php as well as smbclient binary
Vincent Petry [Fri, 8 Jan 2016 11:22:19 +0000 (12:22 +0100)]
Merge pull request #21314 from owncloud/scanner-skip-not-available-81
[8.1] Skip unavailable storages in scanner
Robin Appelman [Fri, 27 Nov 2015 13:28:15 +0000 (14:28 +0100)]
also log exception
Robin Appelman [Fri, 27 Nov 2015 13:02:50 +0000 (14:02 +0100)]
Skip unavailable storages in scanner
Morris Jobke [Tue, 5 Jan 2016 15:02:22 +0000 (16:02 +0100)]
Merge pull request #21463 from owncloud/stable8.1-fix-callable-ajax-scan
listen() requires a callable and not an array
Morris Jobke [Tue, 5 Jan 2016 13:33:25 +0000 (14:33 +0100)]
listen() requires a callable and not an array
* fixes #21350
* fixes regression introduced with #20764
Morris Jobke [Tue, 5 Jan 2016 12:44:14 +0000 (13:44 +0100)]
Merge pull request #21296 from owncloud/stable8.1-prevent0bytedownloads
[stable8.1] prevent 0 byte downloads when storage returns false
Vincent Petry [Thu, 24 Dec 2015 14:55:37 +0000 (15:55 +0100)]
Merge pull request #21263 from owncloud/backport-21260-stable8.1
[backport] [stable8.1] initialize l10n instance earlier, fixes an undefined var warning foll…
Thomas Müller [Wed, 23 Dec 2015 06:10:28 +0000 (07:10 +0100)]
Merge pull request #21340 from owncloud/fix-unit-tests
[stable8.1] Fix unit tests
Lukas Reschke [Tue, 22 Dec 2015 20:24:47 +0000 (21:24 +0100)]
Fix unit tests
Morris Jobke [Tue, 22 Dec 2015 18:15:27 +0000 (19:15 +0100)]
Merge pull request #21235 from owncloud/stable8.1-backport-21232
[stable8.1] Use name of ICollection for exception message
Morris Jobke [Tue, 22 Dec 2015 18:13:15 +0000 (19:13 +0100)]
Merge pull request #21275 from owncloud/stable81_20884
[Stable 8.1] [Sharing] Respect disabled incoming federated shares
Morris Jobke [Tue, 22 Dec 2015 18:11:53 +0000 (19:11 +0100)]
Merge pull request #21294 from owncloud/backport-21255-stable8.1
user management: show password error temporary (backport for stable8.1)
C Montero-Luque [Mon, 21 Dec 2015 12:23:26 +0000 (07:23 -0500)]
8.1.5
C Montero-Luque [Fri, 18 Dec 2015 22:32:43 +0000 (17:32 -0500)]
8.1.5 RC2
Robin Appelman [Wed, 16 Sep 2015 11:40:12 +0000 (13:40 +0200)]
add unit test
Jörn Friedrich Dreyer [Wed, 16 Sep 2015 09:07:13 +0000 (11:07 +0200)]
prevent 0 byte downloads when storage returns false
michag86 [Thu, 17 Dec 2015 11:43:44 +0000 (12:43 +0100)]
Update users.js
Roeland Jago Douma [Wed, 2 Dec 2015 08:00:21 +0000 (09:00 +0100)]
[Sharing] Respect disabled incoming federated shares
Only fetch the incoming federated shares if incoming shares are actually
enabled.
Fixes #20713
Arthur Schiwon [Thu, 17 Dec 2015 14:01:21 +0000 (15:01 +0100)]
initialize l10n instance earlier, fixes an undefined var warning followed by a php error
Morris Jobke [Wed, 16 Dec 2015 14:03:50 +0000 (15:03 +0100)]
add unit test for #21230
Morris Jobke [Wed, 16 Dec 2015 13:44:28 +0000 (14:44 +0100)]
Use name of ICollection for exception message
* fixes #21230
C Montero-Luque [Tue, 15 Dec 2015 21:07:51 +0000 (16:07 -0500)]
8.1.5 RC1
Vincent Petry [Tue, 15 Dec 2015 17:43:47 +0000 (18:43 +0100)]
Merge pull request #21207 from owncloud/backport-21133-stable8.1
[backport] [stable8.1] Fix shared files of deleted users, detect DN change when checking for existence on LDAP
Vincent Petry [Tue, 15 Dec 2015 17:43:05 +0000 (18:43 +0100)]
Merge pull request #21210 from owncloud/stable8.1-handle-enforce-home-folder-rule-setting
[stable8.1] Properly handle enforce home folder naming rule setting
Björn Schießle [Tue, 15 Dec 2015 13:56:23 +0000 (14:56 +0100)]
Merge pull request #21199 from owncloud/fix_20296_8.1
[stable8.1] don't allow to create a federated share if source and target are the same
Vincent Petry [Mon, 14 Dec 2015 17:00:35 +0000 (18:00 +0100)]
Fixed JS unit tests for fed owner display name
Björn Schießle [Mon, 14 Dec 2015 15:04:05 +0000 (16:04 +0100)]
show display name but internally use the user name
Björn Schießle [Wed, 9 Dec 2015 11:00:00 +0000 (12:00 +0100)]
don't allow to create a federated share if source and target server are the same
Morris Jobke [Tue, 15 Dec 2015 09:10:53 +0000 (10:10 +0100)]
Properly handle enforce home folder naming rule setting
Arthur Schiwon [Mon, 14 Dec 2015 21:42:27 +0000 (22:42 +0100)]
fix find DN by UUID for AD
Arthur Schiwon [Fri, 11 Dec 2015 16:25:57 +0000 (17:25 +0100)]
unit test on getHome in combination with OfflineUser
Arthur Schiwon [Fri, 11 Dec 2015 11:52:12 +0000 (12:52 +0100)]
adjust unit test
Arthur Schiwon [Fri, 11 Dec 2015 00:56:53 +0000 (01:56 +0100)]
look for DN changes before marking a user as deleted
Arthur Schiwon [Thu, 10 Dec 2015 23:12:41 +0000 (00:12 +0100)]
throw NoUserException in getHome when the requested user does not exist anymore
Morris Jobke [Mon, 14 Dec 2015 16:31:57 +0000 (17:31 +0100)]
Merge pull request #21151 from owncloud/backport-20978-stable8.1
reset mailadress/displayname on blur (backport for stable8.1)
Lukas Reschke [Mon, 14 Dec 2015 15:35:16 +0000 (16:35 +0100)]
Merge pull request #21193 from owncloud/preview-non-existing-81
[8.1] Handle non existing files in version previews
Robin Appelman [Mon, 14 Dec 2015 14:59:36 +0000 (15:59 +0100)]
Handle non existing files in version previews
Thomas Müller [Mon, 14 Dec 2015 11:27:18 +0000 (12:27 +0100)]
Merge pull request #21156 from owncloud/trashbin-loggedout-81
[8.1] Fix trashbin wrapper when no user is loggedin
Lukas Reschke [Mon, 30 Nov 2015 14:40:10 +0000 (15:40 +0100)]
Use XMLWriter to generate response
Gets rid of manual XML generation.
Robin Appelman [Fri, 11 Dec 2015 13:29:38 +0000 (14:29 +0100)]
skip test if we cant use the filesystem when not logged in
Robin Appelman [Tue, 27 Oct 2015 11:10:23 +0000 (12:10 +0100)]
Fix thrashbin wrapper when no user is loggedin
michag86 [Mon, 7 Dec 2015 08:48:54 +0000 (09:48 +0100)]
reset mailadress/displayname on blur
Vincent Petry [Thu, 10 Dec 2015 17:00:05 +0000 (18:00 +0100)]
Merge pull request #21091 from owncloud/backport-20995-stable8.1
[backport] [stable8.1] ensure multiselect always receives an array when setting its value, f…
Vincent Petry [Thu, 10 Dec 2015 15:37:23 +0000 (16:37 +0100)]
Merge pull request #21116 from owncloud/stable8.1-backport-21109
[stable8.1] Deduplicate version expire jobs
Morris Jobke [Thu, 10 Dec 2015 10:21:28 +0000 (11:21 +0100)]
Deduplicate version expire jobs
* versionSize is calculated anyway in the expire job - > dropped
* offset/neededSpace was needed for expiry before the file is moved to the versions -> now this is included already in the currently used space because the expiry job is defered to a point in time after the version creation
* fixes #21108
Vincent Petry [Thu, 10 Dec 2015 12:44:05 +0000 (13:44 +0100)]
Merge pull request #21102 from owncloud/stable8.1_20989
[Stable8.1] Update parent when moving share into recieved share
Roeland Jago Douma [Mon, 7 Dec 2015 12:24:16 +0000 (13:24 +0100)]
Update parent when moving share into recieved share
Fixes #20769
When I receive a share and move a share of myself into that share (which
is allowed currently) I effectively hand over ownership of the files I
move. So we need to update the share I move to have as a parent the
share I move it into. Else our mounting system gets confused.