Commit Graph

42370 Commits

Author SHA1 Message Date
John Molakvoæ 3f19eb06a0
Merge pull request #9124 from nextcloud/stable13-9085-fix-progress-bar-hidden-before-the-upload-ends
[stable13] Fix progress bar hidden before the upload ends
2018-04-09 13:20:52 +02:00
Daniel Calviño Sánchez 9e9e053b73 Fix progress bar hidden before the upload ends
The jQuery File Upload plugin triggers the "stop" event once there are
no more files being uploaded (even if some of them were added when
another upload was already in progress). Therefore, the progress bar
should be hidden in the "fileuploadstop" callback.

In some cases the "stop" event is not triggered and thus the progress
bar is not hidden once no more files are being uploaded. This is caused
by a race condition and it will be fixed in another commit; except in
buggy cases like that one (that need to be fixed anyway) it is safe to
hide the progress bar in the "fileuploadstop" callback.

In any case, note that the callbacks in "fileuploaddone" may be called
after the "stop" event was triggered and handled when using chunked
uploads. In that case once all the chunks are uploaded the assembled
file is moved to its final destination, so its promise could be resolved
after the "stop" event was triggered. Therefore a different approach
would be needed to keep the progress bar visible until the chunked
upload is truly finished, but for the time being the current one is good
enough.

Before this commit the progress bar was being hidden when the first
upload finished, either successfully or with an error, no matter if
there were other files being uploaded too.

The progress bar was being explicitly hidden also when the upload was
cancelled. When an upload is cancelled all the single uploads are
aborted, which triggers a "fail" event for each of them. However, the
"stop" event is always triggered when no more files are being uploaded,
so it is triggered too once all the single uploads were aborted. As all
the single uploads are immediately aborted in a loop when the general
upload is cancelled it makes no difference to hide the progress bar when
the first single upload is aborted or when all the single uploads were
aborted, so the progress bar is no longer explicitly hidden in the
former case.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-04-09 11:20:18 +02:00
Nextcloud bot 2b0b717258
[tx-robot] updated from transifex 2018-04-09 00:12:23 +00:00
Nextcloud bot 8ba8719ec3
[tx-robot] updated from transifex 2018-04-08 00:12:25 +00:00
Nextcloud bot 7f2838cf68
[tx-robot] updated from transifex 2018-04-07 00:12:12 +00:00
John Molakvoæ d45a889fe2
Merge pull request #8779 from nextcloud/backport/8255/show-group-display-names
[stable13] Show group display names
2018-04-06 15:14:12 +02:00
Morris Jobke b9ca121671
Merge pull request #9095 from JaredBoone/bugfix/8387
Do not convert email addresses with idn_to_ascii if…
2018-04-06 11:44:51 +02:00
Nextcloud bot 80c5eda800
[tx-robot] updated from transifex 2018-04-06 00:14:46 +00:00
Roeland Jago Douma 4e732b866d
Merge pull request #9094 from nextcloud/13-9092
[stable13] Add more logging for the object storage during creation of the buckets
2018-04-05 21:45:20 +02:00
Jared Boone 52c7f17faf Do not convert email addresses with idn_to_ascii if INTL_IDNA_VARIANT_UTS46 is undefined.
Fixes https://github.com/nextcloud/server/issues/8387.

Signed-off-by: Jared Boone <jared.boone@gmail.com>
2018-04-05 11:28:31 -07:00
Morris Jobke bb656750f5
Add more logging for the object storage during creation of the buckets
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-04-05 17:29:44 +02:00
Morris Jobke 1c891a5c90
Merge pull request #9089 from nextcloud/backport/9087/windows10_webdav_netdrive-13
[stable13] Allow usage of Windows 10 WebDav Netdrive
2018-04-05 14:23:17 +02:00
Roeland Jago Douma 41b37c905c
Allow usage of Windows 10 WebDav Netdrive
Fixes #3523

As long as we don't have #8123 lets not leave our Window10 netdrive
users hanging.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-04-05 13:51:22 +02:00
Roeland Jago Douma 652d0413cf
Merge pull request #9071 from nextcloud/backport/9006/ignore_encrypted_custom_properties-13
[stable13] Do not treat is-encrypted as custom property
2018-04-05 08:53:28 +02:00
Morris Jobke 4732a34b04
Merge pull request #9077 from nextcloud/fix-callForSeenUsers-stable13
[stable13] Move on with the next user if we found the user on one user back-end
2018-04-05 08:13:26 +02:00
Nextcloud bot 2c6a534d5d
[tx-robot] updated from transifex 2018-04-05 00:12:13 +00:00
Bjoern Schiessle bd0672530b
Move on with the next user if we found the user on one user back-end
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2018-04-04 17:13:47 +02:00
Roeland Jago Douma ce7a835772
Merge pull request #9017 from nextcloud/smb-2.0.5-13
[13] update icewind/smb to 2.0.5
2018-04-04 14:08:28 +02:00
Morris Jobke ba29fd19ec
Merge pull request #9072 from nextcloud/backport/8891/fix_8890-13
[stable13] Fix proper permissions for multiple file access
2018-04-04 13:59:05 +02:00
Roeland Jago Douma af317a1e38
Fix test
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-04-04 12:02:42 +02:00
Roeland Jago Douma 5a74b9cb99
Fix proper permissions for multiple file access
Fixes #8890

