Commit Graph

3494 Commits

Author SHA1 Message Date
Bjoern Schiessle 6634266946
return correct mount type for federated shares
fix https://github.com/nextcloud/server/issues/6584

Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2018-01-11 10:22:04 +01:00
Nextcloud bot 27a4a8247c
[tx-robot] updated from transifex 2018-01-06 01:11:22 +00:00
Nextcloud bot 233fd16049
[tx-robot] updated from transifex 2018-01-04 09:48:45 +00:00
Tobia De Koninck 7f18a8d19f Don't show users which e-mail address match if they belong to a group we may not share with
Signed-off-by: Tobia De Koninck <tobia@ledfan.be>
2017-12-19 08:43:08 +01:00
Daniel Calviño Sánchez 26cf16d67f
Fix constructor spy in unit test with Sinon 4.1.3
When a constructor is spied using Sinon it is wrapped by a proxy
function, which calls the original constructor when invoked. When "new
Foo()" is executed a "Foo" object is created, "Foo" is invoked with the
object as "this", and the object is returned as the result of the whole
"new" expression.

Before Sinon 4.1.3 the proxy called the original constructor directly
using the "thisValue" of the spied call; "thisValue" was the object
created by the "new" operator that called the proxy. The proxy assigned
"thisValue" to "returnValue", so it was also the value returned by the
proxy and, in turn, the value returned by the whole "new" expression.

Since Sinon 4.1.3 (see pull request 1626) the proxy calls the original
constructor using "new" instead of directly. The "thisValue" created by
the outermost "new" (the one that called the proxy) is no longer used by
the original constructor; the internal "new" creates a new object, which
is the one passed to the original constructor and returned by the
internal "new" expression. This object is also the value returned by the
proxy ("returnValue") and, in turn, the value returned by the whole
outermost "new" expression.

Thus, now "returnValue" should be used instead of "thisValue" to get the
object created by the spied constructor.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-12-11 16:49:39 +01:00
Nextcloud bot 0ff717c600
[tx-robot] updated from transifex 2017-12-10 01:10:38 +00:00
Morris Jobke 5dd15c4a7d
Merge pull request #7323 from nextcloud/shared-jailed-source-root-12
[12]Use the correct root for shared jail when the source storage is also a jail
2017-12-08 09:03:03 +01:00
Nextcloud bot 53fa7fb3c6
[tx-robot] updated from transifex 2017-12-08 01:10:26 +00:00
Nextcloud bot f3b9b213eb
[tx-robot] updated from transifex 2017-12-06 01:10:37 +00:00
Robin Appelman 4144580167
delay calculating the shared cache root until it's used
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-12-04 15:18:23 +01:00
Nextcloud bot 8656462edb
[tx-robot] updated from transifex 2017-11-30 01:13:31 +00:00
Robin Appelman 6d8de960c9
Use the correct root for shared jail when the source storage is also a jail
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-11-28 13:55:42 +01:00
Nextcloud bot 097e8a4994
[tx-robot] updated from transifex 2017-11-11 01:10:24 +00:00
Nextcloud bot 5e14b64c55
[tx-robot] updated from transifex 2017-11-10 01:10:05 +00:00
Nextcloud bot 98b012d545
[tx-robot] updated from transifex 2017-11-08 01:09:33 +00:00
Nextcloud bot 0756fc0893
[tx-robot] updated from transifex 2017-11-07 01:09:08 +00:00
Nextcloud bot 43341833fd
[tx-robot] updated from transifex 2017-11-03 01:09:18 +00:00
Nextcloud bot f7ac152a6c
[tx-robot] updated from transifex 2017-10-26 00:08:49 +00:00
Nextcloud bot 895336a3f3
[tx-robot] updated from transifex 2017-10-24 00:08:57 +00:00
Nextcloud bot e8c217ed4f
[tx-robot] updated from transifex 2017-10-19 00:08:38 +00:00
Nextcloud bot 95bd9d4c64
[tx-robot] updated from transifex 2017-10-14 02:29:15 +00:00
Nextcloud bot c14beb8ee5
[tx-robot] updated from transifex 2017-10-10 00:08:41 +00:00
Nextcloud bot ceec594cc0
[tx-robot] updated from transifex 2017-10-05 00:08:34 +00:00
Nextcloud bot 489fc55e1d
[tx-robot] updated from transifex 2017-09-30 00:08:35 +00:00
Nextcloud bot df00dc89d1
[tx-robot] updated from transifex 2017-09-28 00:08:46 +00:00
Nextcloud bot 0f39ea5830
[tx-robot] updated from transifex 2017-09-26 00:08:36 +00:00
Nextcloud bot 06ca365ccd
[tx-robot] updated from transifex 2017-09-25 00:08:12 +00:00
Nextcloud bot cb212712f6
[tx-robot] updated from transifex 2017-09-21 00:08:36 +00:00
Nextcloud bot bc88484e7f
[tx-robot] updated from transifex 2017-09-17 00:08:34 +00:00
Roeland Jago Douma 38548a7006
Correctly format OCS response with favorites
The helper funtion did not handle the response correctly and basically
only returned the last share with tags.

