Commit graph

21031 commits

Author SHA1 Message Date
Nextcloud bot
acc0ac39b0
[tx-robot] updated from transifex 2019-12-29 02:28:02 +00:00
Nextcloud bot
6efa4bf068
[tx-robot] updated from transifex 2019-12-27 02:27:17 +00:00
Nextcloud bot
62b733c9e5
[tx-robot] updated from transifex 2019-12-26 02:27:08 +00:00
Nextcloud bot
c0355d3b9b
[tx-robot] updated from transifex 2019-12-24 02:27:49 +00:00
Nextcloud bot
342fff64da
[tx-robot] updated from transifex 2019-12-23 02:27:42 +00:00
Nextcloud bot
847924758f
[tx-robot] updated from transifex 2019-12-22 02:28:45 +00:00
Nextcloud bot
4b02baba16
[tx-robot] updated from transifex 2019-12-21 02:26:45 +00:00
Nextcloud bot
dfcb6833b3
[tx-robot] updated from transifex 2019-12-20 02:26:38 +00:00
Roeland Jago Douma
678cbd53af
Merge pull request #18399 from nextcloud/backport/18302/stable17
[stable17] Fix comments search result to work with multibyte strings
2019-12-19 10:18:03 +01:00
Roeland Jago Douma
9792206981
Merge pull request #18419 from nextcloud/dependachristoph/stable17/npm_and_yarn/serialize-javascript-handlebars
[stable17] Bump serialize-javascript and handlebars
2019-12-19 08:45:33 +01:00
Christoph Wurst
22fd37485b
Bump serialize-javascript and handlebars
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2019-12-19 08:26:45 +01:00
Nextcloud bot
ad76ed332c
[tx-robot] updated from transifex 2019-12-19 02:26:36 +00:00
Nextcloud bot
f6941a831c
[tx-robot] updated from transifex 2019-12-18 02:26:41 +00:00
Nextcloud bot
0dc8da1f24
[tx-robot] updated from transifex 2019-12-17 02:26:38 +00:00
Nextcloud bot
ad3ba247e1
[tx-robot] updated from transifex 2019-12-15 02:27:03 +00:00
Nextcloud bot
9c72d261b9
[tx-robot] updated from transifex 2019-12-14 02:26:38 +00:00
Michał Węgrzynek
3031a36f4b Fix comments search result to work with multibyte strings
Currently, the searching in comments breaks up, if comments contain multibyte characters and string manipulation logic in getRelevantMessagePart happens to cut through them rendering the resulting string invalid (not UTF-8 compliant). This patch replaces all string manipulating functions in this code to multibyte aware ones.

