Commit Graph

47945 Commits

Author SHA1 Message Date
Roeland Jago Douma 092a233f91
Merge pull request #16537 from nextcloud/backport/16503/stable15
[stable15] allow to provide supported calendar component set internally as a string
2019-07-25 15:44:13 +02:00
Georg Ehrke 07cbabb5db allow to provide supported calendar component set internally as a string
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2019-07-25 11:37:54 +00:00
Nextcloud bot 469da4ff0a
[tx-robot] updated from transifex 2019-07-25 02:14:55 +00:00
Nextcloud bot ce37c6586b
[tx-robot] updated from transifex 2019-07-24 02:15:50 +00:00
Nextcloud bot cbd7ac6ac0
[tx-robot] updated from transifex 2019-07-23 02:15:57 +00:00
Nextcloud bot 6a878f0fce
[tx-robot] updated from transifex 2019-07-22 02:16:15 +00:00
Nextcloud bot ba8804dba9
[tx-robot] updated from transifex 2019-07-21 02:15:24 +00:00
Nextcloud bot 12670fbf38
[tx-robot] updated from transifex 2019-07-20 02:14:46 +00:00
Nextcloud bot 5c3e599a15
[tx-robot] updated from transifex 2019-07-19 02:15:14 +00:00
Roeland Jago Douma fb60ef6d1a
Merge pull request #16445 from nextcloud/backport/16440/stable15
[stable15] Fix File#putContents(string) on ObjectStorage
2019-07-18 08:09:03 +02:00
Nextcloud bot 788d727ccc
[tx-robot] updated from transifex 2019-07-18 02:15:11 +00:00
Marcel Klehr eb14a8fcba Fix File#putContents(string) on ObjectStorage
Signed-off-by: Marcel Klehr <mklehr@gmx.net>
2019-07-17 20:40:05 +00:00
Roeland Jago Douma cb99a62c07
Merge pull request #16433 from nextcloud/backport/16424/stable15
[stable15] Do not keep searching for recent
2019-07-17 09:20:53 +02:00
Roeland Jago Douma 7bd081ff84 Do not keep searching for recent
If userA has a lot of recent files. But only shares 1 file with userB
(that has no files at all). We could keep searching until we run out of
recent files for userA.

Now assume the inactive userB has 20 incomming shares like that from
different users. getRecent then basically keeps consuming huge amounts
of resources and with each iteration the load on the DB increases
(because of the offset).

This makes sure we do not get more than 3 times the limit we search for
or more than 5 queries.

