Roeland Jago Douma
0c35aaba29
Fix OC_Image new resize functions
...
Else the wrong mimetype might be set. Resulting in continious
regeneration of previews when browsing.
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2020-05-02 21:57:34 +02:00
Roeland Jago Douma
8c023a6579
Merge pull request #20767 from nextcloud/enh/argon2id-options
...
Apply Argon2 options for Argon2id hashing as well
2020-05-01 15:39:13 +02:00
MichaIng
229570badf
Apply Argon2 options for Argon2id hashing as well
...
Signed-off-by: MichaIng <micha@dietpi.com>
2020-05-01 11:42:13 +02:00
Roeland Jago Douma
a41ad78408
Update education bundle
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2020-05-01 09:52:58 +02:00
Roeland Jago Douma
c724eb24d5
Merge pull request #20380 from nextcloud/design/notification-mails
...
Fix design and layout of notification mails
2020-05-01 08:53:39 +02:00
Jan-Christoph Borchardt
e981669e89
Fix notification mail tests
...
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2020-05-01 03:00:42 +02:00
Robin Appelman
4e6d3d1880
Fix getDirectoryContent implementation for Jail wrapper
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2020-04-30 15:27:09 +02:00
Roeland Jago Douma
8d5404b750
Merge pull request #20710 from nextcloud/fix/argon2-options-checks
...
Fix Argon2 options checks
2020-04-30 14:42:33 +02:00
Roeland Jago Douma
fa914f2e24
Merge pull request #20742 from nextcloud/fix/cs
...
Run the cs fixer for green ci
2020-04-30 14:41:50 +02:00
Joas Schilling
5b5550dbba
Merge pull request #20677 from nextcloud/followup/17718/scaling-user-provisioning
...
Scaling user provisioning for subadmins with many groups
2020-04-30 12:49:57 +02:00
Roeland Jago Douma
f6b435d0d9
Run the cs fixer for green ci
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2020-04-30 10:28:44 +02:00
MichaIng
ad60619655
Fix Argon2 options checks
...
The minimum for memory cost is 8 KiB per thread. Threads must be checked and set first to allow checking against the correct memory cost mimimum.
Options are now applied the following way:
- If config.php contains the setting with an integer higher or equal to the minimum, it is applied.
- If config.php contains the setting with an integer lower than the minimum, the minimum is applied.
- If config.php does not contain the setting or with no integer value, the PHP default is applied.
Signed-off-by: MichaIng <micha@dietpi.com>
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2020-04-30 10:18:46 +02:00
Jan-Christoph Borchardt
d582315c10
Notification mails: Fix some alignment details and remove shadow
...
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2020-04-30 10:15:19 +02:00
Jan-Christoph Borchardt
fbef2708d0
Notification mails: Change font to native font stack
...
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2020-04-30 10:14:23 +02:00
Jan-Christoph Borchardt
b38c3bfde3
Notification mails: Logo bar/box to circle so it stands nicely on its own
...
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2020-04-30 10:14:22 +02:00
Jan-Christoph Borchardt
43371c9f7c
Notification mails: Adjust vertical spacing
...
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2020-04-30 10:14:22 +02:00
Jan-Christoph Borchardt
1d5e7b3cee
Fix notification mails height issue in Nextcloud Mail
...
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2020-04-30 10:14:22 +02:00
Roeland Jago Douma
a1c1b354fc
Merge pull request #18883 from adrb/optimize_swift_14116
...
Optimize Openstack Swift files download
2020-04-30 09:06:19 +02:00
Roeland Jago Douma
4472777769
Merge pull request #20717 from nextcloud/fix/getconfig-param-definitions
...
Define getSystemValueBool/Int/String function default parameter with correct type
2020-04-30 09:02:58 +02:00
MichaIng
10a98f9f41
Define getSystemValueBool/Int/String function default parameter with correct type
...
Signed-off-by: MichaIng <micha@dietpi.com>
2020-04-29 14:19:52 +02:00
Christoph Wurst
cb057829f7
Update license headers for 19
...
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2020-04-29 11:57:22 +02:00
Adrian Brzezinski
e107519295
Large Object support for OpenStack Swift.
...
Until now, you wouldn't be able to create
objects larger that 5GB.
It's somewhat related with pull #18883
Signed-off-by: Adrian Brzezinski <adrian.brzezinski@eo.pl>
2020-04-27 14:23:59 +02:00
Adrian Brzezinski
354c0996d8
It's a fix for issue #14116 ,
...
Improves efficiency when downloading files from Swift storage.
Before, files were downloaded and then pushed back to user.
That behaevior causes all kinds of performance problems.
Now, files are streamed directly to user.
Signed-off-by: Adrian Brzezinski <adrian.brzezinski@eo.pl>
2020-04-27 14:16:50 +02:00
Morris Jobke
2d7f71faca
Merge pull request #20650 from tekhnee/patch-1
...
Adhere to EMailTemplate interface in constructor call.
2020-04-27 11:10:38 +02:00
Morris Jobke
673267cd91
Merge pull request #19929 from nextcloud/bugfix/user-delete-avatar
...
Delete avatar if a user is deleted
2020-04-27 11:06:50 +02:00
Morris Jobke
1738e17e20
Merge pull request #19793 from nextcloud/bugfix/noid/link-to-federated-reshare
...
Fix resharing of federated shares that were created out of links
2020-04-27 11:05:34 +02:00
Joas Schilling
e24e9ec0a9
Don't loop over all groups to check for subadmins
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-04-27 08:37:53 +02:00
Tekhnee
7ee67339e0
Adhere to EMailTemplate interface in constructor call.
...
Email creation appears to have been refactored lately but it looks like custom template-based emails were left out.
Signed-off-by: Tekhnee <info@tekhnee.org>
2020-04-25 21:24:21 +03:00
Mikael Hammarin
6ffde74928
Patch to optimize for large installations (>5000 users >20000 groups) where subadmins have access to many of groups (>250)
...
- UsersController:editUser() calls isUserAccessible() even if the user is admin
This fix reduces API calls to editUser (ex change locale/display name) from >2 minutes (!) to ~3 seconds per call in average.
Signed-off-by: Mikael Hammarin <mikael@try2.se>
2020-04-25 14:37:46 +02:00
Julius Härtl
d74e9045ac
Delete avatar if a user is deleted
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2020-04-24 16:27:17 +02:00
Roeland Jago Douma
f4b8623d33
Allow specifying a default expiration date
...
This overrides the max expiration date.
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2020-04-24 16:18:20 +02:00
Morris Jobke
defcbd9169
Merge pull request #20627 from nextcloud/cleanup/noid/remove-obsolete-repair-steps
...
Remove obsolete repair steps for logo and updater channel
2020-04-24 13:36:16 +02:00
blizzz
d458fcddb5
Merge pull request #20298 from nextcloud/enh/noid/auto-logout
...
Allow to configure auto logout after browser inactivity
2020-04-24 13:20:27 +02:00
Morris Jobke
0bd79b96c5
Remove obsolete repair steps for logo and updater channel
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2020-04-24 09:57:52 +02:00
blizzz
038045d55e
Merge pull request #18816 from nextcloud/bugfix/noid/paginate-contacts-search
...
Use paginated search for contacts
2020-04-23 22:20:58 +02:00
Julius Härtl
2eadf9d567
Do not create remember me cookie
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2020-04-23 19:12:54 +02:00
Julius Härtl
cbd20867b5
Provide config though initial state service
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2020-04-23 19:12:53 +02:00
Julius Härtl
6709833dc7
Use paginated search for contacts
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2020-04-23 19:08:16 +02:00
Robin Appelman
436908ee3f
filter out blacklisted files in getDirectoryContent
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2020-04-23 13:34:55 +02:00
Roeland Jago Douma
c870b6ab2e
Fix new routing in settings etc
...
Also prefix resources
Unify the prefix handling
Handle urls with and without slash
Signed-off-by: Joas Schilling <coding@schilljs.com>
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2020-04-22 13:09:25 +02:00
Roeland Jago Douma
8f650feede
Merge pull request #20114 from nextcloud/techdebt/noid/allow-some-apps-to-have-root-urls
...
Allow some apps to have root URLs in their own routing file
2020-04-21 16:00:34 +02:00
Julius Härtl
5646f7c761
Link shares have reshare permission if outgoing federated shares are enabled
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2020-04-21 14:35:29 +02:00
Robin Appelman
9735b5d61f
Add method to storage backends to get directory content with metadata
...
Currently you need to use `opendir` and then call `getMetadata` for
every file, which adds overhead because most storage backends already
get the metadata when doing the `opendir`.
While storagebackends can (and do) use caching to relief this problem,
this adds cache invalidation dificulties and only a limited number of
items are generally cached (to prevent memory usage exploding when
scanning large storages)
With this new methods storage backends can use the child metadata they
got from listing the folder to return metadata without having to keep
seperate caches.
Signed-off-by: Robin Appelman <robin@icewind.nl>
2020-04-20 15:45:04 +02:00
Roeland Jago Douma
6c603e8e7d
Move to subfolders for preview files
...
Else the number of files can grow very large very quickly in the preview
folder. Esp on large systems.
This generates the md5 of the fileid. And then creates folders of the
first 7 charts. In that folder is then a folder with the fileid. And
inside there are the previews.
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2020-04-19 10:30:56 +02:00
Joas Schilling
250467e842
Extend tests for root url
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-04-18 11:21:28 +02:00
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
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
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
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
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
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
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
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
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
a8a06a82d2
Remove trailing whitespaces from comments
...
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2020-04-09 16:09:23 +02:00
Christoph Wurst
44577e4345
Remove trailing and in between spaces
...
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2020-04-09 16:07:47 +02:00
Christoph Wurst
42625a46be
Remove spaces after method or function call
...
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2020-04-09 16:05:56 +02:00
Robin Appelman
60de74ac40
harden seekable http stream a bit against failures
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2020-04-09 14:37:01 +02:00
Christoph Wurst
36b3bc8148
Use php keywords in lowercase
...
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2020-04-09 14:04:56 +02:00
Christoph Wurst
afbd9c4e6e
Unify function spacing to PSR2 recommendation
...
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2020-04-09 13:54:22 +02:00
Robin Appelman
7d386872e5
optimize batch generation of previews
...
by allowing the generation of multiple previews at once we save on having to find, open and decode the max-preview for every preview of the same file
the main use case for this is the preview generator app (pr for that comming next)
in my local testing this saves about 25% of time when using the preview generator app
Signed-off-by: Robin Appelman <robin@icewind.nl>
2020-04-09 12:50:59 +02:00
Robin Appelman
5cd12cd7c3
allow generating multiple preview sizes for a single file at once
...
this saves having to do some of the overhead multiple times
Signed-off-by: Robin Appelman <robin@icewind.nl>
2020-04-09 12:50:55 +02:00
Christoph Wurst
2a529e453a
Use a blank line after the opening tag
...
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2020-04-09 11:50:14 +02:00
Christoph Wurst
41b5e5923a
Use exactly one empty line after the namespace declaration
...
For PSR2
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2020-04-09 11:48:10 +02:00
Christoph Wurst
2fbad1ed72
Fix (array) indent style to always use one tab
...
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2020-04-09 10:16:08 +02:00
blizzz
e9795d01f1
Merge pull request #16035 from nextcloud/share-search-hide-on-match
...
dont show remote and email options if we have an exact match for local user email
2020-04-09 00:08:34 +02:00
Christoph Wurst
85e369cddb
Fix multiline comments
...
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2020-04-08 22:24:54 +02:00
Roeland Jago Douma
328fbddc19
Merge pull request #20360 from nextcloud/bugfix/20182/try-to-use-the-displayname-for-file-transfers
...
Try to use the display name of file transfers
2020-04-08 19:36:59 +02:00
Robin Appelman
ccbf3059ba
Close the streams in `writeStream` even when there is an exception
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2020-04-08 16:40:56 +02:00
Julius Härtl
124b109bc8
Add preview provider for Krita files
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2020-04-08 16:31:20 +02:00