Signed-off-by: Michał Węgrzynek <michal.wegrzynek@malloc.com.pl>
2019-12-13 14:39:17 +00:00
Nextcloud bot
458f4398ef
[tx-robot] updated from transifex 2019-12-13 02:26:28 +00:00
Joas Schilling
790de0acef
Allow to specify apps that somethign is a dir
Signed-off-by: Joas Schilling <coding@schilljs.com>
2019-12-12 22:23:18 +01:00
Joas Schilling
f7c1fd569e
Improve mimetype detection in workflow components
Signed-off-by: Joas Schilling <coding@schilljs.com>
2019-12-12 22:23:17 +01:00
Georg Ehrke
f2551e53fb Support more IPv6 addresses in the RefreshWebcalJob
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2019-12-12 10:06:05 +00:00
Roeland Jago Douma
387d216214
Merge pull request #18355 from nextcloud/backport/17935/stable17
[stable17] adding share type circles
2019-12-12 10:49:12 +01:00
Nextcloud bot
903759df47
[tx-robot] updated from transifex 2019-12-12 02:26:42 +00:00
Robin Appelman
48cd26ae4a
update tests
Signed-off-by: Robin Appelman <robin@icewind.nl>
2019-12-11 16:35:04 +01:00
Roeland Jago Douma
ba390f6943
Fix restoring shared versions
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2019-12-11 12:45:30 +01:00
Maxence Lange
d6a276c57d using IShare::
Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
2019-12-11 11:39:03 +00:00
Maxence Lange
1420cd5a7e adding share type circles
Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
2019-12-11 11:39:02 +00:00
Roeland Jago Douma
624302d99a
Merge pull request #18337 from nextcloud/backport/18189/stable17
[stable17] Sharee API GS fixes
2019-12-11 07:51:44 +01:00
Nextcloud bot
1241380d79
[tx-robot] updated from transifex 2019-12-11 02:16:59 +00:00
Roeland Jago Douma
31645c615f
Expose capability if the lookup server should be queried by default
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2019-12-10 15:58:00 +01:00
Roeland Jago Douma
05f12b8df4
Always do sharee lookup on lookup server in GS
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2019-12-10 15:57:49 +01:00
Nextcloud bot
babe78f20e
[tx-robot] updated from transifex 2019-12-10 02:16:53 +00:00
Roeland Jago Douma
9d8c0c262b
Merge pull request #18247 from nextcloud/backport/18241/stable17
[stable17] Allow to unfavorite all files
2019-12-09 21:27:47 +01:00
Nextcloud bot
0a1ec86ee5
[tx-robot] updated from transifex 2019-12-09 02:16:38 +00:00
Nextcloud bot
4905e80d3f
[tx-robot] updated from transifex 2019-12-08 02:17:41 +00:00
Nextcloud bot
8052b32237
[tx-robot] updated from transifex 2019-12-07 02:16:47 +00:00
Nextcloud bot
a675bbb846
[tx-robot] updated from transifex 2019-12-06 02:17:10 +00:00
Roeland Jago Douma
a6f9a0809c
Merge pull request #18252 from nextcloud/17/bugfix/noid/tooltip-hide-date
Hide the tooltip if the list row is rerendered
2019-12-05 20:47:03 +01:00
Julius Härtl
7b6eb80f72
Hide the tooltip if the list row is rerendered
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2019-12-05 14:46:22 +01:00
Joas Schilling
17dc1bc0ba Allow to unfavorite all files
Signed-off-by: Joas Schilling <coding@schilljs.com>
2019-12-05 10:36:51 +00:00
Nextcloud bot
adc4416043
[tx-robot] updated from transifex 2019-12-05 02:17:02 +00:00
Roeland Jago Douma
f032b88c55
Merge pull request #18205 from nextcloud/stable17-backport/18120
[stable17] Backport #18120
2019-12-04 14:12:30 +01:00
Nextcloud bot
658c951d68
[tx-robot] updated from transifex 2019-12-04 09:24:22 +00:00
Nextcloud bot
f7732ace10
[tx-robot] updated from transifex 2019-12-04 02:17:01 +00:00
Georg Ehrke
7aec7f6685
respect shareapi_allow_share_dialog_user_enumeration in Principal backend for Sabre/DAV
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2019-12-03 14:25:32 +01:00
Nextcloud bot
1402d1b153
[tx-robot] updated from transifex 2019-12-03 02:16:56 +00:00
Nextcloud bot
1e67be443d
[tx-robot] updated from transifex 2019-12-02 02:17:03 +00:00
Nextcloud bot
59a4349650
[tx-robot] updated from transifex 2019-12-01 02:18:24 +00:00
John Molakvoæ
c4561be550
[stable17] Fix provisioning_api getUsers types (#18157)
[stable17] Fix provisioning_api getUsers types
2019-11-30 11:21:50 +01:00
Nextcloud bot
c302033e5f
[tx-robot] updated from transifex 2019-11-30 02:16:58 +00:00
John Molakvoæ (skjnldsv)
f452ab09df Fix provisioning_api getUsers types
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2019-11-29 08:09:02 +00:00
Nextcloud bot
611e6a0f7d
[tx-robot] updated from transifex 2019-11-29 02:17:03 +00:00
Nextcloud bot
c75cc61226
[tx-robot] updated from transifex 2019-11-28 02:17:04 +00:00
Nextcloud bot
8cb7149de8
[tx-robot] updated from transifex 2019-11-27 02:16:34 +00:00
Nextcloud bot
902c75a1a9
[tx-robot] updated from transifex 2019-11-26 02:16:05 +00:00
Roeland Jago Douma
09a739de83
Merge pull request #18054 from nextcloud/backport/18016/stable17
[stable17] make chunksize (used to check for gone LDAP users) configurable
2019-11-25 08:40:25 +01:00
John Molakvoæ
66ddb89180
[stable17] Quickfix #17515 (#18094)
[stable17] Quickfix #17515
2019-11-25 07:09:46 +01:00
Nextcloud bot
f715e77607
[tx-robot] updated from transifex 2019-11-25 02:16:04 +00:00
Robin Windey
ff2f7a7d1a Revert changes and add css-rule to correct file inside files-app 2019-11-24 14:58:41 +00:00
Nextcloud bot
2d0fa72171
[tx-robot] updated from transifex 2019-11-23 02:16:17 +00:00
Nextcloud bot
99420445cc
[tx-robot] updated from transifex 2019-11-22 02:16:26 +00:00
Arthur Schiwon
5f32b62a63 make chunksize (used to check for gone LDAP users) configurable
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2019-11-21 10:06:44 +00:00
Arthur Schiwon
fbd2b7d7d5 uid can be false when the user record does not exit
fixes not loading files app for users who got a share by the gone LDAP user

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2019-11-21 06:09:24 +00:00
Nextcloud bot
02df65a102
[tx-robot] updated from transifex 2019-11-21 02:16:11 +00:00
Nextcloud bot
9d5e7a4dd4
[tx-robot] updated from transifex 2019-11-20 02:16:28 +00:00
Nextcloud bot
1986315b32
[tx-robot] updated from transifex 2019-11-19 02:17:57 +00:00
Nextcloud bot
c2e3fcddb5
[tx-robot] updated from transifex 2019-11-18 02:16:06 +00:00
Roeland Jago Douma
d9d6408a7a
Merge pull request #17945 from nextcloud/backport/17926/stable17
[stable17] re-acquired expired shared locks on large file uploads
2019-11-17 09:09:51 +01:00
Nextcloud bot
f05e1d1749
[tx-robot] updated from transifex 2019-11-17 02:17:24 +00:00
Nextcloud bot
577e9d0cad
[tx-robot] updated from transifex 2019-11-16 02:16:07 +00:00
Nextcloud bot
1893d4512a
[tx-robot] updated from transifex 2019-11-15 02:16:13 +00:00
Robin Appelman
bfc9e50160 re-acquired expired shared locks on large file uploads
during large file uploads, the shared lock that we get at the begining can expire
leading to locked errors later on, instead of erroring, try to re-get the lock

Signed-off-by: Robin Appelman <robin@icewind.nl>
2019-11-14 18:35:17 +00:00
Nextcloud bot
d5fc345d70
[tx-robot] updated from transifex 2019-11-14 02:16:24 +00:00
Roeland Jago Douma
a78d05a42e
Merge pull request #17925 from nextcloud/backport/17873/stable17
[stable17] Make timeout a optional parameter
2019-11-13 19:56:40 +01:00
Roeland Jago Douma
e899e4957c Check quota before transfer ownership
Fixes #15664

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2019-11-13 14:09:53 +00:00
Daniel Kesselberg
6a1f4b1801 Make timeout a optional parameter
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
2019-11-13 11:56:41 +00:00
Nextcloud bot
49d3e0f4a3
[tx-robot] updated from transifex 2019-11-13 02:16:18 +00:00
Roeland Jago Douma
351b76f97e
Merge pull request #17858 from nextcloud/backport/17847/stable17
[stable17] Also set X-OC-Mtime header for files that are smaller than 10MB
2019-11-12 08:11:22 +01:00
Nextcloud bot
f6469c04d9
[tx-robot] updated from transifex 2019-11-12 02:16:22 +00:00
Nextcloud bot
6d6d490572
[tx-robot] updated from transifex 2019-11-10 02:17:08 +00:00
Julius Härtl
14d5856f84 Also set X-OC-Mtime header for files that are smaller than 10MB
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2019-11-08 09:24:08 +00:00
Nextcloud bot
9153ccdd19
[tx-robot] updated from transifex 2019-11-08 02:16:24 +00:00
Nextcloud bot
5165e45074
[tx-robot] updated from transifex 2019-11-07 02:16:05 +00:00
Nextcloud bot
a16641963e
[tx-robot] updated from transifex 2019-11-06 02:16:16 +00:00
Nextcloud bot
2a0b02ec9a
[tx-robot] updated from transifex 2019-11-05 02:15:55 +00:00
Nextcloud bot
6136a6c128
[tx-robot] updated from transifex 2019-11-04 02:15:35 +00:00
Nextcloud bot
4d686e278b
[tx-robot] updated from transifex 2019-11-03 02:16:14 +00:00
Nextcloud bot
8806e7df14
[tx-robot] updated from transifex 2019-11-02 02:15:06 +00:00
Roeland Jago Douma
1b7dd567d7
Merge pull request #17766 from nextcloud/backport/17756/stable17
[stable17] fix action menu on mobile
2019-11-01 08:51:59 +01:00
Roeland Jago Douma
40f264d219
Merge pull request #17767 from nextcloud/backport/17755/stable17
[stable17] Bring back external storage group select delete
2019-11-01 08:51:40 +01:00
Nextcloud bot
202e7a4f2c
[tx-robot] updated from transifex 2019-11-01 07:46:38 +00:00
John Molakvoæ (skjnldsv)
5e22a8b07d Bring back external storage group select delete
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2019-10-31 14:55:11 +00:00
Greta Doci
c3b0f658cc fix action menu on mobile
Signed-off-by: Greta Doci <gretadoci@gmail.com>
2019-10-31 14:54:35 +00:00
Daniel Kesselberg
18e3ec10f5 Return $schema on change and null otherwise
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
2019-10-29 19:39:04 +00:00
Nextcloud bot
743bd4156f
[tx-robot] updated from transifex 2019-10-29 02:15:29 +00:00
Nextcloud bot
c4a2725f2b
[tx-robot] updated from transifex 2019-10-28 02:15:42 +00:00
Nextcloud bot
090169dab7
[tx-robot] updated from transifex 2019-10-27 02:14:19 +00:00
Roeland Jago Douma
7777c5ff1c Cleanup theming mess
* Do not do translations in the constructor. This gets called to early
so there is no user yet. Which means we can't obtain the locale. Which
means we store the wrong translation instance.

* Same for the theming app magic. Just use the parent call when needed.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2019-10-26 10:15:26 +00:00
Nextcloud bot
5e89d5f421
[tx-robot] updated from transifex 2019-10-26 02:15:24 +00:00
Greta Doci
fffbcc6b1b add comment
Signed-off-by: Greta Doci <gretadoci@gmail.com>
2019-10-25 13:00:40 +00:00
Greta Doci
bedbb343c3 fix filename overlapping on mobile ref #17364
Signed-off-by: Greta Doci <gretadoci@gmail.com>
2019-10-25 13:00:39 +00:00
Nextcloud bot
b2ccf4d17f
[tx-robot] updated from transifex 2019-10-25 02:15:40 +00:00
Nextcloud bot
28b97e591f
[tx-robot] updated from transifex 2019-10-24 02:15:34 +00:00
Nextcloud bot
5ac7195e55
[tx-robot] updated from transifex 2019-10-23 02:15:32 +00:00
Roeland Jago Douma
c0cdc68741
Merge pull request #17156 from nextcloud/stable17-16976
[stable17] Always use the folder icon depending on the mount type if not a share mount
2019-10-22 19:11:02 +02:00
Roeland Jago Douma
3dfcad949e
Merge pull request #17617 from nextcloud/backport/17595/stable17
[stable17] treat LDAP error 50 as auth issue, prevents lost server connection errors
2019-10-22 16:09:11 +02:00
Julius Härtl
4a672f59d2
Fallback to directory icon based on the mount type
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2019-10-22 15:53:39 +02:00
Nextcloud bot
5ef19dacc2
[tx-robot] updated from transifex 2019-10-22 02:15:50 +00:00
Arthur Schiwon
67d68deba1 treat LDAP error 50 as auth issue, prevents lost server connection errors
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2019-10-21 09:56:39 +00:00
Roeland Jago Douma
a9775e36d2
Merge pull request #17597 from nextcloud/backport/17575/stable17
[stable17] Include the share in the Files_Sharing::loadAdditionalScripts event
2019-10-21 09:46:07 +02:00
Nextcloud bot
bad70805e4
[tx-robot] updated from transifex 2019-10-21 02:15:57 +00:00
Nextcloud bot
aa58d6c980
[tx-robot] updated from transifex 2019-10-20 02:16:50 +00:00
Daniel Calviño Sánchez
c765dc46e7 Include the share in the Files_Sharing::loadAdditionalScripts event
This provides a better context for apps using the event, for example to
load one script or another depending on whether the share is a file or a
folder.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2019-10-19 09:13:59 +00:00
Roeland Jago Douma
6b505fe3b5
Merge pull request #17589 from nextcloud/backport/17585/stable17
[stable17] added documentation links on settings pages
2019-10-19 11:10:40 +02:00
Nextcloud bot
9396075e6d
[tx-robot] updated from transifex 2019-10-19 02:15:50 +00:00
Sascha Wiswedel
2836f80c5e added documentation links on settings pages
Signed-off-by: Sascha Wiswedel <sascha.wiswedel@nextcloud.com>
2019-10-18 10:09:58 +00:00
Nextcloud bot
9f3b3d23c7
[tx-robot] updated from transifex 2019-10-18 02:15:31 +00:00
Roeland Jago Douma
3a45dfa09a
Merge pull request #17538 from nextcloud/backport/17332/stable17
[stable17] Only cache the mimetype if the file exists
2019-10-17 13:44:02 +02:00
Nextcloud bot
8ebda6d60c
[tx-robot] updated from transifex 2019-10-16 02:15:49 +00:00
Roeland Jago Douma
a5e3f696cb
Merge pull request #17455 from nextcloud/fix/stable17-axios-package
[stable17] Use @nextcloud/axios to keep the CSRF token in sync
2019-10-15 14:29:58 +02:00
Christoph Wurst
37cca6ffe7 Use @nextcloud/axios to keep the CSRF token in sync
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
Signed-off-by: npmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com>
2019-10-15 07:19:16 +00:00
Roeland Jago Douma
f0151a24c8
Merge pull request #17541 from nextcloud/backport/17503/stable17
[stable17] Set the proper filename for version downloads
2019-10-15 09:17:51 +02:00
Nextcloud bot
cf140738dc
[tx-robot] updated from transifex 2019-10-15 02:15:14 +00:00
Roeland Jago Douma
52de002fec Set the proper filename for version downloads
Before it just used the internalid (timestamp often) which is not really
user friendly.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2019-10-14 20:28:54 +00:00
Joas Schilling
899e5cae26 Only cache the mimetype if the file exists
Otherwise files access control will cache "application/octet-stream"
for all the target node on:
rename, move, copy and all other methods which create a new item

To check this:
1. Add an automated tagging rule which tags on mimetype NOT "httpd/unix-directory"
2. Add an access control rule which checks for any mimetype
3. Create a folder and rename it, the folder should not be tagged, but it is

Signed-off-by: Joas Schilling <coding@schilljs.com>
2019-10-14 19:39:29 +00:00
Nextcloud bot
eb789e4390
[tx-robot] updated from transifex 2019-10-14 02:15:16 +00:00
Nextcloud bot
46de79cfe8
[tx-robot] updated from transifex 2019-10-13 02:15:58 +00:00
Nextcloud bot
844e7a74cd
[tx-robot] updated from transifex 2019-10-12 02:15:17 +00:00
Nextcloud bot
22e14e39cf
[tx-robot] updated from transifex 2019-10-11 02:14:50 +00:00
John Molakvoæ (skjnldsv)
79473bdfdf Force hide tooltips on sidebar close
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
Signed-off-by: npmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com>
2019-10-09 15:31:47 +00:00
Nextcloud bot
32d12bc533
[tx-robot] updated from transifex 2019-10-09 02:15:14 +00:00
Roeland Jago Douma
0e2a403a21
Merge pull request #17444 from nextcloud/backport/17359/stable17
[stable17] Don't call basename on null
2019-10-08 08:07:06 +02:00
Nextcloud bot
0e85ca8ee3
[tx-robot] updated from transifex 2019-10-08 02:15:08 +00:00
Joas Schilling
2efd0207a6 Don't call basename on null
Signed-off-by: Joas Schilling <coding@schilljs.com>
2019-10-07 12:34:14 +00:00
Roeland Jago Douma
ca490dff2b
Merge pull request #17418 from nextcloud/backport/17387/stable17
[stable17] Allow removing federated shares of locally reshared files
2019-10-07 09:43:19 +02:00
Nextcloud bot
2f4145e757
[tx-robot] updated from transifex 2019-10-07 02:14:49 +00:00
Nextcloud bot
107639b12f
[tx-robot] updated from transifex 2019-10-06 02:15:20 +00:00
Roeland Jago Douma
bbf36b4879 Allow removing federated shares of locally reshared files
* UserA shares a folder to UserB
* UserB does a federated share to userC@serverC
* UserB now tries to revoke the federated share

Before we always tried to notify the remote cloud. The case that the
file was reshared locally was not considered. This patch makes sure not
to try to notify a federated server if both users are local users.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2019-10-05 13:19:44 +00:00
Nextcloud bot
b5ad2f9cb5
[tx-robot] updated from transifex 2019-10-05 02:15:13 +00:00
Roeland Jago Douma
16ba526982
Merge pull request #17351 from nextcloud/backport/17001/stable17
[stable17] reduce adressbook change events and handling
2019-10-04 11:34:16 +02:00
Nextcloud bot
7ba3e95100
[tx-robot] updated from transifex 2019-10-04 02:15:34 +00:00
John Molakvoæ
5df6570bbc
[stable17] Don't process known avatars from LDAP (#17372)
[stable17] Don't process known avatars from LDAP
2019-10-03 08:39:15 +02:00
Nextcloud bot
32df7f7cdd
[tx-robot] updated from transifex 2019-10-03 02:14:32 +00:00
Arthur Schiwon
845e7f733f Don't process known avatars from LDAP
* avoids useless FS operation
* avoids useless DB writes
* avoids useless addressbook updates
* addendum to #17001

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2019-10-02 14:33:42 +00:00
Nextcloud bot
9bfe715106
[tx-robot] updated from transifex 2019-10-02 02:15:17 +00:00
Nextcloud bot
3db8553eb2
[tx-robot] updated from transifex 2019-10-01 12:42:01 +00:00
Arthur Schiwon
eb191af518 reduce adressbook change events and handling
... from four to one on avatar updates

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2019-10-01 10:18:20 +00:00
Roeland Jago Douma
20ffc551d8
Merge pull request #17298 from nextcloud/backport/17258/stable17
[stable17] add (hidden) option to configure smb timeout
2019-10-01 12:10:59 +02:00
Roeland Jago Douma
7cceb667e9
Merge pull request #17295 from nextcloud/backport/17286/stable17
[stable17] Correctly detect the mimetype from uploads
2019-09-30 17:11:29 +02:00
Roeland Jago Douma
028568c4b8
Merge pull request #17273 from nextcloud/backport/14913/stable17
[stable17] Fix directory detection for s3
2019-09-30 17:10:02 +02:00