upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-03-25 11:54:59 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 39
64612 commits 786 branches 1189 tags 6.5 GiB
Commit graph

64612 commits

This branch
This branch
All branches
Author SHA1 Message Date
Côme Chilliet
3a3e092705 Backport pre-commit config from master 
Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
 2022-11-10 15:02:38 +00:00
Pytal
1cae227951
Merge pull request #35064 from nextcloud/backport/35063/stable25 
[stable25] Fix top margin in empty versions list
 2022-11-09 18:53:23 -08:00
Nextcloud bot
d6e6b8b7c5
[tx-robot] updated from transifex 
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
 2022-11-10 02:15:33 +00:00
Pytal
f19c6dab44
Merge pull request #35060 from nextcloud/backport/35052/stable25 2022-11-09 16:07:43 -08:00
Richard Steinmetz
09d315566d Fix top margin in empty versions list 
Signed-off-by: Richard Steinmetz <richard@steinmetz.cloud>
 2022-11-10 00:03:57 +00:00
Daniel Calviño Sánchez
66d58d6eeb Fix sidebar not automatically hidden in Files app 
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>
 2022-11-09 19:10:46 +00:00
Simon L
b5b7a41948
Merge pull request #35035 from nextcloud/backport/34613/stable25 
[stable25] fix checkmark for theme settings in dark mode
 2022-11-09 09:41:06 +01:00
Nextcloud bot
952a4aba5b
[tx-robot] updated from transifex 
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
 2022-11-09 02:14:39 +00:00
nextcloud-command
e7f993de71 Compile assets 
Signed-off-by: nextcloud-command <nextcloud-command@users.noreply.github.com>
 2022-11-08 18:36:09 +00:00
szaimen
78bf1b987d fix checkmark for theme settings in dark mode 
Signed-off-by: szaimen <szaimen@e.mail.de>
 2022-11-08 18:25:47 +00:00
Simon L
83d85bd045
Merge pull request #35023 from nextcloud/backport/32838/stable25 
[stable25] Cast to int
 2022-11-08 14:27:33 +01:00
Markus Zeller
cffa3673f1 Cast to int #32837 
Signed-off-by: Markus Zeller <git@markuszeller.com>
 2022-11-08 10:08:23 +00:00
Simon L
18515f6332
Merge pull request #35011 from nextcloud/backport/35007/stable25 
[stable25] Fix unsuccessful token login logged as error
 2022-11-08 10:50:10 +01:00
Simon L
6880f3ba6d
Merge pull request #34978 from nextcloud/backport/34909/stable25 
[stable25] Fix duplicate event email notifications
 2022-11-08 10:49:19 +01:00
Simon L
6ceb64b384
Merge pull request #35010 from nextcloud/backport/35000/stable25 
[stable25] Fix cron warning with time insensitive jobs
 2022-11-08 10:48:31 +01:00
Nextcloud bot
4f26225df6
[tx-robot] updated from transifex 
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
 2022-11-08 02:14:25 +00:00
nextcloud-command
48d06714dc Compile assets 
Signed-off-by: nextcloud-command <nextcloud-command@users.noreply.github.com>
 2022-11-07 16:53:02 +00:00
Simon L
1b9866fa45
Merge pull request #34998 from nextcloud/backport/34937/stable25 
[stable25] Avoid a crash when a PHP extension has no version
 2022-11-07 17:47:22 +01:00
Christoph Wurst
88cf98b13d Fix unsuccessful token login logged as error 
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>
 2022-11-07 16:32:46 +00:00
Joas Schilling
c6ccd39b05 Increase the "bad waiting time" for cron mode to 24h to account for "time insensitive" jobs 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2022-11-07 16:31:45 +00:00
Joas Schilling
a93f8b6945 Show the correct warning for system cron vs. webcron/ajax 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2022-11-07 16:31:45 +00:00
Côme Chilliet
9403110854 Suppress false-positives from psalm, waiting for fix upstream 
Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
 2022-11-07 10:13:28 +00:00
Côme Chilliet
2b2ec5e7f7 Avoid a crash when a PHP extension has no version 
Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
 2022-11-07 10:13:28 +00:00
Nextcloud bot
c587979785
[tx-robot] updated from transifex 
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
 2022-11-07 02:14:18 +00:00
Nextcloud bot
f55ac66ad1
[tx-robot] updated from transifex 
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
 2022-11-06 02:12:48 +00:00