This is a simple rewrite. That is still understandable. Loops maybe more
than strictly required. But preformance is not the issue here.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-09-04 11:49:19 +02:00
Nextcloud bot c13a06b7a5
[tx-robot] updated from transifex 2017-08-30 00:08:36 +00:00
Morris Jobke eb1a8a1934 Merge pull request #6278 from nextcloud/stable12-6182-fixes-in-files-drop-js
[stable12] Fixes in files_drop.js
2017-08-29 14:49:05 +02:00
Nextcloud bot a6ea872b1f
[tx-robot] updated from transifex 2017-08-29 00:08:37 +00:00
Daniel Calviño Sánchez 575f0c8421 Do not iterate over the files
As "singleFileUpload" is used the "add" callback (which in turn calls
"addFileToUpload") will always be called with a single file. Therefore
there is no need to iterate over the files (and it is not done in the
other callbacks either, so this aligns the code with the rest of the
callbacks).

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-08-27 18:37:44 +02:00
Daniel Calviño Sánchez 03c6c5bd93 Replace fileName variable with data.files[0].name
There is no need to store the file name, as the "data" parameter given to
all the callbacks provides a "files" attribute with all the files that
the callback refers to; moreover, it will always be a single file due to
the use of "singleFileUploads" in the jQuery File Upload plugin.

This also fixes the loading icon not disappearing when several files were
uploaded at once. "singleFileUploads" causes the "add" callback to be
called once for each file to be uploaded, so "fileName" was overwritten
with the name of each new file in the upload set; when "fileName" was
later used in the "done" callback to find the file in the list whose
loading icon replace with the MIME type icon "fileName" always had the
name of the last file, and thus its icon was the only one replaced.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-08-27 18:37:43 +02:00
Daniel Calviño Sánchez b68bad45dc Update the whole file item instead of only its contents
The "done" and "fail" callbacks both update the item for the uploaded
file using "setFileIcon". "setFileIcon" updates the contents of the
"<li>" element for the file, but the "fail" callback was giving
"setFileIcon" an element generated by the template,  so the resulting
HTML contained a "<li>" element nested in another "<li>" element.

However, generating the HTML is better done through a template, so the
template now receives the icon to show in order to be used by a
successful upload and a failed one, and "setFileIcon" was changed to
"updateFileItem".

Note that the mimeTypeUrl does no longer need to be escaped, as
Handlebars templates escape the needed characters automatically.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-08-27 18:37:43 +02:00
Daniel Calviño Sánchez 8a1850f6b1 Remove "errorThrown" parameter
When the "fail" callback is called, "errorThrown" is a property of the
data object instead of a parameter.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-08-27 18:37:43 +02:00
Nextcloud bot 992c91e288
[tx-robot] updated from transifex 2017-08-25 00:09:08 +00:00
Nextcloud bot 9baf03d28c
[tx-robot] updated from transifex 2017-08-24 00:09:00 +00:00
Roeland Jago Douma 9b3e70f554 Merge pull request #6151 from nextcloud/backport-6099-no-exception-on-sharee-error
[stable12] Catch exceptions on error of cloud id resolution
2017-08-23 15:59:33 +02:00
Nextcloud bot 8e8af07e79
[tx-robot] updated from transifex 2017-08-22 00:08:29 +00:00
Nextcloud bot 6ea56593a7
[tx-robot] updated from transifex 2017-08-20 00:08:24 +00:00
Nextcloud bot 7e0c00b576
[tx-robot] updated from transifex 2017-08-18 00:08:25 +00:00
Nextcloud bot 948d6742ce
[tx-robot] updated from transifex 2017-08-17 00:08:23 +00:00
Joas Schilling bd80121fc6
Catch exceptions on error of cloud id resolution
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-08-16 13:57:30 +02:00
Marin Treselj eaa00ea2c8 Change id to class in the main share template
Signed-off-by: Marin Treselj <marin@pixelipo.com>
2017-08-14 22:24:00 +02:00
Nextcloud bot ee73ddd8a9
[tx-robot] updated from transifex 2017-08-12 00:08:28 +00:00
Nextcloud bot 79f4b8566b
[tx-robot] updated from transifex 2017-08-10 00:08:24 +00:00
Nextcloud bot 72029627fc
[tx-robot] updated from transifex 2017-08-09 00:08:30 +00:00
Morris Jobke cf16087585 Disable default activity email for incoming shares
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-08-02 20:57:12 +02:00