33bde0f62a
Fix the behat version to 3.3.*
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-07-11 09:32:26 +02:00
03a6b2b49a
Correctly handle users with numeric user ids
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-07-11 09:26:29 +02:00
922c2c64b5
Merge pull request #10180 from nextcloud/lock-negative-13
...
[13] prevent lock values from going negative with memcache backend
2018-07-11 09:02:19 +02:00
ef1a695707
[tx-robot] updated from transifex
2018-07-11 00:12:24 +00:00
1fa6115779
prevent lock values from going negative with memcache backend
...
This can be caused by the code releasing more locks then it acquires,
once the lock value becomes negative it's likely that it will never be able
to change into an exclusive lock again.
Signed-off-by: Robin Appelman <robin@icewind.nl>
2018-07-10 17:50:45 +02:00
7843a9b21a
[tx-robot] updated from transifex
2018-07-10 08:21:28 +00:00
f84789f88b
Allow updating the token on session regeneration
...
Sometimes when we force a session regeneration we want to update the
current token for this session.
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-07-09 16:27:12 +02:00
d03b389b56
Request a valid property for DAV opendir
...
Apperently Sabre and Onedrive are not friends when requesting a single
404 property. I need to dig deeper on why this is. Anyways requesting a
valid property makes it work like a charm.
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-07-09 16:07:04 +02:00
57ca183ea4
Merge pull request #10166 from nextcloud/backport/10039/codecov-disabling
...
[stable13] Disable codecov status and comment
2018-07-09 15:51:06 +02:00
0404acfc81
Merge pull request #10165 from nextcloud/backport/9914/settings-wording-13
...
[stable13] Fixed English grammatical error on Settings page.
2018-07-09 15:50:25 +02:00
9ba31f3565
Merge pull request #10164 from nextcloud/backport/9893/update-message-13
...
[stable13] Update message shown when unsharing a file
2018-07-09 15:38:44 +02:00
00e632eec1
Disable codecov status and comment
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-07-09 15:30:53 +02:00
f774a88927
Fixed English grammatical error on Settings page.
2018-07-09 15:22:21 +02:00
1bd58c1718
Update message shown when unsharing a file
...
Signed-off-by: Kevin Ndung'u <kevgathuku@gmail.com>
2018-07-09 15:16:59 +02:00
83d99449d0
Merge pull request #10121 from nextcloud/stable13-allow-disable-encryption
...
[stable13] allow to disable encryption
2018-07-09 14:46:06 +02:00
3a45bb52bc
allow to disable encryption
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2018-07-05 17:24:09 +02:00
7f78958056
adjust and add more unit tests
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2018-07-05 12:50:08 +02:00
37a20cede1
allow admin to disable fetching of avatars as well as a specific attribute
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2018-07-05 12:26:45 +02:00
486dff0934
Merge pull request #10089 from nextcloud/backport/10083/stable13
...
[stable13] let user set avatar in nextcloud von LDAP provides invalid image data
2018-07-05 00:54:04 +02:00
f5bbe21155
Merge pull request #10093 from nextcloud/smb-log-connection-errors-13
...
[13] Improved logging of smb connection errors
2018-07-03 23:05:58 +02:00
6d68d34f2f
Improved logging of smb connection errors
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2018-07-03 18:12:31 +02:00
55a6851791
let user set avatar in nextcloud von LDAP provides invalid image data
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2018-07-03 13:12:00 +02:00
d1df33a190
Merge pull request #10076 from nextcloud/backport/10034/stable13
...
[stable13] lower log level for quota manipulation cases
2018-07-02 13:10:33 +02:00
ea62d7a9f5
constants belong to Util in 13
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2018-07-02 12:51:51 +02:00
56aaa40dde
lower log level for quota manipulation cases
...
and simplify the forest of ifs a little bit
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2018-07-02 11:53:49 +02:00
42de484162
Merge pull request #10044 from nextcloud/stable13-10040-fix-filenames-in-sharing-integration-tests
...
[stable13] Fix filenames in sharing integration tests
2018-06-29 09:03:20 +02:00
eeab10df11
Check all paths for own files and shares
...
Add "PARENT (2)" and its subdirectories to the paths to be checked, as
before only the own "PARENT" folder was being checked, but not the
shared one.
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-06-29 08:21:55 +02:00
6d9b322413
Fix filenames in sharing integration tests
...
When a file is shared and the receiver of the share already has a file
with the same name that file is left untouched, and "(2)" is appended to
the name of the shared file.
As "textfile0.txt" is included in the user folder skeleton all the users
in the integration test have that file, so when it is shared the
receiver sees the share as "/textfile0 (2).txt", and her own file as
"/textfile0.txt".
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-06-29 08:21:55 +02:00
37063bc657
[tx-robot] updated from transifex
2018-06-29 00:12:27 +00:00
a5dfc3e0ee
Merge pull request #10032 from nextcloud/backport/10031/stable13
...
[stable13] LDAP backup server should not be queried when auth fails
2018-06-28 08:39:58 +02:00
6292c4857d
[tx-robot] updated from transifex
2018-06-28 00:12:40 +00:00
993342f6a1
LDAP backup server should not be queried when auth fails
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2018-06-27 23:15:44 +02:00
fb9f4e3ebf
[tx-robot] updated from transifex
2018-06-27 10:06:32 +00:00
c4e79862c4
[tx-robot] updated from transifex
2018-06-27 00:12:10 +00:00
f69c7d7d6c
Merge pull request #9986 from nextcloud/dav-upload-no-partfile-lock-13
...
[13] properly lock the target file on dav upload when not using part files
2018-06-26 09:15:12 +02:00
257c7191b3
[tx-robot] updated from transifex
2018-06-26 00:12:27 +00:00
547177b482
properly lock the target file on dav upload when not using part files
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2018-06-25 12:18:18 +02:00
ea89600ca0
[tx-robot] updated from transifex
2018-06-25 00:12:07 +00:00
38040951f5
[tx-robot] updated from transifex
2018-06-24 00:12:26 +00:00
891bd63310
[tx-robot] updated from transifex
2018-06-23 00:13:03 +00:00
64b3614182
Merge pull request #9958 from nextcloud/backport/7818/stable13
...
[stable13] Log full exception in cron instead of only the message
2018-06-22 07:37:11 +02:00
3ac6f4d504
[tx-robot] updated from transifex
2018-06-22 00:12:31 +00:00
20f1523c0e
Log full exception in cron instead of only the message
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-06-21 23:17:45 +02:00
869aa64d0d
[tx-robot] updated from transifex
2018-06-21 00:13:07 +00:00
4d8285553a
[tx-robot] updated from transifex
2018-06-20 00:12:46 +00:00
6a29c408e5
Merge pull request #9843 from nextcloud/backport/9724/stable13
...
[stable13] Add parent index to share table
2018-06-19 16:02:13 +02:00
54bc862c9d
[tx-robot] updated from transifex
2018-06-19 00:13:16 +00:00
1b940a3c7e
[tx-robot] updated from transifex
2018-06-18 00:12:54 +00:00
6bc2a993f7
[tx-robot] updated from transifex
2018-06-17 00:13:08 +00:00
3214e69761
[tx-robot] updated from transifex
2018-06-16 00:13:34 +00:00
Joas Schilling
Morris Jobke
Nextcloud bot
Robin Appelman
Roeland Jago Douma
Jaczel
Kevin Ndung'u
Bjoern Schiessle
Arthur Schiwon
Daniel Calviño Sánchez
Roeland Jago Douma
John Molakvoæ