summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* fix(app-framework): Specify return type of Middleware::beforeControllerChristoph Wurst2023-01-251-0/+1
| | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* Merge pull request #36326 from nextcloud/enh/29584/fix-translationSimon L2023-01-243-4/+4
|\ | | | | don't translate a variable
| * don't translate a variableSimon L2023-01-243-4/+4
| | | | | | | | | | Signed-off-by: Simon L <szaimen@e.mail.de> Signed-off-by: nextcloud-command <nextcloud-command@users.noreply.github.com>
* | Merge pull request #32572 from nextcloud/phpunit-deprecation-coreCôme Chilliet2023-01-247-58/+62
|\ \ | |/ |/| Fix a bunch of deprecation in the phpunit for core
| * Fix tests failures (number of calls differed with last rebase)Côme Chilliet2023-01-241-15/+15
| | | | | | | | Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
| * Use phpunit from composer if availableCarl Schwan2023-01-242-7/+12
| | | | | | | | Signed-off-by: Carl Schwan <carl@carlschwan.eu>
| * Fix a bunch of deprecation in the phpunit for coreCarl Schwan2023-01-247-57/+56
|/ | | | Signed-off-by: Carl Schwan <carl@carlschwan.eu>
* Fix(l10n): 🔠 Update translations from TransifexNextcloud bot2023-01-24200-296/+306
| | | | Signed-off-by: Nextcloud bot <bot@nextcloud.com>
* Merge pull request #36277 from nextcloud/backport/36272/masterJohn Molakvoæ2023-01-233-77/+102
|\ | | | | [master] fix(theming): fix admin images migration
| * fix(l10n): fix admin images migrationrakekniven2023-01-231-1/+1
| | | | | | | | | | | | | | Reported at Transifex. Signed-off-by: rakekniven <2069590+rakekniven@users.noreply.github.com> Signed-off-by: rakekniven <2069590+rakekniven@users.noreply.github.com>
| * fix(theming): fix admin images migrationJohn Molakvoæ (skjnldsv)2023-01-233-77/+102
| | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* | Merge pull request #36261 from ↵Joas Schilling2023-01-231-0/+6
|\ \ | | | | | | | | | | | | nextcloud/techdebt/noid/warn-devs-about-potential-bugs fix(querybuilder): Log a warning if where() is called again on a quer…
| * | fix(querybuilder): Log a warning if where() is called again on a query ↵Joas Schilling2023-01-201-0/+6
| | | | | | | | | | | | | | | | | | builder object Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | Merge pull request #36268 from ↵Joas Schilling2023-01-231-1/+1
|\ \ \ | | | | | | | | | | | | | | | | nextcloud/bugfix/noid/fix-double-where-usage-in-resource-manager Fix double where() usage in resource manager
| * | | Fix double where() usage in resource managerJoas Schilling2023-01-231-1/+1
| | |/ | |/| | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | Merge pull request #35935 from EWouters/patch-1Simon L2023-01-231-1/+2
|\ \ \ | | | | | | | | [Fix]: scan-app-data conversion
| * | | [Fix]: scan-app-data conversionEWouters2023-01-031-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adapted from sugestions by @Hiyoal in #34283 and @st3iny in #35935. See https://github.com/nextcloud/server/issues/34283#issuecomment-1288075064 and https://github.com/nextcloud/server/pull/35935#discussion_r1059905594. Closes #34283. Co-authored-by: Richard Steinmetz <richard@steinmetz.cloud> Signed-off-by: EWouters <6179932+EWouters@users.noreply.github.com>
* | | | Merge pull request #36260 from ↵Joas Schilling2023-01-231-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | nextcloud/bugfix/noid/fix-user-availability-selection Fix WHERE condition when selecting user's availability for the status…
| * | | | Fix WHERE condition when selecting user's availability for the status automationJoas Schilling2023-01-201-1/+1
| | |_|/ | |/| | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | Merge pull request #36279 from ↵MichaIng2023-01-231-27/+27
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | nextcloud/dependabot/composer/build/integration/phpunit/phpunit-9.5.28 chore(deps-dev): Bump phpunit/phpunit from 9.5.27 to 9.5.28 in /build/integration
| * | | | chore(deps-dev): Bump phpunit/phpunit in /build/integrationdependabot[bot]2023-01-211-27/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bumps [phpunit/phpunit](https://github.com/sebastianbergmann/phpunit) from 9.5.27 to 9.5.28. - [Release notes](https://github.com/sebastianbergmann/phpunit/releases) - [Changelog](https://github.com/sebastianbergmann/phpunit/blob/9.5.28/ChangeLog-9.5.md) - [Commits](https://github.com/sebastianbergmann/phpunit/compare/9.5.27...9.5.28) --- updated-dependencies: - dependency-name: phpunit/phpunit dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>
* | | | | Merge pull request #36254 from nextcloud/chore/dav/throw-json-encode-decodeChristoph Wurst2023-01-237-12/+12
|\ \ \ \ \ | | | | | | | | | | | | chore(dav): Make json_encode and json_decode throw on error
| * | | | | chore(dav): Make json_encode and json_decode throw on errorChristoph Wurst2023-01-197-12/+12
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | | | | | Merge pull request #36258 from nextcloud/fix/user-status-inputJoas Schilling2023-01-236-40/+44
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fix user status message input
| * | | | | | Fix user status message inputChristopher Ng2023-01-206-40/+44
| | |/ / / / | |/| | | | | | | | | | | | | | | | Signed-off-by: Christopher Ng <chrng8@gmail.com>
* | | | | | Merge pull request #36250 from ↵Joas Schilling2023-01-233-4/+5
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | nextcloud/fix/add-success-message-to-personal-settings-button Add success message to personal settings clipboard button
| * | | | | | Add success message to personal settings buttonjulia.kirschenheuter2023-01-193-4/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: julia.kirschenheuter <julia.kirschenheuter@nextcloud.com>
* | | | | | | Merge pull request #36266 from ↵Joas Schilling2023-01-231-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | nextcloud/bugfix/noid/fix-double-where-in-custom-property-test Fix double where in CustomProperiesBackendTest
| * | | | | | | Fix double where in CustomProperiesBackendTestJoas Schilling2023-01-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | | | | | Merge pull request #36278 from nextcloud/fix/opcache/checkMichaIng2023-01-231-4/+4
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | | Fix interned strings buffer check if 0 free bytes
| * | | | | | | Fix interned strings buffer check if 0 free bytesMichaIng2023-01-231-4/+4
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With #32902 it was meant to be avoided to recommend raising the interned strings buffer size above a quarter of the total OPcache size. This works as long as there is at least 1 byte free, but does not apply if the buffer is filled completely. This commit switches the conditions so that the interned strings buffer size must be smaller than a quarter of the total OPcache size for the warning to be shown. That the buffer must be either filled completely or by more than 90% remains untouched. Signed-off-by: MichaIng <micha@dietpi.com>
* | | | | | | Merge pull request #36269 from nextcloud/bugfix/noid/fix-broken-unit-testJoas Schilling2023-01-231-1/+4
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Fix broken user:setting command unit test
| * | | | | | | Fix broken user:setting command unit testJoas Schilling2023-01-231-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | | | | | Merge pull request #36262 from nextcloud/chore/dav/void-test-methodsJoas Schilling2023-01-23120-713/+713
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | chore(dav): Add void return type to test methods
| * | | | | | | | chore(dav): Add void return type to test methodsChristoph Wurst2023-01-20120-713/+713
| | |_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | | | | | | | Merge pull request #36247 from nextcloud/bugfix/noid/bump-profiler-versionJoas Schilling2023-01-231-2/+4
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | Specify the profiler app branch to test with
| * | | | | | | Specify the profiler app branch to test withJoas Schilling2023-01-201-2/+4
| | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | So we can test in stable25 with a matching profiler version instead of master Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | | | | Fix(l10n): 🔠 Update translations from TransifexNextcloud bot2023-01-2336-374/+432
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nextcloud bot <bot@nextcloud.com>
* | | | | | | Fix(l10n): 🔠 Update translations from TransifexNextcloud bot2023-01-2244-90/+170
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nextcloud bot <bot@nextcloud.com>
* | | | | | | Merge pull request #36280 from ↵Daniel2023-01-212-127/+6
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | nextcloud/automated/noid/master-update-psalm-baseline [master] Update psalm-baseline.xml
| * | | | | | | Update psalm baselinenextcloud-command2023-01-212-127/+6
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | Signed-off-by: GitHub <noreply@github.com>
* / / / / / / Fix(l10n): 🔠 Update translations from TransifexNextcloud bot2023-01-2162-170/+142
|/ / / / / / | | | | | | | | | | | | | | | | | | Signed-off-by: Nextcloud bot <bot@nextcloud.com>
* | | | | | Merge pull request #36271 from nextcloud/fix/fix-codestyleCôme Chilliet2023-01-20887-1320/+430
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fix codestyle using codesniffer
| * | | | | | composer run cs:fixCôme Chilliet2023-01-20887-1320/+430
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
* | | | | | | Merge pull request #36264 from ↵Christoph Wurst2023-01-201-1/+1
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | nextcloud/fix/occ/repair-command-comment-formatting fix(occ): Fix comment formatting of maintenance:repair command
| * | | | | | fix(occ): Fix comment formatting of maintenance:repair commandChristoph Wurst2023-01-201-1/+1
| | |/ / / / | |/| | | | | | | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | | | | | Merge pull request #34997 from nextcloud/fix/drop-php-7.4Côme Chilliet2023-01-2029-728/+688
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Drop PHP 7.4 on master
| * | | | | Bump 3rdparty to master branchCôme Chilliet2023-01-201-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
| * | | | | Always show the psalm baseline change, even on failureCôme Chilliet2023-01-201-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
| * | | | | Show failure of SAML login in kerberos workflowCôme Chilliet2023-01-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>