summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | [tx-robot] updated from transifexNextcloud bot2019-07-18290-286/+314
|/
* Merge pull request #16433 from nextcloud/backport/16424/stable15Roeland Jago Douma2019-07-171-1/+6
|\ | | | | [stable15] Do not keep searching for recent
| * Do not keep searching for recentRoeland Jago Douma2019-07-171-1/+6
|/ | | | | | | | | | | | | | | | | | | 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>
* [tx-robot] updated from transifexNextcloud bot2019-07-1758-102/+108
|
* Merge pull request #16426 from nextcloud/backport/16423/stable15Roeland Jago Douma2019-07-162-18/+28
|\ | | | | [stable15] Only prevent disabling encrytion via the API
| * Only prevent disabling encrytion via the APIJoas Schilling2019-07-162-18/+28
|/ | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* [tx-robot] updated from transifexNextcloud bot2019-07-166-118/+126
|
* [tx-robot] updated from transifexNextcloud bot2019-07-154-8/+8
|
* [tx-robot] updated from transifexNextcloud bot2019-07-1424-44/+106
|
* [tx-robot] updated from transifexNextcloud bot2019-07-1320-4/+34
|
* [tx-robot] updated from transifexNextcloud bot2019-07-1270-146/+294
|
* Merge pull request #16348 from ↵Morris Jobke2019-07-111-3/+3
|\ | | | | | | | | 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
| * [Security] Bump lodash from 4.17.11 to 4.17.14 in /apps/accessibilitydependabot-preview[bot]2019-07-111-3/+3
| | | | | | | | | | | | | | 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>
* | Merge pull request #16351 from ↵Morris Jobke2019-07-111-3/+3
|\ \ | | | | | | | | | | | | 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
| * | [Security] Bump lodash in /apps/updatenotificationdependabot-preview[bot]2019-07-111-3/+3
| |/ | | | | | | | | | | | | 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>
* | Merge pull request #16357 from ↵Morris Jobke2019-07-111-3/+3
|\ \ | |/ |/| | | | | 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
| * [Security] Bump lodash from 4.17.11 to 4.17.14 in /apps/oauth2dependabot-preview[bot]2019-07-111-3/+3
| | | | | | | | | | | | | | 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>
* | Merge pull request #16350 from ↵Morris Jobke2019-07-112-4/+4
|\ \ | | | | | | | | | | | | nextcloud/dependabot/npm_and_yarn/settings/stable15/lodash-4.17.13 [Security] Bump lodash from 4.17.11 to 4.17.13 in /settings
| * | [Security] Bump lodash from 4.17.11 to 4.17.13 in /settingsdependabot-preview[bot]2019-07-112-4/+4
| |/ | | | | | | | | | | | | 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>
* | Merge pull request #16345 from ↵Morris Jobke2019-07-111-3/+3
|\ \ | | | | | | | | | | | | 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
| * | [Security] Bump lodash.merge from 4.6.1 to 4.6.2 in /settingsdependabot-preview[bot]2019-07-111-3/+3
| |/ | | | | | | | | | | | | 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>
* | Merge pull request #16344 from ↵Morris Jobke2019-07-111-3/+3
|\ \ | |/ |/| | | | | 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
| * [Security] Bump lodash.mergewith from 4.6.1 to 4.6.2 in /settingsdependabot-preview[bot]2019-07-101-3/+3
| | | | | | | | | | | | | | 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>
* | Merge pull request #16346 from ↵Morris Jobke2019-07-111-3/+3
|\ \ | | | | | | | | | | | | 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
| * | [Security] Bump lodash.mergewith from 4.6.1 to 4.6.2 in /builddependabot-preview[bot]2019-07-101-3/+3
| |/ | | | | | | | | | | | | 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>
* | Merge pull request #16353 from ↵Roeland Jago Douma2019-07-111-3/+3
|\ \ | | | | | | | | | | | | nextcloud/dependabot/npm_and_yarn/build/stable15/lodash-4.17.14 [Security] Bump lodash from 4.17.11 to 4.17.14 in /build
| * | [Security] Bump lodash from 4.17.11 to 4.17.14 in /builddependabot-preview[bot]2019-07-111-3/+3
|/ / | | | | | | | | | | | | 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>
* | [Security] Bump lodash.merge from 4.6.1 to 4.6.2 in /apps/upda… (#16339)John Molakvoæ2019-07-111-3/+3
|\ \ | | | | | | [Security] Bump lodash.merge from 4.6.1 to 4.6.2 in /apps/updatenotification
| * | [Security] Bump lodash.merge in /apps/updatenotificationdependabot-preview[bot]2019-07-101-3/+3
| |/ | | | | | | | | | | | | 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>
* / [tx-robot] updated from transifexNextcloud bot2019-07-1134-56/+78
|/
* Merge pull request #16326 from nextcloud/backport/16308/stable15Roeland Jago Douma2019-07-102-27/+33
|\ | | | | [stable15] Prevent undefined offset 0 in findByUserIdOrMail
| * Remove void for php7.0Daniel Kesselberg2019-07-101-1/+1
| | | | | | | | Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
| * Return first value from $usersDaniel Kesselberg2019-07-102-27/+33
|/ | | | Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
* [tx-robot] updated from transifexNextcloud bot2019-07-108-0/+8
|
* Merge pull request #16304 from nextcloud/version/noid/15.0.10v15.0.10Morris Jobke2019-07-091-2/+2
|\ | | | | 15.0.10
| * 15.0.10Morris Jobke2019-07-091-2/+2
|/ | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* [tx-robot] updated from transifexNextcloud bot2019-07-0940-34/+22
|
* Merge pull request #16283 from nextcloud/backport/15992/stable15Morris Jobke2019-07-081-1/+1
|\ | | | | [stable15] Properly load permissions in showActions
| * Properly load permissions in showActionsJulius Härtl2019-07-071-1/+1
| | | | | | | | | | | | When setViewerMode(false) is called, the permissions should be fetched from the available dirInfo Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | [tx-robot] updated from transifexNextcloud bot2019-07-0816-2/+18
|/
* [stable15] fix permissions for drag-n-drop uploads (#16250)John Molakvoæ2019-07-071-1/+1
|\ | | | | [stable15] fix permissions for drag-n-drop uploads
| * fix permissions for drag-n-drop uploadsRobin Appelman2019-07-051-1/+1
| | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | [tx-robot] updated from transifexNextcloud bot2019-07-0786-114/+186
| |
* | [tx-robot] updated from transifexNextcloud bot2019-07-066-2/+20
|/
* [tx-robot] updated from transifexNextcloud bot2019-07-0524-6/+280
|
* Merge pull request #16190 from nextcloud/backport/16183/stable15Roeland Jago Douma2019-07-041-2/+3
|\ | | | | [stable15] Do not fail hard on new user mail error
| * Do not fail hard on new user mail errorJohn Molakvoæ (skjnldsv)2019-07-021-2/+3
| | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* | Merge pull request #16192 from nextcloud/backport/16024/stable15Roeland Jago Douma2019-07-041-1/+8
|\ \ | | | | | | [stable15] Forward OCSException to initiator
| * | Forward OCSException to initiatorDaniel Kesselberg2019-07-021-1/+8
| |/ | | | | | | Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
* | Merge pull request #16219 from nextcloud/version/noid/15.0.9v15.0.9Roeland Jago Douma2019-07-041-2/+2
|\ \ | | | | | | 15.0.9
generated by cgit v1.2.3 (git 2.39.1) at 2025-04-01 14:20:45 +0000