Julius Härtl
9f9f1d8cb0
Fix tests for backup ldap server connection
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-07-13 15:42:34 +02:00
Julius Härtl
7c8cec808f
Only bind if configuration for the first server is available
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-07-13 15:42:31 +02:00
Nextcloud bot
30dea9906a
[tx-robot] updated from transifex
2018-07-13 00:12:14 +00:00
Morris Jobke
31d30f5657
Merge pull request #10172 from nextcloud/version/noid/13.0.5RC1
...
13.0.5 RC 1
2018-07-12 13:25:41 +02:00
Morris Jobke
69ff4dd5c6
13.0.5 RC 1
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-07-12 12:21:59 +02:00
Roeland Jago Douma
2639533422
Merge pull request #10201 from nextcloud/smb-rename-invalidargument-retry-13
...
[13] also retry rename operation on InvalidArgumentException
2018-07-12 09:49:43 +02:00
Nextcloud bot
dc0fd5f2d2
[tx-robot] updated from transifex
2018-07-12 00:12:52 +00:00
Roeland Jago Douma
9c5b1852ca
Use ILogger for consts
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-07-11 22:43:34 +02:00
Roeland Jago Douma
b660dd8d74
Merge pull request #10202 from nextcloud/backport/10199/improve-url-detection-in-comments
...
[stable13] Improve url detection in comments
2018-07-11 19:46:17 +02:00
Joas Schilling
f879ea142d
Improve url detection in comments
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-07-11 16:40:16 +02:00
Robin Appelman
4f9aac4002
also retry rename operation on InvalidArgumentException
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2018-07-11 16:38:35 +02:00
Morris Jobke
e8af003b41
Merge pull request #10195 from nextcloud/backport/10193/sanitize-parameter-13
...
[stable13] Sanitize parameters in createSessionToken() while logging
2018-07-11 16:31:01 +02:00
Morris Jobke
d88da34f95
Sanitize parameters in createSessionToken() while logging
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-07-11 14:45:13 +02:00
Morris Jobke
73c1fa6b64
Merge pull request #10115 from nextcloud/backport/10098/ldap-image-attribute
...
[stable13] allow admin to disable fetching of avatars as well as a specific attribute
2018-07-11 11:45:26 +02:00
Morris Jobke
cc09db6c5b
Merge pull request #10189 from nextcloud/backport/10020/email-address-misparsed-in-comments-and-chat
...
[stable13] Fix "parsing" of email-addresses in comments and chat messages
2018-07-11 11:41:32 +02:00
Morris Jobke
a9b4be205a
Merge pull request #10188 from nextcloud/backport/10078/invalid-actor-and-calendar-for-link-shares
...
[stable13] Correctly parse the subject parameters for link (un)shares of calendars
2018-07-11 11:41:11 +02:00
Morris Jobke
5f029e6136
Merge pull request #10185 from nextcloud/backport/10161/correctly-handle-users-with-numeric-user-ids-13
...
[stable13] Correctly handle users with numeric user ids
2018-07-11 10:03:27 +02:00
Morris Jobke
9d3a4b428d
Merge pull request #10186 from nextcloud/backport/10156/behat-3.3
...
[stable13] Fix the behat version to 3.3.*
2018-07-11 10:03:01 +02:00
Morris Jobke
4ff6ea9a55
Merge pull request #10170 from nextcloud/backport/9823/stable13
...
[stable13] Allow updating the token on session regeneration
2018-07-11 10:02:30 +02:00
Joas Schilling
4e99dc2318
Fix "parsing" of email-addresses in comments and chat messages
...
\\b matches any non-word character, including \@ and \-
In order to not detect urls in the middle of email-addresses,
we need to check for white space characters and beginning of the
message instead.
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-07-11 09:51:59 +02:00
Joas Schilling
77f7a95699
Correctly parse the subject parameters for link (un)shares of calendars
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-07-11 09:45:10 +02:00
John Molakvoæ
c99529834c
Merge pull request #10169 from nextcloud/backport/9955/stable13
...
[stable13] Request a valid property for DAV opendir
2018-07-11 09:42:20 +02:00
Joas Schilling
33bde0f62a
Fix the behat version to 3.3.*
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-07-11 09:32:26 +02:00
Joas Schilling
03a6b2b49a
Correctly handle users with numeric user ids
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-07-11 09:26:29 +02:00
Morris Jobke
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
Nextcloud bot
ef1a695707
[tx-robot] updated from transifex
2018-07-11 00:12:24 +00:00
Robin Appelman
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
Nextcloud bot
7843a9b21a
[tx-robot] updated from transifex
2018-07-10 08:21:28 +00:00
Roeland Jago Douma
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
Roeland Jago Douma
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
Morris Jobke
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
Morris Jobke
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
Morris Jobke
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
Morris Jobke
00e632eec1
Disable codecov status and comment
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-07-09 15:30:53 +02:00
Jaczel
f774a88927
Fixed English grammatical error on Settings page.
2018-07-09 15:22:21 +02:00
Kevin Ndung'u
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
Morris Jobke
83d99449d0
Merge pull request #10121 from nextcloud/stable13-allow-disable-encryption
...
[stable13] allow to disable encryption
2018-07-09 14:46:06 +02:00
Bjoern Schiessle
3a45bb52bc
allow to disable encryption
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2018-07-05 17:24:09 +02:00
Arthur Schiwon
7f78958056
adjust and add more unit tests
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2018-07-05 12:50:08 +02:00
Arthur Schiwon
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
blizzz
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
Morris Jobke
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
Robin Appelman
6d68d34f2f
Improved logging of smb connection errors
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2018-07-03 18:12:31 +02:00
Arthur Schiwon
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
blizzz
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
Arthur Schiwon
ea62d7a9f5
constants belong to Util in 13
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2018-07-02 12:51:51 +02:00
Arthur Schiwon
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
Morris Jobke
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
Daniel Calviño Sánchez
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
Daniel Calviño Sánchez
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