In case you have access to a file via multiple ways, for example:
1. the file is shared with you with permission read only
2. the folder containing the file is shared with your read/write

Requesting the getById function on the userFolder would give back two
entries but both with the same permissions. Depending on the node you
picked this is not right.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-04-04 12:02:37 +02:00
Roeland Jago Douma df09b65ee9
Do not treat is-encrypted as customer property
fixes #8977

Else for all files in a folder we would launch off more queries.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-04-04 11:56:59 +02:00
Roeland Jago Douma e95184ee25
Merge pull request #9064 from nextcloud/fix-copy-encrypted-files-stable13
[stable13] reset encryptionVersion to '1' if a file was stream copied
2018-04-04 11:54:54 +02:00
Nextcloud bot ef14f3c0b0
[tx-robot] updated from transifex 2018-04-04 00:13:52 +00:00
Bjoern Schiessle d4f64b94f2
reset encryptionVersion to '1' if a file was stream copied, because this means that we basically write the file from scratch
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2018-04-03 18:12:16 +02:00
Morris Jobke a0818ab6be
Merge pull request #9019 from nextcloud/stable13-8939
[stable13] Fix search text overlapping close button
2018-04-03 10:29:33 +02:00
Morris Jobke 7bb8ce0e67
Merge pull request #9015 from nextcloud/backport-apps-versions
[stable13] Use app version to generate scss filename
2018-04-03 10:28:17 +02:00
Morris Jobke 4f5d057777
Merge pull request #9020 from nextcloud/stable13-8983
[stable13] Clear any theming prefixed cache on cache buster increase
2018-04-03 10:09:33 +02:00
Nextcloud bot e5684a9287
[tx-robot] updated from transifex 2018-04-03 00:12:13 +00:00
Nextcloud bot 9c1c47400f
[tx-robot] updated from transifex 2018-04-02 00:12:13 +00:00
Nextcloud bot 4f34eb7616
[tx-robot] updated from transifex 2018-04-01 00:12:11 +00:00
Nextcloud bot 77bdbb6443
[tx-robot] updated from transifex 2018-03-31 00:14:19 +00:00
Nextcloud bot b6cb092bc6
[tx-robot] updated from transifex 2018-03-30 00:12:01 +00:00
Nextcloud bot ea01c9e92d
[tx-robot] updated from transifex 2018-03-29 00:14:00 +00:00
Julius Härtl 7f209be51d
Fix tests
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-03-28 17:35:36 +02:00
Julius Härtl 541bb71513
Clear any theming prefixed cache on cache buster increase
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-03-28 17:35:35 +02:00
Julius Härtl 334d733d48
Fix search text overlapping clode button
fixes #8701

Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-03-28 17:30:16 +02:00
Robin Appelman 6e13e31188
update icewind/smb to 2.0.5
Signed-off-by: Robin Appelman <robin@icewind.nl>
2018-03-28 16:17:56 +02:00
Robin Appelman a691b52daf
Revert "update icewind/smb to 2.0.5"
accidental push to wrong branch

This reverts commit 3b35cd0749.
2018-03-28 16:17:30 +02:00
Robin Appelman 3b35cd0749
update icewind/smb to 2.0.5
Signed-off-by: Robin Appelman <robin@icewind.nl>
2018-03-28 16:15:27 +02:00
John Molakvoæ (skjnldsv) 05f76b3469
Use app version to generate scss filename
Fixed scsscacher tests

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-03-28 16:11:10 +02:00
Nextcloud bot f2e69bd868
[tx-robot] updated from transifex 2018-03-28 00:21:41 +00:00
Nextcloud bot c2ec519bc4
[tx-robot] updated from transifex 2018-03-27 00:12:04 +00:00
Nextcloud bot f8b1acfcfd
[tx-robot] updated from transifex 2018-03-26 00:13:40 +00:00
Nextcloud bot cda89f16d8
[tx-robot] updated from transifex 2018-03-25 01:10:27 +00:00
Nextcloud bot 3604fe1ec5
[tx-robot] updated from transifex 2018-03-24 01:12:43 +00:00
Nextcloud bot 6ef65b3016
[tx-robot] updated from transifex 2018-03-23 01:11:55 +00:00
Nextcloud bot b3ffcda8ff
[tx-robot] updated from transifex 2018-03-22 01:12:05 +00:00
Nextcloud bot 684f6b6429
[tx-robot] updated from transifex 2018-03-21 01:12:19 +00:00
Roeland Jago Douma 52a97e826b
Merge pull request #8905 from nextcloud/stable13-8843-set-share-with-field-to-the-id-of-the-circle
[stable13] Set "share with" field to the ID of the circle
2018-03-20 23:17:25 +01:00