Nextcloud bot
8b995d7eed
[tx-robot] updated from transifex 
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
 2022-11-05 02:15:14 +00:00
Richard Steinmetz
28b2ba9a69 Fix duplicate event email notifications 
Signed-off-by: Richard Steinmetz <richard@steinmetz.cloud>
 2022-11-04 17:11:32 +00:00
Vincent Petry
0cb14bdcb4
Merge pull request #34862 from nextcloud/backport/34785/stable25 
[stable25] Fix disabled federated scope
 2022-11-04 17:20:14 +01:00
Vincent Petry
3289739110
Merge pull request #34925 from nextcloud/backport/34871/stable25 
[stable25] Fix visibility of internal expire date
 2022-11-04 17:15:35 +01:00
Vincent Petry
4127f33f4e
Merge pull request #34946 from nextcloud/backport/34804/stable25 
[stable25] Skip general login with email for non-valid addresses and LDAP
 2022-11-04 17:13:06 +01:00
Vincent Petry
de6012d100
Merge pull request #34953 from nextcloud/backport/34379/stable25 
[stable25] Run session token renewals in a database transaction
 2022-11-04 17:10:42 +01:00
Joas Schilling
05acb130ce
Merge pull request #34964 from nextcloud/backport/34963/stable25 
[stable25] Fix invalid date in security.txt
 2022-11-04 12:05:10 +01:00
Joas Schilling
18e8433b32 Fix invalid date in security.txt 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2022-11-04 10:11:05 +00:00
Christoph Wurst
b8ad0752fa Run session token renewals in a database transaction 
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>
 2022-11-03 15:25:34 +00:00
Julius Härtl
9151960af0
Skip general login with email for non-valid addresses and LDAP 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2022-11-03 15:38:39 +01:00
Côme Chilliet
ac0630788d
Merge pull request #34577 from nextcloud/backport/34523/stable25 
[stable25] Avoid double ldap_unbind in Wizard.php
 2022-11-03 14:08:08 +01:00
Simon L
975ebc1248
Merge pull request #34922 from nextcloud/backport/34908/stable25 
[stable25] disable upgrades to 26 for 32-bit
 2022-11-03 12:57:12 +01:00
Simon L
09a089ad57
Merge pull request #34921 from nextcloud/backport/34906/stable25 
[stable25] update 64-bit check wording
 2022-11-03 12:56:52 +01:00
Simon L
d6eaaf3fe0
Merge pull request #34905 from nextcloud/enh/34674/stable25 
[stable25] fix NC25 for 32-bit
 2022-11-03 12:56:37 +01:00
Côme Chilliet
07155246d3 Avoid double ldap_unbind in Wizard.php 
Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
 2022-11-03 11:10:16 +00:00
Côme Chilliet
29be674b5d Fix code style with codesniffer 
Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
 2022-11-03 11:10:16 +00:00
blizzz
8896b40164
Merge pull request #34913 from nextcloud/release/25.0.1 
25.0.1
 2022-11-03 10:57:09 +01:00
Vincent Petry
413ac2dc50 Fix visibility of internal expire date 
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>
 2022-11-02 12:12:45 +00:00
szaimen
2084fbad3a disable upgrades to 26 for 32-bit 
Signed-off-by: szaimen <szaimen@e.mail.de>
 2022-11-02 10:47:43 +00:00
szaimen
c26832233f update 64-bit check wording 
Signed-off-by: szaimen <szaimen@e.mail.de>
 2022-11-02 09:48:15 +00:00
Arthur Schiwon
7c6d99e8ea
25.0.1 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2022-11-01 20:10:14 +01:00
szaimen
c124456881 fix NC25 for 32-bit 
Signed-off-by: szaimen <szaimen@e.mail.de>
 2022-11-01 13:44:17 +01:00
Christopher Ng
adc106a197 Fix disabled federated scope 
Signed-off-by: Christopher Ng <chrng8@gmail.com>
Signed-off-by: nextcloud-command <nextcloud-command@users.noreply.github.com>
 2022-10-28 19:50:40 +00:00
John Molakvoæ
7170b141ba
Merge pull request #34860 from nextcloud/backport/34683/stable25 
[stable25] Display invalid input message
 2022-10-28 10:08:51 +02:00
Christopher Ng
39b47e1a78 Display invalid input message 
Signed-off-by: Christopher Ng <chrng8@gmail.com>
Signed-off-by: nextcloud-command <nextcloud-command@users.noreply.github.com>
 2022-10-27 22:49:11 +00:00