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 33
59671 commits 1025 branches 1220 tags 7.6 GiB
Commit graph

59671 commits

This branch
This branch
All branches
Author SHA1 Message Date
blizzz
dad659ae72
Merge pull request #29687 from nextcloud/version/22.2.2/final 
22.2.2
 2021-11-12 16:53:36 +01:00
blizzz
b6adf296db
Merge pull request #29685 from nextcloud/backport/29682/stable22 
[stable22] Fix missing token update
 2021-11-12 16:53:19 +01:00
Arthur Schiwon
c22b5fa5a3
22.2.2 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2021-11-12 15:59:24 +01:00
Joas Schilling
6ed9bccb3d Fix unit tests 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2021-11-12 14:52:38 +00:00
Joas Schilling
1aaf9f02a8 Fix missing token update 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2021-11-12 14:52:37 +00:00
Nextcloud bot
92db6f3049
[tx-robot] updated from transifex 
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
 2021-11-12 02:23:05 +00:00
Arthur Schiwon
c8c18d8d40
bump last version digit for rebuild 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2021-11-11 15:39:39 +01:00
blizzz
9b35c8f41c
Merge pull request #29667 from nextcloud/backport/29664/stable22 
[stable22] Fix updating with apps
 2021-11-11 15:35:57 +01:00
Joas Schilling
ef48e7045e Fix updating with apps 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2021-11-11 13:42:56 +00:00
Nextcloud bot
e7dcfdaa48
[tx-robot] updated from transifex 
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
 2021-11-11 02:23:19 +00:00
blizzz
99194e3d33
Merge pull request #29624 from nextcloud/version/22.2.1/final 
22.2.1
 2021-11-10 20:46:18 +01:00
Arthur Schiwon
b5a9019516
update CA bundle 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2021-11-10 20:37:36 +01:00
Arthur Schiwon
538c1f5177
22.2.1 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2021-11-10 14:33:52 +01:00
Nextcloud bot
c43c2409a6
[tx-robot] updated from transifex 
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
 2021-11-10 02:24:39 +00:00
Carl Schwan
4d34ccd88c
Merge pull request #29598 from nextcloud/backport/29029/stable22 
[stable22] Fix HTML entity rendering in file comments sidebar
 2021-11-09 11:19:51 +01:00
Christopher Ng
9f594ea9ff Fix HTML entity rendering in file comments sidebar 
Signed-off-by: Christopher Ng <chrng8@gmail.com>
Signed-off-by: nextcloud-command <nextcloud-command@users.noreply.github.com>
 2021-11-09 07:34:43 +00:00
Nextcloud bot
146619e462
[tx-robot] updated from transifex 
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
 2021-11-09 03:26:35 +00:00
John Molakvoæ
677cc1c333
Merge pull request #29562 from nextcloud/backport/28466/stable22 2021-11-08 21:40:43 +01:00
John Molakvoæ
eb585597bc
Merge pull request #29597 from nextcloud/backport/29592/stable22 2021-11-08 20:58:14 +01:00
Julien Veyssier
b076968cc2 refs #11864 handle empty dir drop in Files UI 
Signed-off-by: Julien Veyssier <eneiluj@posteo.net>
 2021-11-08 17:18:51 +00:00
Nextcloud bot
43652ca542
[tx-robot] updated from transifex 
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
 2021-11-08 02:33:18 +00:00
Nextcloud bot
580759a37a
[tx-robot] updated from transifex 
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
 2021-11-07 02:22:43 +00:00
