Commit Graph

14992 Commits

Author SHA1 Message Date
Nextcloud bot c55e842478
[tx-robot] updated from transifex 2018-06-08 00:13:15 +00:00
Christoph Wurst e5fb98d9fc
Fix syntax for php5.6
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2018-06-04 15:12:57 +02:00
Christoph Wurst 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
Morris Jobke cf4ff7716e
Merge pull request #9694 from nextcloud/backport/9692/stable13
[stable13] Make sure the log doesn't try to read from PUT if it can't
2018-06-01 12:21:26 +02:00
Nextcloud bot 3595aa68b9
[tx-robot] updated from transifex 2018-06-01 00:12:48 +00:00
Nextcloud bot cc6317f2af
[tx-robot] updated from transifex 2018-05-31 00:13:02 +00:00
Roeland Jago Douma 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
Morris Jobke 3acfcc433a
Merge pull request #9668 from nextcloud/backport/9666/stable13
[stable13] Make sure the file is readable before attempting to create a preview
2018-05-30 11:34:29 +02:00
Nextcloud bot b889259b1e
[tx-robot] updated from transifex 2018-05-30 00:12:31 +00:00
Roeland Jago Douma 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
Morris Jobke 5c9f2dd99f
Merge pull request #9651 from nextcloud/backport/9271/stable13
[stable13] Fix undefined variables
2018-05-29 17:08:40 +02:00
marco44 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
Morris Jobke 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
Morris Jobke 6a4a7c868c
Fix undefined variable - found by Phan
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-05-29 15:12:10 +02:00
Morris Jobke b03752b1d9
Merge pull request #9620 from nextcloud/backport/9576/stable13
[stable13] Emit event when running ./occ db:add-missing-indices
2018-05-29 14:30:27 +02:00
Nextcloud bot 00edb8f2d4
[tx-robot] updated from transifex 2018-05-29 00:12:43 +00:00
Morris Jobke 8889220f55
Merge pull request #9622 from nextcloud/backport/9475/stable13
[stable13] Delete the previews when a version is restored
2018-05-28 11:20:18 +02:00
Roeland Jago Douma dd5995a2f8
Emit event when running ./occ db:add-missing-indices
This allows apps to listen to this event in order to also update
indecies there.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-05-28 09:04:59 +02:00
Nextcloud bot 5a20bb6980
[tx-robot] updated from transifex 2018-05-28 00:13:05 +00:00
Nextcloud bot f800c1697c
[tx-robot] updated from transifex 2018-05-27 00:13:28 +00:00
Roeland Jago Douma 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
Nextcloud bot 043acfebab
[tx-robot] updated from transifex 2018-05-26 00:13:24 +00:00
Nextcloud bot d8e3c3cb22
[tx-robot] updated from transifex 2018-05-25 00:15:16 +00:00
Roeland Jago Douma 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
Georg Ehrke 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
Nextcloud bot c3a1d33959
[tx-robot] updated from transifex 2018-05-24 00:14:07 +00:00
Robin Appelman 874e312980
cleanup locks in scanner on error
Signed-off-by: Robin Appelman <robin@icewind.nl>
2018-05-23 20:05:54 +02:00
Morris Jobke 2f059d1caf
Merge pull request #9540 from nextcloud/backport/9517/stable13
[stable13] Improve OAuth
2018-05-23 15:42:22 +02:00
Nextcloud bot 82d0d1d704
[tx-robot] updated from transifex 2018-05-23 00:16:07 +00:00
Morris Jobke bae5ec5cb0
Merge pull request #9525 from nextcloud/backport/8504/stable13
[stable13] Dont use $info as array when its not an array
2018-05-22 16:33:04 +02:00
Roeland Jago Douma 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
Roeland Jago Douma 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
Nextcloud bot 41cd6076fb
[tx-robot] updated from transifex 2018-05-22 00:13:54 +00:00
Nextcloud bot 352d0af868
[tx-robot] updated from transifex 2018-05-20 00:13:45 +00:00
Joas Schilling 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
Nextcloud bot c101ad3a65
[tx-robot] updated from transifex 2018-05-18 00:14:09 +00:00
Nextcloud bot b08e53d365
[tx-robot] updated from transifex 2018-05-17 00:14:09 +00:00
Morris Jobke 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
Morris Jobke 1aa149a615
Merge pull request #9436 from nextcloud/backport/9373/stable13
[stable13] Get correct version of an app
2018-05-14 13:33:14 +02:00
Nextcloud bot d3d750fdc4
[tx-robot] updated from transifex 2018-05-14 00:13:48 +00:00
Nextcloud bot cd3b0ca7da
[tx-robot] updated from transifex 2018-05-12 00:13:27 +00:00
Nextcloud bot 465397fa02
[tx-robot] updated from transifex 2018-05-11 00:13:23 +00:00
Nextcloud bot e2f5355f73
[tx-robot] updated from transifex 2018-05-10 00:13:31 +00:00
Roeland Jago Douma 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
Joas Schilling ea834dab28
php 5.6 compatibility
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-05-09 12:12:13 +02:00
Joas Schilling 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
Joas Schilling 02388a3942
Allow IPv6 database hosts
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-05-09 10:50:47 +02:00
Nextcloud bot d8d09475c4
[tx-robot] updated from transifex 2018-05-09 00:11:50 +00:00
Morris Jobke 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
Robin Appelman a6ea5eb1b5
remove unneeded locks in getCacheEntry
Signed-off-by: Robin Appelman <robin@icewind.nl>
2018-05-04 15:06:39 +02:00