This means we might miss some recent entries but we should fix that
separatly. This is just to make sure the load on the DB stays sane.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2019-07-17 05:48:53 +00:00
Nextcloud bot f42afb059e
[tx-robot] updated from transifex 2019-07-17 02:15:46 +00:00
Roeland Jago Douma 279b73414c
Merge pull request #16426 from nextcloud/backport/16423/stable15
[stable15] Only prevent disabling encrytion via the API
2019-07-16 22:18:46 +02:00
Joas Schilling d5cd482708 Only prevent disabling encrytion via the API
Signed-off-by: Joas Schilling <coding@schilljs.com>
2019-07-16 17:46:59 +00:00
Nextcloud bot 938b8664e9
[tx-robot] updated from transifex 2019-07-16 02:15:01 +00:00
Nextcloud bot 654feeee6c
[tx-robot] updated from transifex 2019-07-15 02:14:44 +00:00
Nextcloud bot 2df9cf83d4
[tx-robot] updated from transifex 2019-07-14 02:15:20 +00:00
Nextcloud bot 9320bb520f
[tx-robot] updated from transifex 2019-07-13 02:14:32 +00:00
Nextcloud bot 2f857c6b37
[tx-robot] updated from transifex 2019-07-12 02:15:15 +00:00
Morris Jobke 7bb694c0a1
Merge pull request #16348 from nextcloud/dependabot/npm_and_yarn/apps/accessibility/stable15/lodash-4.17.14
[Security] Bump lodash from 4.17.11 to 4.17.14 in /apps/accessibility
2019-07-11 12:54:02 +02:00
Morris Jobke 77d059fce7
Merge pull request #16351 from nextcloud/dependabot/npm_and_yarn/apps/updatenotification/stable15/lodash-4.17.14
[Security] Bump lodash from 4.17.11 to 4.17.14 in /apps/updatenotification
2019-07-11 12:53:45 +02:00
dependabot-preview[bot] b40ec9b38b
[Security] Bump lodash in /apps/updatenotification
Bumps [lodash](https://github.com/lodash/lodash) from 4.17.11 to 4.17.14. **This update includes security fixes.**
- [Release notes](https://github.com/lodash/lodash/releases)
- [Commits](https://github.com/lodash/lodash/compare/4.17.11...4.17.14)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-07-11 10:52:49 +00:00
dependabot-preview[bot] 4d5c961db9
[Security] Bump lodash from 4.17.11 to 4.17.14 in /apps/accessibility
Bumps [lodash](https://github.com/lodash/lodash) from 4.17.11 to 4.17.14. **This update includes security fixes.**
- [Release notes](https://github.com/lodash/lodash/releases)
- [Commits](https://github.com/lodash/lodash/compare/4.17.11...4.17.14)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-07-11 10:52:46 +00:00
Morris Jobke 2618b152a4
Merge pull request #16357 from nextcloud/dependabot/npm_and_yarn/apps/oauth2/stable15/lodash-4.17.14
[Security] Bump lodash from 4.17.11 to 4.17.14 in /apps/oauth2
2019-07-11 12:52:16 +02:00
Morris Jobke 9c6213bf50
Merge pull request #16350 from nextcloud/dependabot/npm_and_yarn/settings/stable15/lodash-4.17.13
[Security] Bump lodash from 4.17.11 to 4.17.13 in /settings
2019-07-11 12:51:27 +02:00
Morris Jobke f4646225a9
Merge pull request #16345 from nextcloud/dependabot/npm_and_yarn/settings/stable15/lodash.merge-4.6.2
[Security] Bump lodash.merge from 4.6.1 to 4.6.2 in /settings
2019-07-11 12:51:02 +02:00
dependabot-preview[bot] 02733bc5fa
[Security] Bump lodash from 4.17.11 to 4.17.13 in /settings
Bumps [lodash](https://github.com/lodash/lodash) from 4.17.11 to 4.17.13. **This update includes security fixes.**
- [Release notes](https://github.com/lodash/lodash/releases)
- [Commits](https://github.com/lodash/lodash/compare/4.17.11...4.17.13)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-07-11 10:50:17 +00:00
dependabot-preview[bot] 86dec610ba
[Security] Bump lodash.merge from 4.6.1 to 4.6.2 in /settings
Bumps [lodash.merge](https://github.com/lodash/lodash) from 4.6.1 to 4.6.2. **This update includes security fixes.**
- [Release notes](https://github.com/lodash/lodash/releases)
- [Commits](https://github.com/lodash/lodash/commits)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-07-11 10:50:17 +00:00
dependabot-preview[bot] e9eef3aa3e
[Security] Bump lodash from 4.17.11 to 4.17.14 in /apps/oauth2
Bumps [lodash](https://github.com/lodash/lodash) from 4.17.11 to 4.17.14. **This update includes security fixes.**
- [Release notes](https://github.com/lodash/lodash/releases)
- [Commits](https://github.com/lodash/lodash/compare/4.17.11...4.17.14)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-07-11 10:50:07 +00:00
Morris Jobke cb5e23a7e7
Merge pull request #16344 from nextcloud/dependabot/npm_and_yarn/settings/stable15/lodash.mergewith-4.6.2
[Security] Bump lodash.mergewith from 4.6.1 to 4.6.2 in /settings
2019-07-11 12:49:50 +02:00
Morris Jobke 40d7dc2615
Merge pull request #16346 from nextcloud/dependabot/npm_and_yarn/build/stable15/lodash.mergewith-4.6.2
[Security] Bump lodash.mergewith from 4.6.1 to 4.6.2 in /build
2019-07-11 12:48:12 +02:00
Roeland Jago Douma 5b571719aa
Merge pull request #16353 from nextcloud/dependabot/npm_and_yarn/build/stable15/lodash-4.17.14
[Security] Bump lodash from 4.17.11 to 4.17.14 in /build
2019-07-11 08:56:55 +02:00
dependabot-preview[bot] e87c228c3b
[Security] Bump lodash from 4.17.11 to 4.17.14 in /build
Bumps [lodash](https://github.com/lodash/lodash) from 4.17.11 to 4.17.14. **This update includes security fixes.**
- [Release notes](https://github.com/lodash/lodash/releases)
- [Commits](https://github.com/lodash/lodash/compare/4.17.11...4.17.14)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-07-11 06:50:46 +00:00
John Molakvoæ 1e33822faa
[Security] Bump lodash.merge from 4.6.1 to 4.6.2 in /apps/upda… (#16339)
[Security] Bump lodash.merge from 4.6.1 to 4.6.2 in /apps/updatenotification
2019-07-11 08:49:12 +02:00
Nextcloud bot 8203b9c0b2
[tx-robot] updated from transifex 2019-07-11 02:14:44 +00:00
dependabot-preview[bot] 13d86286b6
[Security] Bump lodash.mergewith from 4.6.1 to 4.6.2 in /build
Bumps [lodash.mergewith](https://github.com/lodash/lodash) from 4.6.1 to 4.6.2. **This update includes security fixes.**
- [Release notes](https://github.com/lodash/lodash/releases)
- [Commits](https://github.com/lodash/lodash/commits)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-07-10 23:34:46 +00:00
dependabot-preview[bot] 85b992e352
[Security] Bump lodash.mergewith from 4.6.1 to 4.6.2 in /settings
Bumps [lodash.mergewith](https://github.com/lodash/lodash) from 4.6.1 to 4.6.2. **This update includes security fixes.**
- [Release notes](https://github.com/lodash/lodash/releases)
- [Commits](https://github.com/lodash/lodash/commits)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-07-10 23:23:11 +00:00
dependabot-preview[bot] 36603fa15e
[Security] Bump lodash.merge in /apps/updatenotification
Bumps [lodash.merge](https://github.com/lodash/lodash) from 4.6.1 to 4.6.2. **This update includes security fixes.**
- [Release notes](https://github.com/lodash/lodash/releases)
- [Commits](https://github.com/lodash/lodash/commits)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-07-10 22:31:00 +00:00
Roeland Jago Douma 8a5b7f89fc
Merge pull request #16326 from nextcloud/backport/16308/stable15
[stable15] Prevent undefined offset 0 in findByUserIdOrMail
2019-07-10 21:44:55 +02:00
Daniel Kesselberg 46d349ce2a
Remove void for php7.0
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
2019-07-10 12:47:39 +02:00
Daniel Kesselberg c876b3c77b Return first value from $users
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
2019-07-10 10:22:36 +00:00
Nextcloud bot 10052eb7d2
[tx-robot] updated from transifex 2019-07-10 02:14:16 +00:00
Morris Jobke 1f45d7696d
Merge pull request #16304 from nextcloud/version/noid/15.0.10
15.0.10
2019-07-09 13:48:57 +02:00
Morris Jobke 1ee7c76c29
15.0.10
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2019-07-09 09:59:57 +02:00
Nextcloud bot caf46d2d25
[tx-robot] updated from transifex 2019-07-09 02:14:03 +00:00
Morris Jobke e7ee019dbf
Merge pull request #16283 from nextcloud/backport/15992/stable15
[stable15] Properly load permissions in showActions
2019-07-08 10:32:48 +02:00
Nextcloud bot cdd7144af1
[tx-robot] updated from transifex 2019-07-08 02:13:59 +00:00