Commit Graph

42857 Commits

Author SHA1 Message Date
Morris Jobke 1bd21fa351
Merge pull request #10761 from nextcloud/backport/10225/fix-url-generation-dav-app
[stable13] Fix call to OC.generateUrl for caldav birthday calendar on/off
2018-08-20 14:46:40 +02:00
Morris Jobke 995b4d996f
Merge pull request #10759 from nextcloud/backport/10755/fix-comments-in-config-sample
[stable13] Fix comment style in config sample
2018-08-20 14:46:21 +02:00
Morris Jobke 391e693adf
Use the path_hash instead of the path to query the filecache
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-08-20 14:22:52 +02:00
Daniel Kesselberg ee52136772
Fix call to OC.generateUrl for caldav birthday calendar on/off
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
2018-08-20 14:20:52 +02:00
Joas Schilling 60ced31116
Make sure error_log() always receives a string
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-08-20 14:12:08 +02:00
Morris Jobke c31e629713
Fix comment style in config sample
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-08-20 14:08:00 +02:00
Nextcloud bot f2f723c7c8
[tx-robot] updated from transifex 2018-08-20 00:12:36 +00:00
Nextcloud bot ff8626f46e
[tx-robot] updated from transifex 2018-08-18 00:12:45 +00:00
John Molakvoæ (skjnldsv) c428c7c2bf
Do not bind reset password link if an url is set
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-08-17 17:07:43 +02:00
Nextcloud bot 47ea2c17fd
[tx-robot] updated from transifex 2018-08-16 00:12:35 +00:00
Robin Appelman b2685eb4ee
log entries that are hidden during file listing
Signed-off-by: Robin Appelman <robin@icewind.nl>
2018-08-16 01:16:53 +02:00
blizzz 853e55e31a
Merge pull request #10646 from nextcloud/fix-password-reset-stable13
[stable13] only warn about data lose on password reset if per-user keys are used
2018-08-15 19:08:11 +02:00
Nextcloud bot 294baf8e5d
[tx-robot] updated from transifex 2018-08-15 00:13:48 +00:00
Roeland Jago Douma 1a3a0b4617
Merge pull request #10682 from nextcloud/backport/10680/stable13
[stable13] Update the scope of the lockdownmanager
2018-08-14 14:29:35 +02:00
Roeland Jago Douma b31cea9048
Update the scope of the lockdownmanager
We have the token anyway. So better the scope as well.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-08-14 13:16:07 +02:00
Nextcloud bot 015c66b94f
[tx-robot] updated from transifex 2018-08-14 00:12:15 +00:00
blizzz c938ea6569
Merge pull request #10620 from nextcloud/mimetype-insert-if-not-exists-13
[13] use insertIfNotExists to store new mimetypes.
2018-08-13 23:16:00 +02:00
Nextcloud bot 5327e3b4ce
[tx-robot] updated from transifex 2018-08-13 00:12:18 +00:00
Nextcloud bot 7ed7c8e37a
[tx-robot] updated from transifex 2018-08-11 00:12:39 +00:00
Bjoern Schiessle 5b54b8cba2
update unit tests
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2018-08-10 17:26:11 +02:00
Bjoern Schiessle 9665637cd8
only warn about data lose on password reset if per-user keys are used
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2018-08-10 16:54:55 +02:00
Roeland Jago Douma abef061686
Merge pull request #10581 from nextcloud/encryption-s3-fix-stable13
make file cache updates more robust
2018-08-10 08:10:03 +02:00
Nextcloud bot 93df97f1bf
[tx-robot] updated from transifex 2018-08-10 00:12:36 +00:00
Robin Appelman 706813ab08
use insertIfNotExists to store new mimetypes.
Also throw an error if we can't find the mimetype after insert

