upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-06-15 11:41:20 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 52
47717 commits 1033 branches 1221 tags 8.7 GiB
Commit graph

9184 commits

Author SHA1 Message Date
Morris Jobke
e0ce0c8d97
Merge pull request #15307 from nextcloud/backport/15290/stable15 
[stable15] take return of mkdir into consideration; photocache to not create a folder for deletion
 2019-04-30 15:35:42 +02:00
Morris Jobke
2434b94956
Merge pull request #15139 from nextcloud/backport/15129/stable15 
Backport/15129/stable15
 2019-04-30 14:56:17 +02:00
Arthur Schiwon
ec9c1e2f52 take return of mkdir into account, throw exception on failure 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2019-04-30 07:27:32 +00:00
Roeland Jago Douma
ad5dcc2cd6 Always use a temp file for swift writes 
Apparently the if statement doesn't work in all cases (even if I could
not reproduce it). So for the time being we will just not directly
stream to swift.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-04-24 07:02:46 +00:00
Joas Schilling
54219fb4cd
Use the querybuilder for the queries 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2019-04-17 15:33:57 +02:00
Joas Schilling
e77272e3fc
Allow to use Subqueries in from 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2019-04-17 15:33:57 +02:00
Roeland Jago Douma
7cbba3e717
Repair step for link shares 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-04-17 15:33:57 +02:00
Roeland Jago Douma
441e9fefad Block install without CAN_INSTALL file 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-04-15 12:24:12 +00:00
Roeland Jago Douma
792c1a17a1
Do not allow invalid users to be created 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-04-15 09:04:32 +02:00
Roeland Jago Douma
dc99cc7eab Harden appdata putcontent 
If for whatever reason appdata got into a strange state this will at
least propegate up and not make it do boom the next run.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-04-08 14:36:37 +00:00
Vlastimil Pecinka
7cab488c6f Store user object later in the code 
Signed-off-by: Vlastimil Pecinka <pecinka@email.cz>
 2019-03-21 21:37:41 +00:00
Morris Jobke
6fffd09a7c
Merge pull request #14759 from nextcloud/backport/14691/stable15 
[stable15] always allow moving mountpoints inside the same mountpoint
 2019-03-20 16:41:14 +01:00
Morris Jobke
8781a77d37
Merge pull request #14709 from HuemerGroup/groupname_like_username-allow_share_with_both 
groupname like username - allow share with both
 2019-03-20 16:32:53 +01:00
Morris Jobke
38beea8642
Update lib/private/Share20/Manager.php 
tabulator change

Co-Authored-By: aignerat <46312655+aignerat@users.noreply.github.com>
 2019-03-20 12:51:26 +01:00
Morris Jobke
2a3645a5a8
Update lib/private/Share20/Manager.php 
fixed tabulator

Co-Authored-By: aignerat <46312655+aignerat@users.noreply.github.com>
 2019-03-20 12:50:48 +01:00
Robin Appelman
9b6ead8abf always allow moving mountpoints inside the same mountpoint 
even if that mountpoint isn't normally a valid target for moving mounts into

Signed-off-by: Robin Appelman <robin@icewind.nl>
 2019-03-20 09:59:17 +00:00
Roeland Jago Douma
086f41b0bc Fix getting the access list on external storage 
If a file is on external storage there is no owner. WHich means we can't
check. So just return an empty array then.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-03-19 17:44:32 +00:00
Christian Aigner
cde8a2896d groupname like username - allow share with both 
Signed-off-by: Christian Aigner <christian.aigner@huemer-it.com>
 2019-03-15 10:18:27 +01:00
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