Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Webp & mp4 #20896

Closed
wants to merge 593 commits into from
Closed
Changes from 1 commit
Commits
Show all changes
593 commits
Select commit Hold shift + click to select a range
c3c3d21
Fix row height and display name input
juliusknorr Feb 25, 2020
e8a069e
Bump bundles
juliusknorr Mar 11, 2020
372a3dd
Fix hostname given in Apple config file
Nils160988 Feb 28, 2020
fb3cf8c
Fix test
Nils160988 Feb 29, 2020
e96bb6c
Don't break when one remote share is down
nickvergessen Mar 9, 2020
93cae9d
Merge pull request #19864 from nextcloud/version/18.0.2/final
rullzer Mar 11, 2020
b258e2f
[tx-robot] updated from transifex
nextcloud-bot Mar 12, 2020
1125f17
Fix import order and formatting
skjnldsv Mar 4, 2020
f74876e
Properly emit Viewer event on files and files_sharing
skjnldsv Mar 4, 2020
c4f1389
Use dispatchTyped
skjnldsv Mar 6, 2020
d9f3ed3
Merge pull request #19884 from nextcloud/backport/19704/stable18
rullzer Mar 12, 2020
126ad33
Merge pull request #19879 from nextcloud/backport/19173/stable18
rullzer Mar 12, 2020
b54fdae
Merge pull request #19882 from nextcloud/backport/18555/stable18
rullzer Mar 12, 2020
ebba16a
Get correct mimetype on objectstores
rullzer Mar 11, 2020
f367168
[tx-robot] updated from transifex
nextcloud-bot Mar 13, 2020
16e0908
Merge pull request #19916 from nextcloud/backport/19888/stable18
rullzer Mar 13, 2020
7a1a3c7
Properly respect hide download on sharebymail
rullzer Mar 12, 2020
ca9272d
Use placeholder values for password fields in external storage webui
icewind1991 Mar 12, 2020
cbdff5c
Merge pull request #19886 from nextcloud/backport/19861/stable18
nickvergessen Mar 13, 2020
856b7a2
Do not use the instance name as user part of from mail addresses
juliusknorr Mar 12, 2020
97e7fdb
Merge pull request #19897 from nextcloud/backport/19777/stable18
skjnldsv Mar 13, 2020
68169ac
Merge pull request #19922 from nextcloud/backport/19915/stable18
rullzer Mar 13, 2020
caf68bd
Merge pull request #19921 from nextcloud/backport/19914/stable18
rullzer Mar 13, 2020
1772283
Merge pull request #19924 from nextcloud/backport/19910/stable18
rullzer Mar 13, 2020
8bae693
Don't allow anchors and queries in remote urls
nickvergessen Mar 12, 2020
eb105e7
Fix willReturnOnConsecutiveCalls
nickvergessen Mar 13, 2020
d54eca9
fix external storage controller tests
icewind1991 Mar 13, 2020
2f94a2c
[Security] Bump acorn from 6.3.0 to 6.4.1
dependabot-preview[bot] Mar 13, 2020
c24a30e
[tx-robot] updated from transifex
nextcloud-bot Mar 14, 2020
86dd724
properly set 'hide_download' as integer
icewind1991 Mar 13, 2020
c5f5798
Merge pull request #19950 from nextcloud/backport/19937/stable18
rullzer Mar 14, 2020
de07844
Merge pull request #19945 from nextcloud/dependabot/npm_and_yarn/stab…
rullzer Mar 14, 2020
80852f9
[tx-robot] updated from transifex
nextcloud-bot Mar 15, 2020
7b5f56b
Merge pull request #19940 from nextcloud/backport/19931/stable18
rullzer Mar 15, 2020
cb45891
fix safari useragent for versions with 3 digits
xklonx Mar 14, 2020
97eb9c7
Merge pull request #19933 from nextcloud/backport/19907/stable18
rullzer Mar 15, 2020
34e5909
[tx-robot] updated from transifex
nextcloud-bot Mar 16, 2020
0453149
Fix default action for deleted shares
GretaD Feb 28, 2020
ef51535
[tx-robot] updated from transifex
nextcloud-bot Mar 17, 2020
d5a8507
Merge pull request #19982 from nextcloud/backport/19698/stable18
rullzer Mar 17, 2020
8143cf5
Default value of lookupServerEnabled should be the same everywhere
georgehrke Mar 17, 2020
dca0f7e
Only do regular polling of storage statistics if session_keepalive is…
juliusknorr Mar 16, 2020
2106e6c
Fix single "ScopeContext" passed to "setScopes"
danxuliu Mar 16, 2020
6f5a389
Merge pull request #19966 from nextcloud/backport/19954/stable18
rullzer Mar 17, 2020
4ce1422
Merge pull request #19998 from nextcloud/backport/19995/stable18
rullzer Mar 17, 2020
280444b
Fix invalid instantiation of TemplateResponse if client not found
kesselb Mar 15, 2020
6d0c8fc
Merge pull request #20001 from nextcloud/backport/19989/stable18
rullzer Mar 17, 2020
711c0a0
[tx-robot] updated from transifex
nextcloud-bot Mar 18, 2020
2c1de97
Merge pull request #19999 from nextcloud/backport/19987/stable18
nickvergessen Mar 18, 2020
5e184c5
Merge pull request #20008 from nextcloud/backport/19964/stable18
rullzer Mar 18, 2020
5c984d9
Update the target when it isempty after sharing
rullzer Mar 16, 2020
bd20187
remove the requirement that everything that looks like a placeholder …
icewind1991 Mar 13, 2020
0e91782
Merge pull request #20021 from nextcloud/backport/19932/stable18
blizzz Mar 18, 2020
b3b896d
Merge pull request #20016 from nextcloud/backport/19981/stable18
rullzer Mar 18, 2020
8a82c4f
[tx-robot] updated from transifex
nextcloud-bot Mar 19, 2020
b3fd766
merge the two almost identical custom property backends
icewind1991 Jan 31, 2020
60f300d
test custom properties backend against real database
icewind1991 Jan 31, 2020
0de4d35
remove unused code
icewind1991 Jan 31, 2020
006bcda
handle long property paths to hasing paths >250 chars
icewind1991 Jan 31, 2020
b641bb4
use INode instead of Node for custom properties
icewind1991 Feb 3, 2020
3602a35
remove the detour trough node and work with path directly
icewind1991 Feb 3, 2020
20e27c7
fix tests
icewind1991 Feb 3, 2020
41ae68a
rebuild autoloader
icewind1991 Feb 4, 2020
1e302f0
Merge pull request #20030 from nextcloud/backport/19242/stable18
icewind1991 Mar 19, 2020
ee5ed6a
[tx-robot] updated from transifex
nextcloud-bot Mar 20, 2020
1841555
Allow the video player on the hide download
nickvergessen Mar 19, 2020
29495f0
fixes auto-detecting UUID attributes
blizzz Mar 19, 2020
988c633
Force compatible dependency versions in acceptance tests
danxuliu Mar 20, 2020
4147595
Revert (partially) "Accept incoming shares in acceptance tests"
danxuliu Mar 20, 2020
ba67edd
Fix timeout capping
danxuliu Mar 20, 2020
2b42fbe
Add acceptance test for accepting an incoming share
danxuliu Mar 20, 2020
51073eb
[tx-robot] updated from transifex
nextcloud-bot Mar 21, 2020
8f51c63
Merge pull request #20060 from nextcloud/backport/20057/stable18
rullzer Mar 21, 2020
b9e8251
Merge pull request #20051 from nextcloud/backport/20049/stable18
rullzer Mar 21, 2020
3c7312a
Merge pull request #20044 from nextcloud/backport/20032/stable18
rullzer Mar 21, 2020
881c36f
[tx-robot] updated from transifex
nextcloud-bot Mar 22, 2020
e7a2c7b
Merge pull request #20046 from nextcloud/backport/20039/stable18
rullzer Mar 22, 2020
46932e0
fix OCA\DAV\CalDAV\CalDavBackend search $options
dartcafe Jan 5, 2020
29a6a19
Added test testSearch
dartcafe Jan 5, 2020
6598691
Add extra test case to exclude by timerange
tcitworld Jan 5, 2020
8d7411d
Add check that DateTime parameters are of correct type
tcitworld Jan 5, 2020
f886e7c
[tx-robot] updated from transifex
nextcloud-bot Mar 23, 2020
f11283a
fix dav browser error page not styled
blizzz Mar 19, 2020
45e96c0
use core templates for displaying dav errors in the browser
blizzz Mar 20, 2020
4ea22ab
Merge pull request #20104 from nextcloud/backport/20042/stable18
rullzer Mar 23, 2020
5f83196
[tx-robot] updated from transifex
nextcloud-bot Mar 24, 2020
25766ff
Fix language multiselect action
GretaD Mar 18, 2020
6e7a833
Remove admin_notifications since it is obsolete since Nextcloud 14
juliusknorr Mar 24, 2020
e9a9646
Merge pull request #20140 from nextcloud/backport/20128/stable18
rullzer Mar 24, 2020
281f52a
Backport of 18818
GretaD Jan 13, 2020
bf88c3d
[tx-robot] updated from transifex
nextcloud-bot Mar 25, 2020
1ed78e6
Merge pull request #20136 from nextcloud/backport/20019/stable18
rullzer Mar 25, 2020
1fd4918
Merge pull request #20144 from nextcloud/backport/stable18/18818
rullzer Mar 25, 2020
a2622e6
RefreshWebcalService: randomly generate calendar-object uri
georgehrke Mar 16, 2020
493cc4c
Close updatenotification channel selector on click outside
gary-kim Mar 25, 2020
aeff8a8
Add app config to disable user flows
juliusknorr Mar 13, 2020
87dac80
Auto accept group shares for users added to a group
rullzer Mar 25, 2020
41a839a
Use global used space in quota wrappen when external storage is included
icewind1991 Mar 4, 2020
87a91e6
Merge pull request #20161 from nextcloud/backport/20150/stable18
rullzer Mar 25, 2020
5aa47e5
Check the user on remote wipe
nickvergessen Mar 16, 2020
a2dcf2c
[tx-robot] updated from transifex
nextcloud-bot Mar 26, 2020
73bfc3a
Merge pull request #20166 from nextcloud/backport/20127/stable18
ChristophWurst Mar 26, 2020
4b88ec9
single squashed commit for bug fix
lippl Mar 26, 2020
91a39ec
[tx-robot] updated from transifex
nextcloud-bot Mar 27, 2020
831d253
Bump version on stable18
nickvergessen Mar 27, 2020
918c64a
Merge pull request #20195 from nextcloud/bump-version-18.0.3
rullzer Mar 27, 2020
874c468
Actually check if the owner is not null
rullzer Mar 16, 2020
7ffe3b3
[tx-robot] updated from transifex
nextcloud-bot Mar 28, 2020
63d9341
[tx-robot] updated from transifex
nextcloud-bot Mar 29, 2020
78ec368
[tx-robot] updated from transifex
nextcloud-bot Mar 30, 2020
a1bc789
[tx-robot] updated from transifex
nextcloud-bot Mar 31, 2020
0f6f4cb
Remove Acrobat logo from PDF filetype icon
jancborchardt Mar 30, 2020
b2c616c
Merge pull request #20238 from nextcloud/backport/20234/stable18
skjnldsv Mar 31, 2020
a9db391
Merge pull request #20202 from nextcloud/backport/19978/stable18
rullzer Apr 1, 2020
bd5a8f7
Dont always use the current users quota when calculating storage info
icewind1991 Mar 4, 2020
9359d8b
silence LDAP deprecation logs in NC 18
blizzz Apr 2, 2020
ae08c56
Merge pull request #20258 from nextcloud/backport/19781/stable18
rullzer Apr 2, 2020
3c7e708
Merge pull request #20274 from nextcloud/fix/19127/ldap-silence-depre…
rullzer Apr 2, 2020
ce8f194
Check for empty authorization headers for office requests and allow a…
juliusknorr Dec 23, 2019
3df6adb
[tx-robot] updated from transifex
nextcloud-bot Apr 3, 2020
a93704c
fixes the return type of BeforeUserLoggedInEvent
blizzz Apr 3, 2020
4d9fa02
[tx-robot] updated from transifex
nextcloud-bot Apr 4, 2020
28bac95
Merge pull request #20148 from nextcloud/backport/19986/stable18
rullzer Apr 4, 2020
b54b5a5
Merge pull request #20155 from nextcloud/backport/20117/stable18
rullzer Apr 4, 2020
4261cfb
Merge pull request #20158 from nextcloud/backport/19930/stable18
rullzer Apr 4, 2020
f817cd8
Merge pull request #20175 from nextcloud/backport/20123/stable18
rullzer Apr 4, 2020
1fda7ce
Merge pull request #20296 from nextcloud/backport/20293/stable18
rullzer Apr 4, 2020
33ee579
[tx-robot] updated from transifex
nextcloud-bot Apr 5, 2020
0401c35
[tx-robot] updated from transifex
nextcloud-bot Apr 6, 2020
1db2efe
Catch NoUserException when running the upload cleanup as cronjob
juliusknorr Apr 3, 2020
ab69966
Properly hint exceptions thrown by getUserFolder
juliusknorr Apr 3, 2020
7c71cf6
Catch NotFoundException when getting the user folder
juliusknorr Feb 26, 2020
877f3a1
[tx-robot] updated from transifex
nextcloud-bot Apr 7, 2020
014616e
[tx-robot] updated from transifex
nextcloud-bot Apr 8, 2020
e2b96a1
Merge pull request #20335 from nextcloud/backport/19655/stable18
rullzer Apr 8, 2020
ed4927a
Try to use the display name of file transfers
nickvergessen Apr 8, 2020
69faf60
Show the displayname instead of the user id
nickvergessen Apr 8, 2020
9b9dc6d
[tx-robot] updated from transifex
nextcloud-bot Apr 9, 2020
4bbcc0f
Clear comment on successful post
skjnldsv Apr 8, 2020
d9b72bf
Fix systemtags overflow
skjnldsv Apr 9, 2020
8f90f4d
[tx-robot] updated from transifex
nextcloud-bot Apr 10, 2020
000d62a
Merge pull request #20366 from nextcloud/backport/20360/stable18
rullzer Apr 10, 2020
994ecd7
Merge pull request #20382 from nextcloud/backport/20355/fix/comments/…
rullzer Apr 10, 2020
3d24b56
Merge pull request #20387 from nextcloud/backport/20376/fix/tags-elli…
skjnldsv Apr 10, 2020
c9696ed
update icewind/smb to 3.2.3
icewind1991 Apr 8, 2020
6d0ed57
Add text restore after restore icon
GretaD Feb 12, 2020
e217aa2
Use a normal string to translate.
kesselb Mar 14, 2020
5516f0f
Compile assets
npmbuildbot[bot] Apr 10, 2020
d68e2ef
Merge pull request #20407 from nextcloud/backport/19435/stable18
rullzer Apr 10, 2020
b5aa8d0
[tx-robot] updated from transifex
nextcloud-bot Apr 11, 2020
b97a306
Make the groupId url encoded
juliusknorr Mar 19, 2020
73cfc8d
Make sure the group id parameter gets properly encoded when used in URLs
juliusknorr Mar 19, 2020
ed3aba1
Add tests for encoded group id
juliusknorr Apr 2, 2020
c07f860
[tx-robot] updated from transifex
nextcloud-bot Apr 12, 2020
1d27b80
[tx-robot] updated from transifex
nextcloud-bot Apr 13, 2020
e7c21e7
Merge pull request #20433 from nextcloud/backport/20035/stable18
rullzer Apr 13, 2020
4b6ee6f
18.0.4 RC1
rullzer Apr 13, 2020
c6ea250
Merge pull request #20420 from nextcloud/backport/19952/translate-web…
rullzer Apr 13, 2020
b6e3512
[tx-robot] updated from transifex
nextcloud-bot Apr 14, 2020
734c1a4
Merge pull request #20334 from nextcloud/backport/20284/stable18
rullzer Apr 14, 2020
620409d
Properly display share error messages
skjnldsv Apr 14, 2020
34fc462
Merge pull request #20282 from nextcloud/backport/19180/stable18
rullzer Apr 14, 2020
69960c8
Merge pull request #20102 from nextcloud/backport/18679/stable18
MorrisJobke Apr 14, 2020
276a650
Merge pull request #20163 from nextcloud/backport/19782/stable18
MorrisJobke Apr 14, 2020
a717b38
Handle unset owner in sharing
nickvergessen Mar 13, 2020
fada22e
Update root.crl due to revocation of spgverein.crt
MorrisJobke Apr 14, 2020
4742458
Merge pull request #20471 from nextcloud/backport/20469/stable18
rullzer Apr 14, 2020
6ccdbd9
[tx-robot] updated from transifex
nextcloud-bot Apr 15, 2020
7d412b5
Merge pull request #20485 from nextcloud/backport/20474/stable18
MorrisJobke Apr 15, 2020
adf88bb
Close the streams in `writeStream` even when there is an exception
icewind1991 Apr 8, 2020
8d72a2a
Fix absolute redirect
skjnldsv Apr 10, 2020
41ef012
Merge pull request #20495 from nextcloud/backport/20401/stable18
skjnldsv Apr 15, 2020
ae2b5a3
Merge pull request #20493 from nextcloud/backport/20361/stable18
rullzer Apr 15, 2020
65c6680
Merge pull request #20483 from nextcloud/backport/19936/stable18
rullzer Apr 15, 2020
6571190
Merge pull request #20456 from nextcloud/version/18.0.4/RC1
rullzer Apr 15, 2020
73ef2f3
[tx-robot] updated from transifex
nextcloud-bot Apr 16, 2020
a544996
add DB tests for credentials manager
blizzz Apr 15, 2020
249d3a8
fix credentialsManager documentation and ensure userId to be used as …
blizzz Apr 15, 2020
5779b12
Merge pull request #20516 from nextcloud/backport/20505/stable18
skjnldsv Apr 16, 2020
0856745
[tx-robot] updated from transifex
nextcloud-bot Apr 17, 2020
8f160bf
Update list of multiple properties
skjnldsv Apr 17, 2020
cd78273
Merge pull request #20405 from nextcloud/backport/20363/stable18
rullzer Apr 17, 2020
46149ab
[tx-robot] updated from transifex
nextcloud-bot Apr 18, 2020
0bb032b
18.0.4 RC2
rullzer Apr 18, 2020
8b3e375
Merge pull request #20531 from nextcloud/backport/20529/stable18
rullzer Apr 18, 2020
1d6fefd
Fix jsunit tests
kesselb Apr 14, 2020
7550043
Provide the proper language to the mailer
rullzer Mar 31, 2020
b5a1621
Merge pull request #20548 from nextcloud/backport/20470/stable18
skjnldsv Apr 18, 2020
792a642
Allow to edit admin user
kesselb Apr 17, 2020
c45c64a
[tx-robot] updated from transifex
nextcloud-bot Apr 19, 2020
e8f69b4
[tx-robot] updated from transifex
nextcloud-bot Apr 20, 2020
1e29d69
Merge pull request #20530 from nextcloud/backport/stable18/fix/allow_…
rullzer Apr 20, 2020
fc09807
Merge pull request #20512 from nextcloud/backport/20246/stable18
rullzer Apr 20, 2020
8730bc2
Merge pull request #20545 from nextcloud/version/18.0.4/RC2
rullzer Apr 20, 2020
2cf8fab
[tx-robot] updated from transifex
nextcloud-bot Apr 21, 2020
d2dae7c
Fix #19066 - Array offset error due to empty file versions array
liamjack Apr 12, 2020
2a496e1
18.0.4
rullzer Apr 21, 2020
185f867
Set fileInfo correctly for LegacyTabs
go2sh Apr 19, 2020
1e3698c
[tx-robot] updated from transifex
nextcloud-bot Apr 22, 2020
b990b01
Fix Sharing recommendation user display
skjnldsv Apr 21, 2020
1a1848c
Merge pull request #20580 from nextcloud/version/18.0.4/final
rullzer Apr 22, 2020
42e30b5
Fix IE11 upload fallback methods
skjnldsv Apr 22, 2020
517a046
[tx-robot] updated from transifex
nextcloud-bot Apr 23, 2020
9076ae8
Merge pull request #20602 from nextcloud/backport/20595/stable18
MorrisJobke Apr 23, 2020
62bfd9d
Merge pull request #20596 from nextcloud/backport/20575/stable18
MorrisJobke Apr 23, 2020
4bcbeff
Merge pull request #20588 from nextcloud/backport/20564/stable18
MorrisJobke Apr 23, 2020
7fe5c51
[tx-robot] updated from transifex
nextcloud-bot Apr 24, 2020
ddd7a8d
Merge pull request #20578 from nextcloud/backport/20449/stable18
MorrisJobke Apr 24, 2020
12ca86d
[tx-robot] updated from transifex
nextcloud-bot Apr 25, 2020
814f19a
Fix security header setting in .htaccess by adding 'onsuccess unset'
zertrin Jan 19, 2020
19e9d28
[tx-robot] updated from transifex
nextcloud-bot Apr 26, 2020
4e98587
[tx-robot] updated from transifex
nextcloud-bot Apr 27, 2020
4f44e39
Only catch anonymous OPTIONS for Office
juliusknorr Apr 24, 2020
7c1abc5
Adhere to EMailTemplate interface in constructor call.
tekhnee Apr 25, 2020
82898e6
[tx-robot] updated from transifex
nextcloud-bot Apr 28, 2020
c8973c6
Merge pull request #20682 from nextcloud/backport/20650/stable18
rullzer Apr 28, 2020
78571eb
Don't remove last user in ldap group when limit is -1
kklem0 Apr 27, 2020
bab82cc
Add tests for update notification controller for non-default updater …
MorrisJobke Apr 24, 2020
6eaf873
Merge pull request #20703 from nextcloud/backport/20636/stable18
MorrisJobke Apr 28, 2020
37cd976
Merge pull request #20701 from nextcloud/backport/20676/stable18
blizzz Apr 28, 2020
988c562
[tx-robot] updated from transifex
nextcloud-bot Apr 29, 2020
b569f3c
Merge pull request #20680 from nextcloud/backport/20632/stable18
rullzer Apr 29, 2020
277a97c
Merge pull request #20647 from nextcloud/backport/19002/stable18
MorrisJobke Apr 29, 2020
f5da6c8
[tx-robot] updated from transifex
nextcloud-bot Apr 30, 2020
5d8c240
Allow to navigate to others with access from the sidebar
rullzer Apr 1, 2020
8436c1c
Fix public layout header title & description
skjnldsv Apr 30, 2020
e8976b8
[tx-robot] updated from transifex
nextcloud-bot May 1, 2020
acf9b2f
Merge pull request #20750 from nextcloud/backport/20744/stable18
rullzer May 1, 2020
cfd6f0b
Merge pull request #20740 from nextcloud/backport/20262/stable18
rullzer May 1, 2020
7b0819c
Allow specifying a default expiration date
rullzer Apr 21, 2020
e5f1523
Fix Argon2 options checks
MichaIng Apr 28, 2020
78dbf5d
Merge pull request #20635 from nextcloud/backport/20587/stable18
rullzer May 1, 2020
de43edc
Merge pull request #20763 from nextcloud/backport/20710/stable18
rullzer May 1, 2020
e96858d
[tx-robot] updated from transifex
nextcloud-bot May 2, 2020
b7b6d0e
[tx-robot] updated from transifex
nextcloud-bot May 3, 2020
bacd9c4
[tx-robot] updated from transifex
nextcloud-bot May 4, 2020
9f9bdf8
Correctly hide table headers in filepicker
raimund-schluessler Apr 24, 2020
c9fa25c
clarified trash bin retention by storage shortage override
wiswedel May 4, 2020
2212315
Merge pull request #20808 from nextcloud/backport/20807/stable18
MorrisJobke May 4, 2020
6b96fe9
[tx-robot] updated from transifex
nextcloud-bot May 5, 2020
1c2ba48
Fix filtering our owner & current user from shares
skjnldsv May 5, 2020
12e67a3
[tx-robot] updated from transifex
nextcloud-bot May 6, 2020
7a8db43
Merge pull request #20830 from nextcloud/backport/20825/stable18
skjnldsv May 6, 2020
e254369
Merge pull request #20805 from nextcloud/backport/20640/stable18
MorrisJobke May 6, 2020
88bad0f
[tx-robot] updated from transifex
nextcloud-bot May 7, 2020
d460f4f
[tx-robot] updated from transifex
nextcloud-bot May 8, 2020
bc3f1ca
Fix color-text-maxcontrast not passing WCAG AA
jancborchardt May 7, 2020
7456d67
[tx-robot] updated from transifex
nextcloud-bot May 9, 2020
14cf345
Merge pull request #20886 from nextcloud/backport/20853/stable18
rullzer May 9, 2020
8077ff1
[tx-robot] updated from transifex
nextcloud-bot May 10, 2020
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Properly hint exceptions thrown by getUserFolder
Signed-off-by: Julius Härtl <jus@bitgrid.net>
  • Loading branch information