Signed-off-by: Robin Appelman <robin@icewind.nl>
2018-08-09 15:31:47 +02:00
Robin Appelman 0450406c50
retry stat on timeout
Signed-off-by: Robin Appelman <robin@icewind.nl>
2018-08-08 16:15:31 +02:00
Bjoern Schiessle be172cc6f2
make file cache updates more robust
only update the encrypted version after the write operation is finished and the stream is closed

Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2018-08-08 10:46:14 +02:00
Nextcloud bot a5985ad0f4
[tx-robot] updated from transifex 2018-08-08 00:13:28 +00:00
Daniel Calviño Sánchez 5da4e4dc53 Fix transfering ownership of a share to user with same id as receiver
When the ownership of a user share is transfered to the receiver the
share is removed, as the receiver now owns the original file. However,
due to a missing condition, any share with a group, link or remote with
the same id as the user was removed, not only the user shares.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-08-07 09:09:01 +02:00
Nextcloud bot f6c8668a7e
[tx-robot] updated from transifex 2018-08-07 00:12:15 +00:00
Thomas Müller 32701e261b
Adding test for table schedulingobjects and fixing postgres LOB
(cherry picked from commit afd4ebf0404e8bcd7cba0bec2dce177e97632f8a)

Signed-off-by: Jan Losinski <losinski@wh2.tu-dresden.de>
2018-08-06 17:20:49 +02:00
Nextcloud bot 8e0e5a6b28
[tx-robot] updated from transifex 2018-08-06 00:12:30 +00:00
Nextcloud bot 66d74f6e56
[tx-robot] updated from transifex 2018-08-05 00:12:38 +00:00
Nextcloud bot 69af30b883
[tx-robot] updated from transifex 2018-08-04 00:12:47 +00:00
Nextcloud bot b02d1c8358
[tx-robot] updated from transifex 2018-08-03 00:12:32 +00:00
Nextcloud bot ddd6c72b1f
[tx-robot] updated from transifex 2018-08-02 00:12:46 +00:00
Nextcloud bot 6e449f13cd
[tx-robot] updated from transifex 2018-08-01 00:12:09 +00:00
Nextcloud bot ab6741427b
[tx-robot] updated from transifex 2018-07-31 00:12:21 +00:00
Nextcloud bot f4b4fcf8e4
[tx-robot] updated from transifex 2018-07-30 00:12:17 +00:00
Nextcloud bot 9ba794c067
[tx-robot] updated from transifex 2018-07-28 00:12:17 +00:00
Nextcloud bot 628a0434a5
[tx-robot] updated from transifex 2018-07-27 00:12:29 +00:00
Nextcloud bot 0802675f47
[tx-robot] updated from transifex 2018-07-26 00:12:13 +00:00
Nextcloud bot ca139a4a81
[tx-robot] updated from transifex 2018-07-25 00:12:44 +00:00
Roeland Jago Douma e39f410a2b
Merge pull request #10376 from nextcloud/background-scan-root-13
[13] Do scan the root storage in background scan
2018-07-24 16:17:29 +02:00
Robin Appelman 8aeafc63a1
Do scan the root storage in background scan
Signed-off-by: Robin Appelman <robin@icewind.nl>
2018-07-24 15:45:51 +02:00
Nextcloud bot ad16affc9e
[tx-robot] updated from transifex 2018-07-24 00:12:13 +00:00
Morris Jobke 1a082ab2a2
Merge pull request #10350 from nextcloud/version/noid/13.0.5
13.0.5
2018-07-23 12:47:15 +02:00
Morris Jobke dbff6b4dfe
13.0.5
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-07-23 10:52:03 +02:00
Joas Schilling 9e7197cbcc
Do not parse HTML in user id and display name
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-07-23 10:51:25 +02:00
Nextcloud bot ab7b4d2597
[tx-robot] updated from transifex 2018-07-23 00:12:14 +00:00
Nextcloud bot ebe599df4d
[tx-robot] updated from transifex 2018-07-22 00:12:51 +00:00