summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [tx-robot] updated from transifexNextcloud bot2020-10-1820-2/+80
|
* Fix sidebar legacy fileinfoJohn Molakvoæ (skjnldsv)2020-10-171-2/+2
| | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* [tx-robot] updated from transifexNextcloud bot2020-10-172-6/+6
|
* Merge pull request #23508 from nextcloud/fix/23355/iuser-expected-null-givenMorris Jobke2020-10-161-1/+1
|\ | | | | fixes potential passing of null to getUserGroupIds
| * fixes potential passing of null to getUserGroupIdsArthur Schiwon2020-10-161-1/+1
| | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* | Merge pull request #23478 from nextcloud/fix/21059/fix-deadlock-in-scsscacherMorris Jobke2020-10-164-3/+30
|\ \ | | | | | | Clear cached app config while waiting for the SCSSCache lock to return
| * | Clear cached app config while waiting for the SCSSCache to finish processing ↵Morris Jobke2020-10-164-3/+30
| | | | | | | | | | | | | | | | | | the file Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | Merge pull request #23488 from nextcloud/fix/noid/no-lock-removal-scss-cacherMorris Jobke2020-10-161-1/+0
|\ \ \ | |_|/ |/| | SCSSCacher - Lock should not be removed
| * | SCSSCacher - Lock should not be removedMorris Jobke2020-10-161-1/+0
| |/ | | | | | | | | | | This is within the failed lock acquiring branch. So the lock is free by another process and should not be removed because the cached file (that was created by the process having the lock) appeared on the filesystem. Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | Merge pull request #23348 from nohn/gh20679Julius Härtl2020-10-161-0/+1
|\ \ | |/ |/| Fix #20679 - be more alert about 2FA consequences
| * Fix #20679 - be more alert about 2FA consequencesSebastian Nohn2020-10-111-0/+1
| | | | | | | | Signed-off-by: Sebastian Nohn <sebastian@nohn.net>
* | Merge pull request #23490 from ↵Morris Jobke2020-10-161-10/+25
|\ \ | | | | | | | | | | | | nextcloud/debug/noid/log-statements-for-scss-locking Provide log statements for SCSS cache
| * | Provide log statements for SCSS cacheMorris Jobke2020-10-161-10/+25
| | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | Merge pull request #23494 from ↵Morris Jobke2020-10-161-27/+0
|\ \ \ | | | | | | | | | | | | | | | | nextcloud-pr-bot/automated/noid/psalm-baseline-update [Automated] Update psalm-baseline.xml
| * | | Update psalm baselineNextcloud-PR-Bot2020-10-161-27/+0
| | | | | | | | | | | | | | | | Signed-off-by: GitHub <noreply@github.com>
* | | | Merge pull request #23492 from nextcloud/tests/22305/unreliable-SharedMountTestChristoph Wurst2020-10-161-1/+2
|\ \ \ \ | | | | | | | | | | SharedMountTest.php:367 is unreliable
| * | | | SharedMountTest.php:367 is unreliableMorris Jobke2020-10-161-1/+2
| | |/ / | |/| | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | Merge pull request #23495 from nextcloud/dependabot/composer/vimeo/psalm-3.17.2dependabot-preview[bot]2020-10-161-5/+5
|\ \ \ \ | |_|/ / |/| | |
| * | | Bump vimeo/psalm from 3.17.1 to 3.17.2dependabot-preview[bot]2020-10-161-5/+5
|/ / / | | | | | | | | | | | | | | | | | | Bumps [vimeo/psalm](https://github.com/vimeo/psalm) from 3.17.1 to 3.17.2. - [Release notes](https://github.com/vimeo/psalm/releases) - [Commits](https://github.com/vimeo/psalm/compare/3.17.1...3.17.2) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
* | | [tx-robot] updated from transifexNextcloud bot2020-10-1614-4/+48
| | |
* | | Merge pull request #23479 from nextcloud/techdebt/noid/typed-migration-templateMorris Jobke2020-10-161-3/+3
|\ \ \ | | | | | | | | Make the migration template typed
| * | | Make the migration template typedJoas Schilling2020-10-151-3/+3
| |/ / | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | Merge pull request #23481 from ↵Morris Jobke2020-10-1610-2/+37
|\ \ \ | | | | | | | | | | | | | | | | nextcloud/enhancement/psalm-typed-event-dispatcher Add psalm types for the event dispatcher
| * | | Type the authentication listenersChristoph Wurst2020-10-157-0/+21
| | | | | | | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
| * | | Add psalm types for the event dispatcherChristoph Wurst2020-10-153-2/+16
| |/ / | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | | Merge pull request #15999 from gary-kim/bugfix/15954/set-favicon-icoJohn Molakvoæ2020-10-151-0/+5
|\ \ \ | |/ / |/| |
| * | Allow setting favicon with a .ico fileGary Kim2020-10-141-0/+5
| | | | | | | | | | | | Signed-off-by: Gary Kim <gary@garykim.dev>
* | | Merge pull request #23464 from ↵Morris Jobke2020-10-152-12/+15
|\ \ \ | | | | | | | | | | | | | | | | nextcloud/enhancement/psalm-typed-migration-schema-closure Add psalm types for the migration schema closure
| * | | Add psalm types for the migration schema closureChristoph Wurst2020-10-152-12/+15
|/ / / | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | | Merge pull request #23448 from nextcloud/fix/sidebar-standaloneJohn Molakvoæ2020-10-153-5/+6
|\ \ \ | | | | | | | | Fix app sidebar mountpoint
| * | | Fix app sidebar mountpointJohn Molakvoæ (skjnldsv)2020-10-143-5/+6
| | | | | | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com> Signed-off-by: npmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com>
* | | | [tx-robot] updated from transifexNextcloud bot2020-10-152-0/+14
| |/ / |/| |
* | | Merge pull request #23097 from nextcloud/bugfix/noid/trashbin-query-versionsMorris Jobke2020-10-141-14/+43
|\ \ \ | |/ / |/| | Restrict query when searching for versions of trashbin files
| * | Restrict query when searching for versions of trashbin filesJulius Härtl2020-10-141-14/+43
| | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | | Merge pull request #23377 from nextcloud/enhancement/psalm-annotate-icontainerMorris Jobke2020-10-145-5/+19
|\ \ \ | | | | | | | | Annotate IContainer so Psalm knows what resove and query return
| * | | Fix type errors detected by PsalmChristoph Wurst2020-10-144-5/+11
| | | | | | | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
| * | | Annotate IContainer so Psalm knows what resove and query returnChristoph Wurst2020-10-141-0/+8
| |/ / | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | | Merge pull request #23436 from nextcloud/fix/23158/remove-posix_getpwuidMorris Jobke2020-10-142-12/+13
|\ \ \ | |/ / |/| | Remove posix_getpwuid and compare only userid
| * | Adjust sudo command to UID instead of usernamehoellen2020-10-061-1/+1
| | | | | | | | | | | | Signed-off-by: hoellen <dev@hoellen.eu>
| * | Remove posix_getpwuid and compare only useridhoellen2020-10-062-12/+13
| | | | | | | | | | | | Signed-off-by: hoellen <dev@hoellen.eu>
* | | Merge pull request #23434 from ↵Morris Jobke2020-10-143-549/+490
|\ \ \ | | | | | | | | | | | | | | | | nextcloud/dependachristoph/composer/vimeo-psalm-3.17.1 Bump vimeo/psalm from 3.15 to 3.17.1
| * | | Bump vimeo/psalm from 3.15 to 3.17.1Christoph Wurst2020-10-143-549/+490
|/ / / | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | | [tx-robot] updated from transifexNextcloud bot2020-10-1412-36/+96
| | |
* | | Merge pull request #23155 from nextcloud/dependabot/npm_and_yarn/dompurify-2.1.1dependabot-preview[bot]2020-10-1310-11/+14
|\ \ \
| * | | Bump dompurify from 2.0.15 to 2.1.1dependabot-preview[bot]2020-10-1310-11/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bumps [dompurify](https://github.com/cure53/DOMPurify) from 2.0.15 to 2.1.1. - [Release notes](https://github.com/cure53/DOMPurify/releases) - [Commits](https://github.com/cure53/DOMPurify/compare/2.0.15...2.1.1) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Signed-off-by: npmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com>
* | | | Merge pull request #23401 from nextcloud/techdebt/psalm-no-globalMorris Jobke2020-10-134-93/+1008
|\ \ \ \ | |/ / / |/| | | Use own psalm instead of a global one
| * | | Do not fail on changes to baseline.xml Morris Jobke2020-10-131-1/+1
| | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * | | Use own psalm instead of a global oneChristoph Wurst2020-10-134-93/+1008
| | | | | | | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | | | [tx-robot] updated from transifexNextcloud bot2020-10-13964-41170/+2710
| | | |
* | | | Merge pull request #23286 from nextcloud/design/deleted-sortingMorris Jobke2020-10-134-4/+6
|\ \ \ \ | | | | | | | | | | Sort deleted files by most recently deleted first