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
d88da34f95
Sanitize parameters in createSessionToken() while logging
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-07-11 14:45:13 +02:00
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
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
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
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
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
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
88c7c6abe3
Make the token expiration also work for autocasting 0
...
Some bad databases don't respect the default null apprently.
Now even if they cast it to 0 it should work just fine.
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-06-08 16:26:30 +02:00
e5fb98d9fc
Fix syntax for php5.6
...
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2018-06-04 15:12:57 +02:00
2b0ae6df9f
Fix local users check in contacts menu
...
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2018-06-04 15:05:40 +02:00
188a41a2be
Make sure the log doesn't try to read from PUT if it can't
...
If a PUT request comes in that is not JSON or from encoded. Then we can
only read it (exactly) once. If that is the case we must assume no
shared secret is set.
If we don't then we either are the first to read it, thus causing the
real read of the data to fail.
Or we are later and then it throws an exception (also failing the
request).
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-05-30 20:16:18 +02:00
e55effc5ef
Make sure the file is readable before attempting to create a preview
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-05-29 22:03:43 +02:00
5c9f2dd99f
Merge pull request #9651 from nextcloud/backport/9271/stable13
...
[stable13] Fix undefined variables
2018-05-29 17:08:40 +02:00
184a0b97fc
Make LargeFileHelper.php faster by avoiding execs as much as possible
...
Signed-off-by: Marc Cousin <cousinmarc@gmail.com>
2018-05-29 15:31:55 +02:00
57489f1013
Remove a check for an unused variable
...
Left over from a refactoring
https://github.com/nextcloud/server/pull/1940
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-05-29 15:13:57 +02:00
6a4a7c868c
Fix undefined variable - found by Phan
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-05-29 15:12:10 +02:00
d33834f07a
Delete the previews when a version is restored
...
Fixes #9469
When a version of a file is restored the previews are no longer valid.
Thus we should remove them so they are regenerated.
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-05-26 14:09:11 +02:00
930c11a6cd
Always set the request language to the force language
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-05-24 13:08:10 +02:00
0493d0e3fb
make sure force language is reflected in html lang attribute
...
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2018-05-24 13:07:54 +02:00
874e312980
cleanup locks in scanner on error
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2018-05-23 20:05:54 +02:00
2f059d1caf
Merge pull request #9540 from nextcloud/backport/9517/stable13
...
[stable13] Improve OAuth
2018-05-23 15:42:22 +02:00
46aafe4f11
Certain tokens can expire
...
However due to the nature of what we store in the token (encrypted
passwords etc). We can't just delete the tokens because that would make
the oauth refresh useless.
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-05-22 14:26:13 +02:00
8fcb7d4334
Allow the rotation of tokens
...
This for example will allow rotating the apptoken for oauth
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-05-22 12:51:25 +02:00
ccedb314a8
Dont use $info as array when its not an array
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-05-18 23:50:10 +02:00
003cc5acfd
Merge pull request #9432 from nextcloud/backport/9225/ipv6-database-host
...
[stable13] Allow IPv6 database host
2018-05-14 13:36:21 +02:00
a7948069c5
Get correct version of an app
...
Related to #8929
We should get the version of the app. Not of the appfolder. Else there
is no way to properly compare the versions.
Now note that installing in 1 go will still fail. But at least on the
next page load the new version will be properly detected.
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-05-09 12:15:39 +02:00
ea834dab28
php 5.6 compatibility
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-05-09 12:12:13 +02:00
7bb44214a1
Move regex to a function and add tests
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-05-09 10:50:56 +02:00
02388a3942
Allow IPv6 database hosts
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-05-09 10:50:47 +02:00
7bf713edaf
Merge pull request #9389 from nextcloud/log-lock-state-on-conflict-13
...
[13] Log lock state on conflict
2018-05-07 16:29:42 +02:00
a6ea5eb1b5
remove unneeded locks in getCacheEntry
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2018-05-04 15:06:39 +02:00
bc1a17a9e2
always log locking errors
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2018-05-04 13:35:26 +02:00
a070c1177a
Log more info about locking conflicts for memcache locking backends
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2018-05-04 13:35:26 +02:00
cc54429646
Issue #9318 : catch exceptions in SCSSCacher::resetCache()
...
Signed-off-by: Roland Tapken <roland@bitarbeiter.net>
2018-05-03 11:02:53 +02:00
26c153667a
Merge pull request #9231 from nextcloud/13-9205
...
[stable13] Provide an option to disable HTML emails
2018-04-18 22:38:33 +02:00
a1c4bdfdf8
Merge pull request #9233 from nextcloud/13-9159
...
[stable13] fix appinfo parsing when a single localized option is provided
2018-04-18 21:18:37 +02:00
5fbba7854b
fix appinfo parsing when a single localized option is provided
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2018-04-18 17:32:19 +02:00
01278056a5
Provide an option to disable HTML emails
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-04-18 16:59:34 +02:00
6b97429ebe
Show EOL warning in the update section
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-04-18 13:46:25 +02:00
d45a889fe2
Merge pull request #8779 from nextcloud/backport/8255/show-group-display-names
...
[stable13] Show group display names
2018-04-06 15:14:12 +02:00
b9ca121671
Merge pull request #9095 from JaredBoone/bugfix/8387
...
Do not convert email addresses with idn_to_ascii if…
2018-04-06 11:44:51 +02:00
52c7f17faf
Do not convert email addresses with idn_to_ascii if INTL_IDNA_VARIANT_UTS46 is undefined.
...
Fixes https://github.com/nextcloud/server/issues/8387 .
Signed-off-by: Jared Boone <jared.boone@gmail.com>
2018-04-05 11:28:31 -07:00
bb656750f5
Add more logging for the object storage during creation of the buckets
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-04-05 17:29:44 +02:00
bd0672530b
Move on with the next user if we found the user on one user back-end
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2018-04-04 17:13:47 +02:00
5a74b9cb99
Fix proper permissions for multiple file access
...
Fixes #8890
In case you have access to a file via multiple ways, for example:
1. the file is shared with you with permission read only
2. the folder containing the file is shared with your read/write
Requesting the getById function on the userFolder would give back two
entries but both with the same permissions. Depending on the node you
picked this is not right.
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-04-04 12:02:37 +02:00
d4f64b94f2
reset encryptionVersion to '1' if a file was stream copied, because this means that we basically write the file from scratch
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2018-04-03 18:12:16 +02:00
05f76b3469
Use app version to generate scss filename
...
Fixed scsscacher tests
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-03-28 16:11:10 +02:00
Robin Appelman
Morris Jobke
John Molakvoæ
Roeland Jago Douma
Bjoern Schiessle
Christoph Wurst
marco44
Georg Ehrke
Joas Schilling
Roland Tapken
Roeland Jago Douma
Jared Boone
John Molakvoæ (skjnldsv)