Commit Graph

18834 Commits

Author SHA1 Message Date
Morris Jobke 358512f136
Merge pull request #12297 from nextcloud/backport/12127/stable14
[14] A folder should get a folder mimetype
2018-11-06 18:14:05 +01:00
Morris Jobke 8a86f59c02
Merge pull request #12300 from nextcloud/backport/12230/stable14
[14]  Do not log FileLock as exception
2018-11-06 18:13:24 +01:00
Roeland Jago Douma 2d153adb64
Set the filemodel before rending the detailsview
fixes #10934

Else it triggers the rendering two times. Resulting is weird state in
for example the comments. Because the comments for OLD_FILEID are
retrieved but then the model is changed to NEW_FILEID. But the old
comments still get in and get parsed.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-11-06 08:10:19 +01:00
Roeland Jago Douma 9386a0c36a
Fix tests
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-11-06 08:07:16 +01:00
Roeland Jago Douma aaf060893c
Do not log FileLock as exception
There is no reason to log FileLock errors as exceptions to the log file.
Locks happen for very legit reasons and it is actually a sign of the
code doing its job.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-11-06 08:07:07 +01:00
Roeland Jago Douma 41c8a9314c
A folder should get a folder mimetype
If doing achunked upload the mimetype of the folder would otherwise be
guessed from the path. Which always returned application/octet-stream.

If an access control rule to block that is in place this means that all
chunked uploads fail hard in directories as the isCreatable on the
directory always fails.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-11-06 08:02:21 +01:00
Nextcloud bot 288991a610
[tx-robot] updated from transifex 2018-11-06 01:12:48 +00:00
Nextcloud bot f962a43388
[tx-robot] updated from transifex 2018-11-05 01:12:47 +00:00
Nextcloud bot d829b158f6
[tx-robot] updated from transifex 2018-11-04 01:14:13 +00:00
Nextcloud bot 311b29641f
[tx-robot] updated from transifex 2018-11-03 01:12:49 +00:00
Nextcloud bot d30918886b
[tx-robot] updated from transifex 2018-11-02 01:13:45 +00:00
Morris Jobke d1d82fcfc8
Merge pull request #12160 from Dagefoerde/stable14-oauth-backports
[stable14] Bruteforce protection handling in combination with
2018-11-01 10:40:36 +01:00
Nextcloud bot 41c842f469
[tx-robot] updated from transifex 2018-11-01 01:13:13 +00:00
Roeland Jago Douma f171378837 Move ExpiredTokenException to the correct namespace
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-10-31 10:54:17 +01:00
Roeland Jago Douma 71d2d3ca00 Reset bruteforce on token refresh OAuth
When using atoken obtained via OAuth the token expires. Resulting in
brute force attempts hitting the requesting IP.

This resets the brute force attempts for that UID on a valid refresh of
the token.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-10-31 10:54:17 +01:00
Arthur Schiwon bdb8e37e93
Backport of #12054 to stable14
only write when the displayname differs, but then announce it

refs #5212 and fixes #9112

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>

do not run into UniqueConstraintViolationException

… when an unmapped user logs in for the first time when background job
mode is ajax and no memcache was configured.

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2018-10-30 13:46:57 +01:00
Arthur Schiwon 64fa99a974
fixes wrong variable usage
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2018-10-30 12:19:24 +01:00
Nextcloud bot 0578126ab7
[tx-robot] updated from transifex 2018-10-30 01:13:04 +00:00
Arthur Schiwon 36b21e5e4e
remove unneeded empty search attribute values, fixes #12086
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2018-10-29 17:26:44 +01:00
Morris Jobke 55c48283b5
Merge pull request #12111 from nextcloud/backport/12038/stable14
[14] Implement the size of an assembly stream
2018-10-29 17:21:59 +01:00
Roeland Jago Douma ef13c783e2
Implement the size of an assembly stream
This will make it possible to act propely on moves of future files if we
need to know the size (like for max size virus scanning).

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-10-29 15:19:35 +01:00
Roeland Jago Douma 8d3220a4aa
Double check for failed cache with a shared storage
When obtaining the SourceRootInfo we can call init. If this fails the
cache is set to a failed cache and the storage to a failed storage.
However we did not check for this. Which means that if the storage was
invalid it would fail later on.

Now we will properly error out.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-10-29 15:12:47 +01:00
Nextcloud bot 48b57d1284
[tx-robot] updated from transifex 2018-10-29 01:13:18 +00:00
Nextcloud bot 6565818ccc
[tx-robot] updated from transifex 2018-10-28 00:12:59 +00:00
Nextcloud bot 67895ffac7
[tx-robot] updated from transifex 2018-10-27 00:12:46 +00:00
Nextcloud bot 7e7d3ce357
[tx-robot] updated from transifex 2018-10-26 00:12:59 +00:00
Bjoern Schiessle 1e8098471c
skip already encrypted files on encrypt all command
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2018-10-25 17:52:40 +02:00
Nextcloud bot f8c3b1de33
[tx-robot] updated from transifex 2018-10-25 00:13:15 +00:00
Morris Jobke cdca81b966
Merge pull request #11783 from suntorytimed/stable14
[stable14] backport of #10778
2018-10-24 13:32:52 +02:00
Stefan Weiberg e8db4017b8
backport of #10778
Adding a check to see if keyFileContents is empty:

* this fixes a download error and an exception if the data content
  for encryption is empty
