upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-05-18 03:20:51 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 11
47577 commits 940 branches 1208 tags 8.3 GiB
Commit graph

9166 commits

Author SHA1 Message Date
Robin Appelman
54b14946b4 handle long etags from dav external storage 
we can only store etags up to 40 characters long in the database, so when we get an etag that's longer we simply hash it to bring down the length

Signed-off-by: Robin Appelman <robin@icewind.nl>
 2019-03-14 16:19:09 +00:00
Morris Jobke
144cf16221 Remove sensitive SMB arguments from exception log 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2019-03-13 13:00:57 +00:00
Morris Jobke
42cd3876d4
Merge pull request #14597 from nextcloud/backport/14425/stable15 
[stable15] Do not calculate folder size for parent that also needs proper scan, fixes #3524
 2019-03-08 17:31:54 +01:00
Ari Selseng
264b4ad3a9 Avoid calculating folder size for parent that needs scan. 
Signed-off-by: Ari Selseng <ari@selseng.net>
 2019-03-08 08:14:33 +00:00
Marius Blüm
7fa1cfcb17 Remove Google+ from Social Sharing Bundle (2) 
Signed-off-by: Marius Blüm <marius@lineone.io>
 2019-03-08 08:06:52 +00:00
Roeland Jago Douma
30e790606e Use a tmp file for swift writes 
Else this leads to a seekable stream error with chunked uploads

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-03-06 14:34:15 +00:00
Morris Jobke
3acee4f1b4
Merge pull request #14416 from nextcloud/backport/14343/stable15 
[stable15] Parse multiple navigation items
 2019-03-06 13:16:25 +01:00
Daniel Kesselberg
f32fd975cb Generate id for navigation item 
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
 2019-02-27 15:09:32 +00:00
Daniel Kesselberg
ee9eba54e5 Parse multiple navigation items 
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
 2019-02-27 15:09:31 +00:00
Tomasz Paluszkiewicz
e690658018 changed order of methods 
Signed-off-by: Tomasz Paluszkiewicz <tomasz.paluszkiewicz@gmail.com>
 2019-02-26 13:42:41 +00:00
Tomasz Paluszkiewicz
22cfc5b87f fix(EMailTemplate): malformed HTML in some cases 
when an addBodyListItem() is not directly followed by addBodyButton(), resulting HTML is broken

Signed-off-by: Tomasz Paluszkiewicz <tomasz.paluszkiewicz@gmail.com>
 2019-02-26 13:42:40 +00:00
Roeland Jago Douma
8ea0e721ed Always query lookup server in GS mode 
Without the lookupserver GS is kind of useless.
If the admin places their lookup sever outside of the reachable network
that is not something we can help.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-02-25 09:24:30 +00:00
Joas Schilling
5b22b1e6c8 Fix "Undefined index: user_uid" on login page 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2019-02-22 11:43:13 +00:00
Morris Jobke
37cb480900
Merge pull request #14312 from nextcloud/backport/14255/stable15 
[stable15] Fix ocm end-point discovery discovery
 2019-02-20 16:46:30 +01:00
Bjoern Schiessle
2bf2633c05
make sure that the ocm end-point discovery /ocm-provider is not redirected to the index.php 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2019-02-20 15:41:38 +01:00
Morris Jobke
52662fb928
Merge pull request #14308 from nextcloud/backport/14178/stable15 
[stable15] Fix OC.getCurrentUser() on guest pages
 2019-02-20 15:31:37 +01:00
Roeland Jago Douma
c9a4f010dc
Merge pull request #14273 from nextcloud/backport/14210/stable15 
[stable15] Fix empty file uploads to S3 (and other streaming storages)
 2019-02-20 15:26:36 +01:00
Joas Schilling
2f98c873fa Fix OC.getCurrentUser() on guest pages 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2019-02-20 12:22:31 +00:00
Roeland Jago Douma
6e110c35b0
Merge pull request #14275 from nextcloud/backport/12573/stable15 
[stable15] Do not do redirect handling when loggin out
 2019-02-20 08:55:30 +01:00
Daniel Kesselberg
30c69e6394 Set false as default for requirePNG 
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
 2019-02-19 13:59:01 +00:00
Joas Schilling
5823cd652c Correctly determinate the owner in case of shared external storages 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2019-02-19 09:29:17 +00:00
Roeland Jago Douma
58fd016b27
Fix empty file uploads to S3 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-02-19 10:16:11 +01:00
Roeland Jago Douma
78842d29b3
Do not do redirect handling when loggin out 
Fixes #12568
Since the clearing of the execution context causes another reload. We
should not do the redirect_uri handling as this results in redirecting
back to the logout page on login.

This adds a simple middleware that will just check if the
ClearExecutionContext session variable is set. If that is the case it
will just redirect back to the login page.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-02-18 22:22:12 +01:00
Roeland Jago Douma
c021b5bfc6
Merge pull request #14195 from nextcloud/backport/14185/stable15 
[stable15] Fix recent files
 2019-02-14 21:18:20 +01:00
