Commit Graph

40087 Commits

Author SHA1 Message Date
Morris Jobke 1af39e8734 Merge pull request #6287 from nextcloud/12-6255
[stable12] Add meta information to emails for better customisation
2017-08-28 18:34:30 +02:00
Morris Jobke 6f9c3ab8a6
Allow the expiration date to be set to null
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-08-28 17:47:51 +02:00
Morris Jobke d0bb5c298d
Allow the expiration date to be set to null
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-08-28 17:33:43 +02:00
Joas Schilling 485dbc8d6c
Also for reset password
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-08-28 17:33:38 +02:00
Joas Schilling 7df1ddcf2c
Add meta information to emails for better customisation
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-08-28 17:33:35 +02:00
Bjoern Schiessle 9128786d09
add propfind to detect encryption status
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-08-28 14:03:21 +02:00
Nextcloud bot eb71c1288d
[tx-robot] updated from transifex 2017-08-28 00:08:33 +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
Roeland Jago Douma ad283e40b4 Merge pull request #6270 from nextcloud/6252-12
[stable12] Don't try the actual file upload if the checks already error out
2017-08-26 18:32:03 +02:00
Roeland Jago Douma 0ec858f7e9 Merge pull request #6269 from nextcloud/6251-12
[stable12] Don't fetch the translation from core but from files
2017-08-26 16:26:40 +02:00
Roeland Jago Douma 0228dd7d50 Merge pull request #6268 from nextcloud/smb-2.0.2-12
[12]  update icewind/smb to 2.0.2
2017-08-26 13:50:53 +02:00
Roeland Jago Douma f29384a057 Merge pull request #6243 from nextcloud/stable12-circles-token
using CircleProvider on token
2017-08-26 13:49:25 +02:00
Roeland Jago Douma 99b102e15d
Don't try the actual file upload if the checks already error out
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-08-26 13:34:29 +02:00
Roeland Jago Douma 7338f7aa21
Don't fetch the translation from core but from files
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-08-26 13:33:34 +02:00
Robin Appelman 6f06426bd4 update icewind/smb to 2.0.2
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-08-26 12:14:43 +02:00
Nextcloud bot 2c6bc236cb
[tx-robot] updated from transifex 2017-08-26 00:08:36 +00:00
Roeland Jago Douma 8c0042c30c Merge pull request #6258 from nextcloud/stable12_6244
[stable12] [drone] Give redis a change to fireup
2017-08-25 11:29:21 +02:00
Roeland Jago Douma a9ee70b688
[drone] Give redis a change to fireup
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-08-25 10:40:02 +02:00
Nextcloud bot 992c91e288
[tx-robot] updated from transifex 2017-08-25 00:09:08 +00:00
Morris Jobke 4c2f194589 Merge pull request #6114 from nextcloud/stable12_5852
[stable12] Delete trash using node API to trigger preview deletion
2017-08-24 02:59:44 +02:00
Morris Jobke 5fab554bd2 Merge pull request #6108 from nextcloud/backport-6080-12
[stable12] Add buttom border for header
2017-08-24 02:58:03 +02:00
Morris Jobke 1928863ee7 Merge pull request #6233 from nextcloud/stable12_6218
[stable12] [3rdparty] Fix sabre/xml empty prop parsing
2017-08-24 02:56:28 +02:00
Nextcloud bot 9baf03d28c
[tx-robot] updated from transifex 2017-08-24 00:09:00 +00:00
Roeland Jago Douma 81acf70bca Merge pull request #6240 from nextcloud/12-6239
[stable12] Show "Uploading..." in web UI for long uploads
2017-08-23 19:16:50 +02:00
Maxence Lange 0d4803e6dc using CircleProvider on token
Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
2017-08-23 16:58:32 +02:00
Morris Jobke 4cf7c351ea Merge pull request #6237 from nextcloud/12-drone-ci-images
[stable12] Use docker images without XDebug and with Opcache
2017-08-23 16:48:26 +02:00
Morris Jobke 618014130e Merge pull request #6166 from nextcloud/stable12-bump-dompurify
[Stable12] Bump dompurify
2017-08-23 16:43:33 +02: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
Roeland Jago Douma a62620feeb Merge pull request #6148 from nextcloud/backport-6047-select-indexed-columns
[stable12] Use indexed column path_hash to find the parent
2017-08-23 15:58:59 +02:00
Morris Jobke 47f87bbf8c
Show "Uploading..." in web UI for long uploads
If the estimated upload time is bigger than 4 hours it shows the text
"Uploading..." because the time then doesn't give any good hint to the
user anyways.

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-08-23 15:53:48 +02:00
Morris Jobke b1e268e2c1
Use docker images without XDebug and with Opcache
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-08-23 15:28:25 +02:00
Roeland Jago Douma 96509ae621
[3rdparty] Fix sabre/xml empty prop parsing
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-08-23 14:33:14 +02:00
Nextcloud bot 8f20b4566a
[tx-robot] updated from transifex 2017-08-23 00:09:04 +00:00
Roeland Jago Douma efdf1a4bb5 Merge pull request #6197 from nextcloud/stable12-check-encoding-log
[Stable12] check encoding log
2017-08-22 09:09:35 +02:00
Nextcloud bot 8e8af07e79
[tx-robot] updated from transifex 2017-08-22 00:08:29 +00:00
Morris Jobke 4617f5f656 Merge pull request #6207 from nextcloud/12-6201
[stable12] Increase contrast of dropdown menu text, fix accessibility & visibility issues
2017-08-21 22:10:14 +02:00
Jan-Christoph Borchardt 599398e4a0 Increase contrast of dropdown menu text, fix accessibility & visibility issues
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2017-08-21 16:34:53 +02:00
Morris Jobke a90d6090a7 Merge pull request #6195 from nextcloud/12-6194
[stable12] Use correct l10n for app password menu
2017-08-21 12:24:31 +02:00
Lukas Reschke 179b850e4d
Ensure log message is UTF-8 encoded
PHP's json_encode only accept proper UTF-8 strings, loop over all
elements to ensure that they are properly UTF-8 compliant or convert
them manually.

Without this somebody passing an invalid User Agent may make json_encode
return false which will get logged as empty newline.

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-08-21 10:21:54 +02:00
Morris Jobke 296f71dd9a Use correct l10n for app password menu
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-08-21 09:22:52 +02:00
Nextcloud bot de8fe9cbd9
[tx-robot] updated from transifex 2017-08-21 00:08:22 +00:00
Nextcloud bot 6ea56593a7
[tx-robot] updated from transifex 2017-08-20 00:08:24 +00:00
Nextcloud bot 366c73a185
[tx-robot] updated from transifex 2017-08-19 00:08:36 +00:00
Morris Jobke ddf7e0629c Merge pull request #6173 from nextcloud/12-6161
[stable12] Enable object storage tests again
2017-08-18 23:02:10 +02:00
Nextcloud bot 7e0c00b576
[tx-robot] updated from transifex 2017-08-18 00:08:25 +00:00
Morris Jobke 37bc43c19c Enable object storage tests again
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-08-17 19:35:26 +02:00
Lukas Reschke b88072d336
Build merged JS
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-08-17 12:36:32 +02:00