upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-06-08 00:02:54 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 11
60051 commits 1025 branches 1220 tags 7.6 GiB
Commit graph

60051 commits

This branch
This branch
All branches
Author SHA1 Message Date
John Molakvoæ
fb5dbd8059
Merge pull request #30839 from nextcloud/releases/22.2.4 2022-01-27 20:53:49 +01:00
John Molakvoæ
c0b29720e1
Merge pull request #30826 from nextcloud/backport/stable22/psalm-fix 2022-01-27 20:05:54 +01:00
Carl Schwan
57514e44a9
Psalm fixing 
Signed-off-by: Carl Schwan <carl@carlschwan.eu>
 2022-01-27 17:20:48 +01:00
John Molakvoæ
d7e58015df
Merge pull request #30873 from nextcloud/backport/30844/stable22 2022-01-27 12:10:44 +01:00
John Molakvoæ
fa2ac9362e
Merge pull request #30741 from nextcloud/backport22 2022-01-27 09:26:53 +01:00
John Molakvoæ
56153ed19f Prevent merging on EOL branches 
Signed-off-by: John Molakvoæ <skjnldsv@protonmail.com>
 2022-01-27 08:12:47 +00:00
Nextcloud bot
995f93978a
[tx-robot] updated from transifex 
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
 2022-01-27 02:27:36 +00:00
John Molakvoæ
140dfe5f13
Merge pull request #30848 from nextcloud/backport/30846/stable22 2022-01-26 13:12:58 +01:00
Louis Chemineau
67af56e868 Fix php:cs 
Signed-off-by: Louis Chemineau <louis@chmn.me>
 2022-01-26 10:52:01 +00:00
Nextcloud bot
cd35b216df
[tx-robot] updated from transifex 
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
 2022-01-26 02:27:46 +00:00
John Molakvoæ
2ac2075d03
22.2.4 Final 2022-01-25 14:52:43 +01:00
Nextcloud bot
89bc4c1c19
[tx-robot] updated from transifex 
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
 2022-01-25 02:27:42 +00:00
Carl Schwan
0262cc33d7
Fix psalm 
Signed-off-by: Carl Schwan <carl@carlschwan.eu>
 2022-01-24 13:34:48 +01:00
John Molakvoæ
50c7a5e4cd
Merge pull request #30807 from nextcloud/dependabot/composer/build/integration/stable22/sabre/dav-4.3.1 2022-01-24 08:07:40 +01:00
Nextcloud bot
81c4d00b70
[tx-robot] updated from transifex 
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
 2022-01-24 02:26:51 +00:00
Nextcloud bot
b862748a9a
[tx-robot] updated from transifex 
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
 2022-01-23 02:26:36 +00:00
John Molakvoæ
067781e55b
Merge pull request #30812 from nextcloud/backport/30795/stable22 2022-01-22 14:09:54 +01:00
John Molakvoæ
44c1403708
Merge pull request #30774 from nextcloud/backport/30769/stable22 2022-01-22 10:25:41 +01:00
Carl Schwan
627466a226 Fix accessing undefined offsets 
Move this to inside the else clause of the count($matches)

Signed-off-by: Carl Schwan <carl@carlschwan.eu>
 2022-01-22 09:01:12 +00:00
Nextcloud bot
7acd13d002
[tx-robot] updated from transifex 
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
 2022-01-22 02:26:44 +00:00
