upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-04-15 22:11:17 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 26
53266 commits 882 branches 1195 tags 7.2 GiB
Commit graph

17716 commits

Author SHA1 Message Date
Joas Schilling
f93d55eebd
PHP CS fixes 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2020-04-18 11:21:28 +02:00
Joas Schilling
aad16c8508
Fix creation of legacy routes 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2020-04-18 11:21:28 +02:00
Joas Schilling
3f8168b6e5
Allow some apps to have root URLs in their own routing file 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2020-04-18 11:21:28 +02:00
Nextcloud bot
148bdabd58
[tx-robot] updated from transifex 2020-04-18 02:16:28 +00:00
John Molakvoæ
36f9ad32f2
Merge pull request #20447 from liamjack/fix/13287/welcome_email 
Increase max-height on button in welcome email template
 2020-04-17 09:42:49 +02:00
blizzz
d55f4183b5
Merge pull request #20505 from nextcloud/fix/noid/system-creds 
do not advertise nulled userId for for systemwide credentials
 2020-04-16 11:53:24 +02:00
Roeland Jago Douma
8971403ada
Merge pull request #20511 from nextcloud/fix/cs-fixer-ldap 
PHP-CS-Fixer green
 2020-04-16 10:37:49 +02:00
Roeland Jago Douma
79cf13e349
Merge pull request #16946 from exussum12/patch-1 
Increase max read
 2020-04-16 10:37:10 +02:00
Roeland Jago Douma
fc2e17d33f
Merge pull request #20246 from nextcloud/fix/untranslated_mail_footer 
Provide the proper language to the mailer
 2020-04-16 10:06:55 +02:00
Roeland Jago Douma
d9990b09b8
PHP-CS-Fixer green 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2020-04-16 09:25:17 +02:00
Roeland Jago Douma
bb4dedb015
Provide the proper language to the mailer 
Else we can't properly translate the footer in the recipients e-mail
language.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2020-04-16 09:04:13 +02:00
Roeland Jago Douma
e21d65e771
Merge pull request #20509 from nextcloud/revert-20050-bugfix/noid/mysql-equal-trims-shock 
Revert "Make sure MySQL is not saying 'this' = 'this ' is true"
 2020-04-16 08:46:18 +02:00
Nextcloud bot
078ac97939
[tx-robot] updated from transifex 2020-04-16 02:17:30 +00:00
Roeland Jago Douma
cbcf072b23
Revert "Make sure MySQL is not saying 'this' = 'this ' is true" 2020-04-15 23:49:16 +02:00
Scott Dutton
65e134c13a
Update View.php 2020-04-15 19:10:06 +01:00
Arthur Schiwon
5437844b7e
fix credentialsManager documentation and ensure userId to be used as string 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2020-04-15 19:34:23 +02:00
Morris Jobke
7fe8477830
Run cs:fix and fix HashWrapper code 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2020-04-15 14:08:56 +02:00
Morris Jobke
d8557d0d8a
Merge pull request #19540 from jlutran/fixKeystoneV3Auth 
Fix issues with Keystone auth v3 in files_external app
 2020-04-15 14:05:32 +02:00
Morris Jobke
c43174a7e6
Merge pull request #20050 from nextcloud/bugfix/noid/mysql-equal-trims-shock 
Make sure MySQL is not saying 'this' = 'this ' is true
 2020-04-15 12:57:27 +02:00
Joas Schilling
5c0637bc90
Merge pull request #20138 from nextcloud/bugfix/noid/make-remote-checking-more-generic 
Make remote checking more generic
 2020-04-15 12:48:49 +02:00
Christoph Wurst
301327135c
Merge pull request #20361 from nextcloud/write-stream-close-on-exception 
Close the streams in `writeStream` even when there is an exception
 2020-04-15 10:48:24 +02:00
Julien Lutran
3e849daf11
Fix issues with Keystone auth v3 in files_external app 
Signed-off-by: Julien Lutran <julien.lutran@corp.ovh.com>
 2020-04-15 10:33:08 +02:00
Roeland Jago Douma
d63abebc93
Merge pull request #19351 from nextcloud/dav-upload-hash 
Return hashes of uploaded content for dav uploads
 2020-04-15 10:23:22 +02:00
Joas Schilling
16e9bf2309
Make sure MySQL is not saying 'this' = 'this ' is true 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2020-04-15 09:14:12 +02:00
Joas Schilling
0bd7382a44
Merge pull request #19936 from nextcloud/bugfix/noid/handle-unset-owner-in-sharing 
Handle unset owner in sharing
 2020-04-14 20:34:17 +02:00