dependabot[bot]
09927fbb8d
Merge pull request #29575 from nextcloud/dependabot/npm_and_yarn/stable22/nextcloud/initial-state-1.2.1 2021-11-06 13:03:42 +00:00
dependabot[bot]
1d90a00cbf Bump @nextcloud/initial-state from 1.2.0 to 1.2.1 
Bumps [@nextcloud/initial-state](https://github.com/nextcloud/nextcloud-initial-state) from 1.2.0 to 1.2.1.
- [Release notes](https://github.com/nextcloud/nextcloud-initial-state/releases)
- [Changelog](https://github.com/nextcloud/nextcloud-initial-state/blob/master/CHANGELOG.md)
- [Commits](https://github.com/nextcloud/nextcloud-initial-state/compare/v1.2.0...v1.2.1)

---
updated-dependencies:
- dependency-name: "@nextcloud/initial-state"
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Signed-off-by: nextcloud-command <nextcloud-command@users.noreply.github.com>
 2021-11-06 12:21:53 +00:00
dependabot[bot]
123f670054
Merge pull request #29578 from nextcloud/dependabot/composer/build/integration/stable22/behat/behat-approx-3.10.0 2021-11-06 06:19:11 +00:00
dependabot[bot]
dd070a7c11
Update behat/behat requirement in /build/integration 
Updates the requirements on [behat/behat](https://github.com/Behat/Behat) to permit the latest version.
- [Release notes](https://github.com/Behat/Behat/releases)
- [Changelog](https://github.com/Behat/Behat/blob/master/CHANGELOG.md)
- [Commits](https://github.com/Behat/Behat/compare/v3.9.0...v3.10.0)

---
updated-dependencies:
- dependency-name: behat/behat
  dependency-type: direct:development
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-11-06 03:35:42 +00:00
Nextcloud bot
40d5086dcf
[tx-robot] updated from transifex 
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
 2021-11-06 02:22:52 +00:00
Julius Härtl
f6747516e0 Do not retain VerifyUserData job when lookup server is not available 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2021-11-05 13:20:53 +00:00
Nextcloud bot
97085c9a3a
[tx-robot] updated from transifex 
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
 2021-11-05 02:23:07 +00:00
John Molakvoæ
bf6522a16e
Merge pull request #29549 from nextcloud/backposkjnldsv/update-psalm-baseline 2021-11-04 13:38:58 +01:00
John Molakvoæ
91ad520de9
Add branch-suffix to update-psalm-baseline PR creation 
Signed-off-by: John Molakvoæ <skjnldsv@protonmail.com>
 2021-11-04 11:44:07 +01:00
John Molakvoæ
1f3a9c6337
[stable22] Update update-psalm-baseline workflow 
Signed-off-by: John Molakvoæ <skjnldsv@protonmail.com>
 2021-11-04 11:02:17 +01:00
John Molakvoæ
8cd54a2789
Merge pull request #29538 from nextcloud/version/22.2.1/rc1 2021-11-04 08:46:41 +01:00
John Molakvoæ
fd35e9c13b
Merge pull request #29383 from nextcloud/backport/29304/stable22 2021-11-04 08:45:57 +01:00
John Molakvoæ
90af0897a4
Merge pull request #29503 from nextcloud/backport/29465/stable22 2021-11-04 08:38:08 +01:00
John Molakvoæ
244b7ca415
Merge pull request #29506 from nextcloud/backport/29281/stable22 2021-11-04 08:37:55 +01:00
John Molakvoæ
f376af6421
Merge pull request #29534 from nextcloud/backport/29332/stable22 2021-11-04 08:37:26 +01:00
Arthur Schiwon
f2f07f3c86
22.2.1 RC1 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2021-11-03 18:30:53 +01:00
John Molakvoæ
9b1eab25ce
Merge pull request #29528 from nextcloud/revert-stable22-split-capability-AccountPropertyScopesFederationEnabled 2021-11-03 13:42:45 +01:00
tobiasKaminsky
34029fe3c9 Adjust test 
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
 2021-11-03 12:24:25 +00:00
tobiasKaminsky
0d1f92ccf0 Expose send_password_by_mail via capabilities 
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
 2021-11-03 12:24:24 +00:00
Daniel Calviño Sánchez
33cd00723a Revert "Split capability" 
This reverts commit 09a5413d26.

The backport was merged before the commit was dropped, but the commit
was meant only for Nextcloud 23, as it may require changes in the
clients.
 2021-11-03 06:36:36 +01:00
Nextcloud bot
7d3a01e675
[tx-robot] updated from transifex 
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
 2021-11-03 02:23:47 +00:00
Joas Schilling
986ed756a4
Merge pull request #29341 from nextcloud/backport/29320/stable22 
[stable22] Fix basic auth for OAuth token endpoint
 2021-11-02 15:19:48 +01:00
Côme Chilliet
1a1e0f5d0b
Merge pull request #29519 from nextcloud/backport/29479/stable22 
[stable22] Fix images on php 8.0
 2021-11-02 14:26:01 +01:00
Côme Chilliet
3b4fb5e843
Fix psalm-ocp error about GdImage class 
Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
 2021-11-02 11:07:40 +01:00
Côme Chilliet
f8c8b2cea9 Enable Avatar tests as well for PHP>=8 
Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
 2021-11-02 09:59:36 +00:00
Côme Chilliet
e498aaf2c8 Revert "Do not run image tests on php8" 
This reverts commit d690f90928.

Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
 2021-11-02 09:59:36 +00:00
Côme Chilliet
90203c6ca7 Fix resource usages in OC_Image 
This makes sure using resource or GdImage (PHP>=8) behaves the same.

Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
 2021-11-02 09:59:35 +00:00
Nextcloud bot
db1d5b82ab
[tx-robot] updated from transifex 
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
 2021-11-02 02:22:28 +00:00