juliusknorr authored and backportbot[bot] committed Apr 6, 2020
commit ab699661ce14bf72343312c7a417309c5806e8ec
6 changes: 4 additions & 2 deletions lib/private/Files/Node/Root.php
Original file line number Diff line number Diff line change
@@ -35,6 +35,7 @@
use OC\Files\Mount\Manager;
use OC\Files\Mount\MountPoint;
use OC\Hooks\PublicEmitter;
use OC\User\NoUserException;
use OCP\Files\Config\IUserMountCache;
use OCP\Files\IRootFolder;
use OCP\Files\NotFoundException;
@@ -352,7 +353,8 @@ public function getName() {
*
* @param string $userId user ID
* @return \OCP\Files\Folder
* @throws \OC\User\NoUserException
* @throws NoUserException
* @throws NotPermittedException
*/
public function getUserFolder($userId) {
$userObject = $this->userManager->get($userId);
@@ -367,7 +369,7 @@ public function getUserFolder($userId) {
'app' => 'files',
]
);
throw new \OC\User\NoUserException('Backends provided no user object');
throw new NoUserException('Backends provided no user object');
}

$userId = $userObject->getUID();
4 changes: 4 additions & 0 deletions lib/public/Files/IRootFolder.php
Original file line number Diff line number Diff line change
@@ -25,6 +25,7 @@
namespace OCP\Files;

use OC\Hooks\Emitter;
use OC\User\NoUserException;

/**
* Interface IRootFolder
@@ -39,6 +40,9 @@ interface IRootFolder extends Folder, Emitter {
*
* @param string $userId user ID
* @return \OCP\Files\Folder
* @throws NoUserException
* @throws NotPermittedException
*
* @since 8.2.0
*/
public function getUserFolder($userId);