Joas Schilling
cde6d768de
Merge pull request #20181 from nextcloud/bugfix/noid/dont-break-on-path-null 
Also bail out when the path is actually null
 2020-04-14 18:56:58 +02:00
Joas Schilling
5e402f8aae
Check all remotes for local access 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2020-04-14 18:56:06 +02:00
Nextcloud bot
09bb8ac6e2
[tx-robot] updated from transifex 2020-04-14 02:16:50 +00:00
Robin Appelman
c2677682c4
Return hashes of uploaded content for dav uploads 
hashes are set in "X-Hash-MD5", "X-Hash-SHA1" and "X-Hash-SHA256" headers.

these headers are set for file uploads and the MOVE request at the end of a multipart upload.

Signed-off-by: Robin Appelman <robin@icewind.nl>
 2020-04-13 12:57:27 +02:00
Nextcloud bot
6187cea304
[tx-robot] updated from transifex 2020-04-13 02:19:45 +00:00
Scott Dutton
75b99e85ff
Increase max read 
8kb is very low, especially given this will be local files

Signed-off-by: Scott Dutton <scott@exussum.co.uk>
 2020-04-12 13:01:29 +01:00
Liam JACK
301335e9e1
Fix #13287 - Increase max-height on button in welcome email template 
Signed-off-by: Liam JACK <liamjack@users.noreply.github.com>
 2020-04-12 13:07:16 +02:00
John Molakvoæ
b5a30d5cd6
Merge pull request #20426 from nextcloud/techdebt/psr2 
It is done
 2020-04-11 08:21:35 +02:00
Nextcloud bot
de52e1cda7
[tx-robot] updated from transifex 2020-04-11 02:18:37 +00:00
Christoph Wurst
734c62bee0
Format code according to PSR2 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2020-04-10 16:56:50 +02:00
Christoph Wurst
28f8eb5dba
Add visibility to all constants 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2020-04-10 16:54:27 +02:00
Christoph Wurst
1584c9ae9c
Add visibility to all methods and position of static keyword 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2020-04-10 16:51:06 +02:00
Christoph Wurst
a7c8d26d31
Add visibility to all properties and move static keyword 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2020-04-10 16:48:31 +02:00
Christoph Wurst
1762a409f9
Merge pull request #20422 from nextcloud/techdebt/format-control-structs-classes-methods 
Format control structures, classes, methods and function
 2020-04-10 16:38:23 +02:00
Roeland Jago Douma
eba3726e1e
Merge pull request #19495 from nextcloud/preview-generate-batch 
optimize batch generation of previews
 2020-04-10 15:57:06 +02:00
Christoph Wurst
caff1023ea
Format control structures, classes, methods and function 
To continue this formatting madness, here's a tiny patch that adds
unified formatting for control structures like if and loops as well as
classes, their methods and anonymous functions. This basically forces
the constructs to start on the same line. This is not exactly what PSR2
wants, but I think we can have a few exceptions with "our" style. The
starting of braces on the same line is pracrically standard for our
code.

This also removes and empty lines from method/function bodies at the
beginning and end.

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2020-04-10 14:19:56 +02:00
Robin Appelman
8f9bac26f8
fix preview generation tests 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2020-04-10 13:39:45 +02:00
Christoph Wurst
14c996d982
Use elseif instead of else if 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2020-04-10 10:35:09 +02:00
Roeland Jago Douma
fb64fda4d8
Merge pull request #20385 from nextcloud/skeeable-http-harden 
harden seekable http stream a bit against failures
 2020-04-10 08:34:52 +02:00
Nextcloud bot
078b12a9b0
[tx-robot] updated from transifex 2020-04-10 02:18:23 +00:00
Christoph Wurst
008e6d7e84
Merge pull request #20391 from nextcloud/refactor/spaces-cleanup 
Remove all extra whitespace PSR2 does not like
 2020-04-09 20:39:37 +02:00
Christoph Wurst
64510932b8
Merge pull request #20384 from nextcloud/techdebt/lowercase-keywords 
Use php keywords in lowercase
 2020-04-09 16:25:14 +02:00
Christoph Wurst
3a415e4139
Remove space between switch case and colon 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2020-04-09 16:17:53 +02:00
Christoph Wurst
f4c09f299d
Make sure there is exactly one newline after imports 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2020-04-09 16:14:31 +02:00
Christoph Wurst
bcd13296de
Make sure every file ends with an empty newline 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2020-04-09 16:11:50 +02:00