* #3958: for recovering encrypted files with a damaged signature
  this is necessary in addition to turning the signature check off

Signed-off-by: Stefan Weiberg <sweiberg@suse.com>
2018-10-24 09:08:03 +02:00
Nextcloud bot a13d936c35
[tx-robot] updated from transifex 2018-10-24 00:12:41 +00:00
Roeland Jago Douma 3e8a38fc57
Merge pull request #11995 from nextcloud/stable14-11967-fix-opening-a-section-again-in-the-files-app
[stable14] Fix opening a section again in the Files app
2018-10-23 20:05:25 +02:00
Morris Jobke 52c3285de4
Merge pull request #11994 from nextcloud/assemblly-stream-lazy-14
lazy open first source stream in assemblystream
2018-10-23 19:19:35 +02:00
Morris Jobke e88c8d15ba
Merge pull request #11961 from nextcloud/backport/11931/stable14
[14] Do not emit preHooks twice on non-part-storage
2018-10-23 18:16:59 +02:00
Robin Appelman 0803de9b91
lazy open first source stream in assemblystream
Signed-off-by: Robin Appelman <robin@icewind.nl>
2018-10-23 17:44:31 +02:00
Nextcloud bot 7894c40f54
[tx-robot] updated from transifex 2018-10-23 14:54:39 +00:00
Daniel Calviño Sánchez 9801b5af36 Remove event handler no longer needed
The custom handler for "URL changed" events were added to reload the
file list whenever the sections for favorites and shares were opened;
this was used to fix the problem of not reloading the file lists when
opening them for a second time. However, besides that the handlers were
not really necessary, and as the root of the bug was fixed in the
previous commit those handlers are now removed.

The file list for tags uses the handler for a different purpose, though,
so that one was kept.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-10-23 16:44:29 +02:00
Daniel Calviño Sánchez 73125667d4 Fix opening a section again in the Files app
When a section is open in the Files app a "show" event is triggered.
File list objects handle that event by reloading themselves, but only
if the file list was shown at least once. However, the file list objects
of plugins are created when the "show" event is triggered for the first
time for their section; as the file list objects register their handler
for the "show" event when they are created they never handle the first
triggered "show" event, as the handler is set while that event is being
already handled. Therefore, from the point of view of the handler, the
second time that a "show" event was triggered it was seen as if the file
list was shown for the first time, and thus it was not reloaded. Now the
"shown" property is explicitly set for those file lists that are created
while handling a "show" event, which causes them to be reloaded as
expected when opening their section again.

Note that it is not possible to just reload the file list whenever it is
shown; the file list is reloaded also when the directory changes, and
this can happen when the web page is initially loaded and the URL is
parsed. In that case, if file lists were reloaded when shown for the
first time then it could be reloaded twice, one with the default
parameters due to the "show" event and another one with the proper
parameters once the URL was parsed, and the files that appeard in the
list would depend on which response from the server was received the
last.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-10-23 16:44:26 +02:00
Daniel Calviño Sánchez ea047e3201 Fix indentation
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-10-23 16:43:20 +02:00
Morris Jobke 8c40be01f2
Merge pull request #11925 from nextcloud/backport/11920/properly-ignore-compiled-files-l10n
[stable14] Add .l10nignore files for compiled assets
2018-10-23 16:30:40 +02:00
Georg Ehrke 4bbd3fa108
move disableFreeBusy check from User principal backend to Scheduling Outbox collection. This allows to keep local delivery of scheduling messages while prohibiting FreeBusy requests
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2018-10-22 16:01:49 +02:00
Roeland Jago Douma e81f42333b
Do not emit preHooks twice on non-part-storage
The old code would emit the hooks twice. Thus having the version written
twice. Which is not very performant as it is first read twice as well.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-10-21 13:58:07 +02:00
Roeland Jago Douma 5c8719aa03
Allow userId to be null
Fixes #10852

A quick hack. Still ensures some type safety however now also accepts
null. Else we'd need to add a whole new layer of middlewares.

This can only happen when a guest user wants to access a controller that
requries the user_id.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-10-19 16:25:14 +02:00
Morris Jobke f6cdab6b11
Properly escape column name in "createFunction" call
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-10-19 12:12:52 +02:00
Morris Jobke 858ec0a777
Add .l10nignore files for compiled assets
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-10-19 11:40:16 +02:00
Morris Jobke 9454de50b4
Fix a case where "password_by_talk" was not a boolean (e.g. null or "0") and actively cast it to a boolean
This was the error message that we have seen:

```
Argument 1 passed to OC\\Share20\\Share::setSendPasswordByTalk() must be of the type boolean, null given, called in apps/sharebymail/lib/ShareByMailProvider.php on line 981
```

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-10-15 17:51:09 +02:00
Nextcloud bot cef454c280
[tx-robot] updated from transifex 2018-10-10 00:13:24 +00:00
Morris Jobke 6957e1f39c
Revert "[stable14] in 14 the click action gets lost in the Backbone view." 2018-10-09 15:32:07 +02:00
Morris Jobke 022a45faed
Merge pull request #11684 from nextcloud/backport/10782/stable14
[stable14] in 14 the click action gets lost in the Backbone view.
2018-10-09 14:30:57 +02:00
Nextcloud bot ecf14adf76
[tx-robot] updated from transifex 2018-10-09 00:12:37 +00:00