summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | Backport pre-commit config from masterCôme Chilliet2022-11-101-0/+17
|/ / / / | | | | | | | | | | | | Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
* | | | Merge pull request #35064 from nextcloud/backport/35063/stable25Pytal2022-11-093-3/+7
|\ \ \ \ | | | | | | | | | | [stable25] Fix top margin in empty versions list
| * | | | Fix top margin in empty versions listRichard Steinmetz2022-11-103-3/+7
| |/ / / | | | | | | | | | | | | Signed-off-by: Richard Steinmetz <richard@steinmetz.cloud>
* | | | [tx-robot] updated from transifexNextcloud bot2022-11-1034-470/+64
| | | | | | | | | | | | | | | | Signed-off-by: Nextcloud bot <bot@nextcloud.com>
* | | | Merge pull request #35060 from nextcloud/backport/35052/stable25Pytal2022-11-092-3/+3
|\ \ \ \ | |/ / / |/| | |
| * | | Fix sidebar not automatically hidden in Files appDaniel Calviño Sánchez2022-11-092-3/+3
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Although the Files app creates the legacy sidebar (details view) it is then replaced with the newer Vue app sidebar. Due to this ".detailsView" no longer finds an element and therefore nothing was hidden when "hideAppSidebar($('.detailsView'))" was called (for example, when changing to another section). However, "OC.Apps.hideAppSidebar()" does not properly work either with the Vue sidebar used in the Files app (once hidden the sidebar is not shown again). For simplicity, and to avoid any possible side effect in other apps from changing "OC.Apps.hideAppSidebar", now "OC.Files.Sidebar.close()" is used instead. Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
* | | Merge pull request #35035 from nextcloud/backport/34613/stable25Simon L2022-11-093-5/+5
|\ \ \ | | | | | | | | [stable25] fix checkmark for theme settings in dark mode
| * | | Compile assetsnextcloud-command2022-11-082-3/+3
| | | | | | | | | | | | | | | | Signed-off-by: nextcloud-command <nextcloud-command@users.noreply.github.com>
| * | | fix checkmark for theme settings in dark modeszaimen2022-11-081-2/+2
| | |/ | |/| | | | | | | Signed-off-by: szaimen <szaimen@e.mail.de>
* / | [tx-robot] updated from transifexNextcloud bot2022-11-0922-4/+52
|/ / | | | | | | Signed-off-by: Nextcloud bot <bot@nextcloud.com>
* | Merge pull request #35023 from nextcloud/backport/32838/stable25Simon L2022-11-081-1/+1
|\ \ | | | | | | [stable25] Cast to int
| * | Cast to int #32837Markus Zeller2022-11-081-1/+1
|/ / | | | | | | Signed-off-by: Markus Zeller <git@markuszeller.com>
* | Merge pull request #35011 from nextcloud/backport/35007/stable25Simon L2022-11-081-1/+1
|\ \ | | | | | | [stable25] Fix unsuccessful token login logged as error
| * | Fix unsuccessful token login logged as errorChristoph Wurst2022-11-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The condition of a non-existent login token can happen for concurrent requests. Admins can not do anything about this. So this is to be expected to happen occasionally. This event is only bad if none of the requests is able to re-acquire a session. Luckily this happens rarely. If a login loop persists an admin can still lower the log level to find this info. But a default error log level will no longer write those infos about the failed cookie login of one request. Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | | Merge pull request #34978 from nextcloud/backport/34909/stable25Simon L2022-11-0811-18/+214
|\ \ \ | | | | | | | | [stable25] Fix duplicate event email notifications
| * | | Fix duplicate event email notificationsRichard Steinmetz2022-11-0411-18/+214
| | | | | | | | | | | | | | | | Signed-off-by: Richard Steinmetz <richard@steinmetz.cloud>
* | | | Merge pull request #35010 from nextcloud/backport/35000/stable25Simon L2022-11-083-6/+6
|\ \ \ \ | | | | | | | | | | [stable25] Fix cron warning with time insensitive jobs
| * | | | Compile assetsnextcloud-command2022-11-072-3/+3
| | | | | | | | | | | | | | | | | | | | Signed-off-by: nextcloud-command <nextcloud-command@users.noreply.github.com>
| * | | | Increase the "bad waiting time" for cron mode to 24h to account for "time ↵Joas Schilling2022-11-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | insensitive" jobs Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | | Show the correct warning for system cron vs. webcron/ajaxJoas Schilling2022-11-071-2/+2
| | |/ / | |/| | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | [tx-robot] updated from transifexNextcloud bot2022-11-088-6/+78
| | | | | | | | | | | | | | | | Signed-off-by: Nextcloud bot <bot@nextcloud.com>
* | | | Merge pull request #34998 from nextcloud/backport/34937/stable25Simon L2022-11-071-1/+8
|\ \ \ \ | |/ / / |/| | | [stable25] Avoid a crash when a PHP extension has no version
| * | | Suppress false-positives from psalm, waiting for fix upstreamCôme Chilliet2022-11-071-0/+4
| | | | | | | | | | | | | | | | Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
| * | | Avoid a crash when a PHP extension has no versionCôme Chilliet2022-11-071-1/+4
|/ / / | | | | | | | | | Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
* | | [tx-robot] updated from transifexNextcloud bot2022-11-0714-0/+80
| | | | | | | | | | | | Signed-off-by: Nextcloud bot <bot@nextcloud.com>
* | | [tx-robot] updated from transifexNextcloud bot2022-11-066-2/+10
| | | | | | | | | | | | Signed-off-by: Nextcloud bot <bot@nextcloud.com>
* | | [tx-robot] updated from transifexNextcloud bot2022-11-051370-8402/+10816
| | | | | | | | | | | | Signed-off-by: Nextcloud bot <bot@nextcloud.com>
* | | Merge pull request #34862 from nextcloud/backport/34785/stable25Vincent Petry2022-11-048-18/+26
|\ \ \ | |/ / |/| | [stable25] Fix disabled federated scope
| * | Fix disabled federated scopeChristopher Ng2022-10-288-18/+26
| | | | | | | | | | | | | | | Signed-off-by: Christopher Ng <chrng8@gmail.com> Signed-off-by: nextcloud-command <nextcloud-command@users.noreply.github.com>
* | | Merge pull request #34925 from nextcloud/backport/34871/stable25Vincent Petry2022-11-043-6/+9
|\ \ \ | | | | | | | | [stable25] Fix visibility of internal expire date
| * | | Fix visibility of internal expire dateVincent Petry2022-11-023-6/+9
| |/ / | | | | | | | | | | | | | | | | | | Fixed visibility of the expiration date field for internal shares by aligning the logic with the one from the public link shares. Signed-off-by: Vincent Petry <vincent@nextcloud.com>
* | | Merge pull request #34946 from nextcloud/backport/34804/stable25Vincent Petry2022-11-042-2/+15
|\ \ \ | | | | | | | | [stable25] Skip general login with email for non-valid addresses and LDAP
| * | | Skip general login with email for non-valid addresses and LDAPJulius Härtl2022-11-032-2/+15
| | |/ | |/| | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | | Merge pull request #34953 from nextcloud/backport/34379/stable25Vincent Petry2022-11-042-25/+50
|\ \ \ | | | | | | | | [stable25] Run session token renewals in a database transaction
| * | | Run session token renewals in a database transactionChristoph Wurst2022-11-032-25/+50
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The session token renewal does 1) Read the old token 2) Write a new token 3) Delete the old token If two processes succeed to read the old token there can be two new tokens because the queries were not run in a transaction. This is particularly problematic on clustered DBs where 1) would go to a read node and 2) and 3) go to a write node. Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | | Merge pull request #34964 from nextcloud/backport/34963/stable25Joas Schilling2022-11-041-1/+1
|\ \ \ | |/ / |/| | [stable25] Fix invalid date in security.txt
| * | Fix invalid date in security.txtJoas Schilling2022-11-041-1/+1
|/ / | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | Merge pull request #34577 from nextcloud/backport/34523/stable25Côme Chilliet2022-11-031-19/+18
|\ \ | | | | | | [stable25] Avoid double ldap_unbind in Wizard.php
| * | Avoid double ldap_unbind in Wizard.phpCôme Chilliet2022-11-031-1/+0
| | | | | | | | | | | | Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
| * | Fix code style with codesnifferCôme Chilliet2022-11-031-18/+18
| | | | | | | | | | | | Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
* | | Merge pull request #34922 from nextcloud/backport/34908/stable25Simon L2022-11-031-0/+4
|\ \ \ | | | | | | | | [stable25] disable upgrades to 26 for 32-bit
| * | | disable upgrades to 26 for 32-bitszaimen2022-11-021-0/+4
| | |/ | |/| | | | | | | Signed-off-by: szaimen <szaimen@e.mail.de>
* | | Merge pull request #34921 from nextcloud/backport/34906/stable25Simon L2022-11-032-2/+2
|\ \ \ | | | | | | | | [stable25] update 64-bit check wording
| * | | update 64-bit check wordingszaimen2022-11-022-2/+2
| |/ / | | | | | | | | | Signed-off-by: szaimen <szaimen@e.mail.de>
* | | Merge pull request #34905 from nextcloud/enh/34674/stable25Simon L2022-11-031-1/+1
|\ \ \ | |_|/ |/| | [stable25] fix NC25 for 32-bit
| * | fix NC25 for 32-bitszaimen2022-11-011-1/+1
| |/ | | | | | | Signed-off-by: szaimen <szaimen@e.mail.de>
* | Merge pull request #34913 from nextcloud/release/25.0.1v25.0.1blizzz2022-11-031-2/+2
|\ \ | |/ |/| 25.0.1
| * 25.0.1Arthur Schiwon2022-11-011-2/+2
|/ | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* Merge pull request #34860 from nextcloud/backport/34683/stable25v25.0.1rc1John Molakvoæ2022-10-286-10/+74
|\ | | | | [stable25] Display invalid input message
| * Display invalid input messageChristopher Ng2022-10-276-10/+74
|/ | | | | Signed-off-by: Christopher Ng <chrng8@gmail.com> Signed-off-by: nextcloud-command <nextcloud-command@users.noreply.github.com>