]>
source.dussan.org Git - nextcloud-server.git/log
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
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
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.
Morris Jobke [Thu, 10 Dec 2015 08:35:56 +0000 (09:35 +0100)]
Merge pull request #21081 from owncloud/stable8.1-share-computesharepermissions-notstore
[stable8.1] Fix (re)share permission checks in a few code paths
Arthur Schiwon [Mon, 7 Dec 2015 14:14:49 +0000 (15:14 +0100)]
ensure multiselect always receives an array when setting its value, fixes #18734
Vincent Petry [Wed, 9 Dec 2015 18:57:33 +0000 (19:57 +0100)]
Merge pull request #21085 from owncloud/occ-shall-not-fail-hard-in-maintenance-mode-stable8.1
Don't load commands of apps when in maintenance mode
Thomas Müller [Wed, 9 Dec 2015 14:15:10 +0000 (15:15 +0100)]
Don't load commands of apps when in maintenance mode - fixes #20939
Vincent Petry [Tue, 8 Dec 2015 15:48:33 +0000 (16:48 +0100)]
Add explicit check for groups excluded from sharing
Since isSharable() doesn't do the check for groups excluded from
sharing, adding an explicit check in the sharing code.
Vincent Petry [Tue, 8 Dec 2015 15:33:39 +0000 (16:33 +0100)]
Fix more unit tests to pass a mock storage instead of null to FileInfo
Vincent Petry [Tue, 8 Dec 2015 12:02:57 +0000 (13:02 +0100)]
Add reshare permission checks
Added in isSharable() in incoming remote share.
Added in isSharable() in regular incoming share.
Added in FileInfo to make sure the proper attributes are returned to the
clients.
Vincent Petry [Tue, 8 Dec 2015 10:32:18 +0000 (11:32 +0100)]
Compute share permissions in the view
The share permissions are now computed in the View/FileInfo instead of
storing them directly/permanently on the storage
Morris Jobke [Tue, 8 Dec 2015 16:34:43 +0000 (17:34 +0100)]
Merge pull request #21042 from owncloud/backport-21037-stable8.1
[backport][stable8.1] passing an empty base in this diagnosis call will not result in LDAP…
Arthur Schiwon [Tue, 8 Dec 2015 11:31:58 +0000 (12:31 +0100)]
passing an empty base in this diagnosis call will not result in LDAP errors
Neither in "Invalid DN syntax" nor in "Object not found"
Morris Jobke [Mon, 7 Dec 2015 15:25:20 +0000 (16:25 +0100)]
Merge pull request #20999 from owncloud/backport-20981-multiple-emails-for-sharelink-8.1
[8.1] Allow sending a share email to multiple users
Thomas Müller [Mon, 7 Dec 2015 15:19:04 +0000 (16:19 +0100)]
Merge pull request #20986 from owncloud/use-proper-logexception-stable8.1
ILogger has no logException()
Joas Schilling [Mon, 7 Dec 2015 11:01:02 +0000 (12:01 +0100)]
Add a unit test for single user case as well
Joas Schilling [Mon, 7 Dec 2015 09:49:34 +0000 (10:49 +0100)]
Allow sending a share email to multiple users
Thomas Müller [Mon, 7 Dec 2015 11:11:00 +0000 (12:11 +0100)]
ILogger has no logException() - fixes #20797
Vincent Petry [Fri, 4 Dec 2015 16:45:24 +0000 (17:45 +0100)]
Merge pull request #20795 from owncloud/stable8.1-backport-20790
[stable8.1] Deduplicate queued trashbin expire jobs
Morris Jobke [Fri, 4 Dec 2015 14:55:57 +0000 (15:55 +0100)]
Merge pull request #20956 from owncloud/stable8.1-backport-20877
[stable8.1] Check the expiration date for null
Morris Jobke [Tue, 1 Dec 2015 16:43:05 +0000 (17:43 +0100)]
Check the expiration date for null
* null is always less than any value -> expirationDate gets null
which is "no date set"
* ref https://github.com/owncloud/core/issues/20590#issuecomment-
158393075
Vincent Petry [Thu, 3 Dec 2015 15:40:20 +0000 (16:40 +0100)]
Merge pull request #20489 from owncloud/backport-20487-8.1
[8.1] Activity oracle sql error for favorites
Thomas Müller [Mon, 30 Nov 2015 21:46:11 +0000 (22:46 +0100)]
Merge pull request #20831 from owncloud/catch-missing-route-81
[8.1] Dont die when we're missing a route
Robin Appelman [Fri, 27 Nov 2015 12:51:20 +0000 (13:51 +0100)]
Dont die when we're missing a route
Morris Jobke [Fri, 27 Nov 2015 13:01:03 +0000 (14:01 +0100)]
Deduplicate queued trashbin expire jobs
* fixes #20425
* this removes the argument trashbin size from the expire job - it is now
calculated in the expire job
* the queue now detects properly that the job is already queue and doesn't
add it again
Vincent Petry [Thu, 26 Nov 2015 15:40:03 +0000 (16:40 +0100)]
Merge pull request #20764 from owncloud/scan-eventsource-no-paths-81
[8.1] Dont output paths in scan.php
Robin Appelman [Wed, 25 Nov 2015 14:21:01 +0000 (15:21 +0100)]
Dont output paths in scan.php
Morris Jobke [Wed, 25 Nov 2015 09:25:11 +0000 (10:25 +0100)]
Merge pull request #20698 from owncloud/stable8.1-backport-19530
[stable8.1] Make sure the share we found is for the same item
Joas Schilling [Mon, 5 Oct 2015 10:36:16 +0000 (12:36 +0200)]
Add a unit test for "share a file inside a folder that is already shared"
Joas Schilling [Mon, 5 Oct 2015 10:03:36 +0000 (12:03 +0200)]
Make sure all variables are defined
Joas Schilling [Fri, 2 Oct 2015 11:07:20 +0000 (13:07 +0200)]
Make sure the share we found is for the same item
Morris Jobke [Mon, 23 Nov 2015 10:39:33 +0000 (11:39 +0100)]
Merge pull request #20678 from owncloud/backport-joblist-fix-8.1
[8.1] Make the JobList test more robust by sorting the result of getAll bef…
Joas Schilling [Thu, 19 Nov 2015 08:25:34 +0000 (09:25 +0100)]
Make the JobList test more robust by sorting the result of getAll before comparison
Morris Jobke [Fri, 20 Nov 2015 15:46:46 +0000 (16:46 +0100)]
Merge pull request #20637 from owncloud/cache-escape-like-81
[8.1] Escape like parameter in cache operations
Robin Appelman [Tue, 10 Nov 2015 12:14:32 +0000 (13:14 +0100)]
escape like parameter in cache move
Robin Appelman [Thu, 5 Nov 2015 15:29:25 +0000 (16:29 +0100)]
Add test for special character during move
Robin Appelman [Fri, 29 May 2015 12:19:27 +0000 (14:19 +0200)]
define escape character for like statements on oracle
Robin Appelman [Thu, 28 May 2015 14:16:59 +0000 (16:16 +0200)]
define escape character for like statements on sqlite
Joas Schilling [Wed, 18 Nov 2015 09:32:29 +0000 (10:32 +0100)]
Add a unit test that executes the query
Joas Schilling [Fri, 13 Nov 2015 09:32:45 +0000 (10:32 +0100)]
Oracle can not return statements but only values
So evaluate the condition directly and return 1 or 0
Morris Jobke [Tue, 10 Nov 2015 15:00:46 +0000 (16:00 +0100)]
Merge pull request #20307 from owncloud/stable8.1-backport-use-actual-mimetype-detection-instad-of-oath-1
[stable8.1] Use actual mimetype detection instead of extension
Lukas Reschke [Fri, 30 Oct 2015 23:55:37 +0000 (00:55 +0100)]
Use actual mimetype detection instead of extension
We cannot rely on the extension as the file may also be a valid TAR or ZIP file without such content. Especially when getting resources from the ownCloud appstore.
Morris Jobke [Mon, 9 Nov 2015 13:01:06 +0000 (14:01 +0100)]
Merge pull request #20395 from owncloud/stable8.1-extstorage-gdrive-forceapproval
[stable8.1] Force approval in GDrive oauth to get refresh_token
Vincent Petry [Fri, 6 Nov 2015 11:35:28 +0000 (12:35 +0100)]
Force approval in GDrive oauth to get refresh_token
Forcing the approval of app permissions makes sure that the GDrive API
will always return a refresh_token.
In the case of apps that were already authorized for the current user/domain,
the API doesn't return the refresh_token which causes expiration issues.
Morris Jobke [Mon, 9 Nov 2015 07:10:27 +0000 (08:10 +0100)]
Merge pull request #20367 from owncloud/stable8.1-backport-20346
[stable8.1] Show the language code in personal settings for unknown languages
Morris Jobke [Fri, 6 Nov 2015 14:26:19 +0000 (15:26 +0100)]
Merge pull request #20362 from owncloud/backport-20271-stable8.1
[Backport] [stable8.1] attempt to connect to backup server again
Morris Jobke [Fri, 6 Nov 2015 08:48:05 +0000 (09:48 +0100)]
Show the language code in personal settings for unknown languages
Steps to reproduce:
* having an unknown language set in oc_preferences
* browse the personal settings
* only get listed the first letter of this language in the language chooser
Arthur Schiwon [Tue, 3 Nov 2015 23:18:35 +0000 (00:18 +0100)]
integration tests
Arthur Schiwon [Tue, 3 Nov 2015 16:17:00 +0000 (17:17 +0100)]
LDAP: attempt to connect to backup server again, if main server is not available. Fixes #18701
Vincent Petry [Thu, 5 Nov 2015 16:26:23 +0000 (17:26 +0100)]
Merge pull request #20246 from owncloud/backport-20192-stable8.1
[backport] [stable8.1] if a user that is flag as deleted shows up again, remove that flag. F…
Vincent Petry [Thu, 5 Nov 2015 09:29:46 +0000 (10:29 +0100)]
Merge pull request #20286 from owncloud/stable8.1-share-preventmovemountpointintosharedfolder
[stable8.1] Prevent moving mount point into already shared folder (outgoing)
Morris Jobke [Wed, 4 Nov 2015 15:17:43 +0000 (16:17 +0100)]
Merge pull request #20298 from owncloud/backport-20155-8.1
[backport] [stable8.1] add port to host only, if an URL is used instead of a plain hostname
Arthur Schiwon [Thu, 29 Oct 2015 15:21:02 +0000 (16:21 +0100)]
add port to host only, if an URL is used instead of a plain hostname
Vincent Petry [Fri, 2 Oct 2015 10:14:24 +0000 (12:14 +0200)]
Prevent moving mount point into already shared folder (outgoing)
It is already not allowed to share a folder containing mount points /
incoming shares.
This fixes an issue that made it possible to bypass the check by moving
the incoming share mount point into an existing outgoing share folder.
Morris Jobke [Tue, 3 Nov 2015 12:22:53 +0000 (13:22 +0100)]
Merge pull request #20163 from owncloud/backport-19489
[stable8.1] fix possible infinite loop when reading groups in the wizard
Arthur Schiwon [Fri, 30 Oct 2015 18:20:42 +0000 (19:20 +0100)]
if a user that is flag as deleted shows up again, remove that flag. Fixes #20090
Conflicts:
apps/user_ldap/lib/access.php
Morris Jobke [Mon, 2 Nov 2015 08:01:55 +0000 (09:01 +0100)]
Merge pull request #19773 from owncloud/stable8.1-proppatch-lastmodified
[stable8.1] Fix mtime PROPPATCH to be "lastmodified" instead of "getlastmodified"
Morris Jobke [Mon, 2 Nov 2015 08:01:21 +0000 (09:01 +0100)]
Merge pull request #20137 from owncloud/LukasReschke-patch-2
[stable8.1] Update certificate bundle
C Montero-Luque [Fri, 30 Oct 2015 16:45:25 +0000 (12:45 -0400)]
8.1.4
Arthur Schiwon [Wed, 30 Sep 2015 22:30:05 +0000 (00:30 +0200)]
fix possible infinite loop when reading groups in the wizard
Lukas Reschke [Thu, 29 Oct 2015 09:36:35 +0000 (10:36 +0100)]
[stable8.1] Update certificate bundle
Backport of https://github.com/owncloud/core/pull/20126
C Montero-Luque [Wed, 28 Oct 2015 14:22:39 +0000 (10:22 -0400)]
8.1.4 RC2
Thomas Müller [Wed, 28 Oct 2015 10:09:01 +0000 (11:09 +0100)]
Merge pull request #19512 from owncloud/backport-19419-stable8.1
[backport] [stable8.1] memberOf resembles a DN as well and is actively used
Thomas Müller [Wed, 28 Oct 2015 08:24:19 +0000 (09:24 +0100)]
fixing typo
Arthur Schiwon [Mon, 28 Sep 2015 16:38:57 +0000 (18:38 +0200)]
memberOf resembles a DN as well and is actively used
Conflicts:
apps/user_ldap/tests/access.php
Morris Jobke [Tue, 27 Oct 2015 13:08:26 +0000 (14:08 +0100)]
Merge pull request #19972 from owncloud/stable8.1-backport-19635
[stable8.1] allow an attribute to return more than one value
Thomas Müller [Mon, 26 Oct 2015 21:04:14 +0000 (22:04 +0100)]
Merge pull request #20064 from owncloud/stable8.1-add-warning-for-php7
[stable8.1] Stop processing if PHP 7 is used