dependabot[bot]
49a3607ceb
Update sabre/dav requirement from 4.3.0 to 4.3.1 in /build/integration 
Updates the requirements on [sabre/dav](https://github.com/sabre-io/dav) to permit the latest version.
- [Release notes](https://github.com/sabre-io/dav/releases)
- [Changelog](https://github.com/sabre-io/dav/blob/master/CHANGELOG.md)
- [Commits](https://github.com/sabre-io/dav/compare/4.3.0...4.3.1)

---
updated-dependencies:
- dependency-name: sabre/dav
  dependency-type: direct:development
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-01-22 02:18:41 +00:00
John Molakvoæ
7211f53812
Merge pull request #30766 from nextcloud/release/22.2.4rc3 2022-01-21 12:48:22 +01:00
John Molakvoæ
b72253c44a
Merge pull request #30786 from nextcloud/fix-backport/30470/stable22 2022-01-21 11:02:45 +01:00
Nextcloud bot
592e5811a5
[tx-robot] updated from transifex 
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
 2022-01-21 02:27:09 +00:00
Julius Härtl
dc21554b52
Add hashed attribute column for indexed job existence check 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2022-01-20 22:37:42 +01:00
John Molakvoæ
18f67eefb2
Merge pull request #30780 from nextcloud/backport/29349/stable22 2022-01-20 21:26:02 +01:00
John Molakvoæ
b6415ad8bf
Revert "[stable22] Hash job argument" 2022-01-20 21:10:43 +01:00
Robin Appelman
c651fc2078 Add test for samba kerberos sso in ci 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2022-01-20 19:14:13 +00:00
Robin Appelman
70e13a450f update icewind/smb to 3.5.2 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2022-01-20 19:14:12 +00:00
Robin Appelman
a64bcb22be update to release smb lib 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2022-01-20 19:14:11 +00:00
Robin Appelman
017e5a1c97 update icewind/smb to 3.5.1 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2022-01-20 19:14:10 +00:00
Arthur Schiwon
926aa94083 do not use deprecated query() method 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2022-01-20 19:14:09 +00:00
Arthur Schiwon
ab983691dc add changes from Sebastian/dassIT and move default_realm to backend 
- Sebastian added the switch depending on the preg_match result and with it
  the fall back to login credentials
- I turned default_realm to a backend option (was previously suggested as
  system config key)

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2022-01-20 19:14:08 +00:00
Arthur Schiwon
3dc1ed8eff add KerberosApacheAuth support to files_external 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2022-01-20 19:14:07 +00:00
Côme Chilliet
3f3908b72a Always call flush() as getAllKeys() is broken 
Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
 2022-01-20 15:43:34 +00:00
John Molakvoæ
92fcdc3509
Merge pull request #30727 from nextcloud/backport/30614/stable22 2022-01-20 15:45:22 +01:00
Carl Schwan
8e9f02fce2
Fix tests with email templates 
Signed-off-by: Carl Schwan <carl@carlschwan.eu>
 2022-01-20 10:38:11 +01:00
John Molakvoæ
fd1bcd434c
Merge pull request #30760 from nextcloud/backport/30731/stable22 2022-01-20 10:35:07 +01:00
John Molakvoæ
4cf937ad81
Merge pull request #29799 from nextcloud/stable22-disk 2022-01-20 10:33:45 +01:00
John Molakvoæ
a2b6f1be00
22.2.4 RC3 
Signed-off-by: John Molakvoæ <skjnldsv@protonmail.com>
 2022-01-20 10:18:40 +01:00
Nextcloud bot
a3bbb56632
[tx-robot] updated from transifex 
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
 2022-01-20 02:27:32 +00:00
Joas Schilling
8db890a621 Log bruteforce throttle and blocking 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2022-01-19 11:51:56 +00:00
Joas Schilling
ea84427db2
Merge pull request #30752 from nextcloud/fix/stable22/public-shares 
Revert "Improve layout for the public download page"
 2022-01-19 11:47:36 +01:00
John Molakvoæ
2f82fc2961
Merge pull request #30754 from nextcloud/backport/30738/stable22 2022-01-19 11:04:23 +01:00
John Molakvoæ
bf7344799c
Merge pull request #30748 from nextcloud/backport/30615/stable22 2022-01-19 10:45:38 +01:00
Joas Schilling
a8847c022b Create block-merge-freeze.yml 
Signed-off-by: John Molakvoæ <skjnldsv@protonmail.com>
 2022-01-19 09:23:56 +00:00
Max
bdd677c091
Revert "Improve layout for the public download page" 
This reverts commit 30decc3ed1.

Signed-off-by: Max <max@nextcloud.com>
 2022-01-19 09:53:07 +01:00
Nextcloud bot
9b0f7b3b51
[tx-robot] updated from transifex 
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
 2022-01-19 02:27:49 +00:00
Christopher Ng
e35bb236fb Update autoload 
Signed-off-by: Christopher Ng <chrng8@gmail.com>
 2022-01-19 02:20:25 +00:00
Christopher Ng
a38ac95ff6 Improve installation pages 
Signed-off-by: Christopher Ng <chrng8@gmail.com>
(cherry picked from commit 22768769c3)
Signed-off-by: nextcloud-command <nextcloud-command@users.noreply.github.com>
 2022-01-19 00:48:36 +00:00