Roeland Jago Douma
a26a0bf75d
Merge pull request #14085 from nextcloud/backport/14023/stable15 
[stable15] Fix: Check if `$this->params['user']` is an array
 2019-02-14 19:47:43 +01:00
Roeland Jago Douma
8373adacd6 Filter out versions and trashbin 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-02-14 10:27:43 +00:00
Roeland Jago Douma
e31c94ac64 Loop for the recent search 
Else it might happen that less entries than requested are returned

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-02-14 10:27:43 +00:00
Roeland Jago Douma
092baa0e5a We need to initialize the storage else the jailed path is always null 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-02-14 10:27:42 +00:00
Roeland Jago Douma
096498c033 Fix the thorrtler whitelist bitmask 
Before we actually didn't check each bit of the bitmask. Now we do.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-02-12 07:56:07 +00:00
William Pain
602cea074f Fix: Check if $this->params['user'] is an array 
Signed-off-by: William Pain <pain.william@gmail.com>
 2019-02-07 13:33:18 +00:00
Christoph Wurst
13eb255277 Fix typos and unused return values 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2019-01-30 19:08:20 +00:00
Bjoern Schiessle
1c88b907a3 fix typo 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2019-01-30 19:08:19 +00:00
Bjoern Schiessle
0a1e776006 log full exception 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2019-01-30 19:08:18 +00:00
Bjoern Schiessle
f22465e364 handle mail send error gracefully 
log the error in case a notification mail of a new share couldn't
be send to the recipient and finish the share operation successfully

Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2019-01-30 19:08:17 +00:00
Morris Jobke
657621b980
Merge pull request #13906 from nextcloud/backport/13237/stable15 
[stable15] Improve data directory write checking for NFS mounts
 2019-01-30 14:28:43 +01:00
Roeland Jago Douma
355b0defe4
Clean pending 2FA authentication on password reset 
When a password is reste we should make sure that all users are properly
logged in. Pending states should be cleared. For example a session where
the 2FA code is not entered yet should be cleared.

The token is now removed so the session will be killed the next time
this is checked (within 5 minutes).

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-01-30 10:41:09 +01:00
Robert Dailey
ff4dc3b66b Improve data directory write checking for NFS mounts 
If `is_writable()` fails, fall back to logic that attempts to create a file
and then checks if it exists. If this check fails, an error occurs as it
did before.

Discussion on this solution was found here:
https://help.nextcloud.com/t/write-errors-for-nfs-mount/23328

Fixes #7124

Signed-off-by: Robert Dailey <rcdailey@gmail.com>
 2019-01-30 08:39:45 +00:00
Robin Appelman
ff5f28a65e always use multipart uploader for s3 uploads 
the multipart uploader handles non seekable streams while `upload` does not

Signed-off-by: Robin Appelman <robin@icewind.nl>
 2019-01-29 10:17:07 +00:00
Morris Jobke
c7ea554c62 Show proper default locale 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2019-01-24 07:32:26 +00:00
Morris Jobke
09db2bc701
Merge pull request #13740 from nextcloud/backport/13140/stable15 
[stable15] Cache tokens when using swift's v2 authentication
 2019-01-23 15:29:56 +01:00
Robin Appelman
f7a4f1f128 cleanup shared lock if changing to exclusive lock failed 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2019-01-22 15:12:46 +00:00
Robin Appelman
6855c1594c Cache tokens when using swift's v2 authentication 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2019-01-22 14:37:09 +00:00
Joas Schilling
f39dacf1fb Fix colorizeSvg with transformations that contain a comma (,) 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2019-01-17 14:58:13 +00:00
Roeland Jago Douma
2f6c722482
Merge pull request #13588 from nextcloud/backport/13468/stable15 
[stable15] don't close input stream when writing in encrypted file
 2019-01-16 14:12:44 +01:00
Christoph Wurst
cf2657c873 Fix integer background job id type error 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2019-01-15 14:32:00 +00:00
Florian Schunk
a3d9e6de39 don't close input stream when writing in encrypted file 
Signed-off-by: Florian Schunk <florian.schunk@rwth-aachen.de>
 2019-01-14 15:22:34 +00:00
Roeland Jago Douma
412d6a4a24
Merge pull request #13036 from nextcloud/objectstore-write-exists-15 
[15] upload new files in objectstore to a .part path first
 2019-01-14 11:29:18 +01:00
Joas Schilling
afd8be0c20 Don't log parameters on user creation in case of error/exception 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2019-01-10 11:37:07 +00:00
Roeland Jago Douma
bc07098b49 HttpClient getHeader can return empty string 
Fixes #11999

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-01-08 15:26:23 +00:00
Roeland Jago Douma
7416ce20a0 Use the real logger in the settings 
Fixes #13285
The wrapper logger should not be used here. But we need the real logger.
Since this in internal we can just pass that on directly.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-01-07 12:40:36 +00:00