upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-05-28 04:32:30 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 54
59648 commits 985 branches 1211 tags 9.7 GiB
Commit graph

59648 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
Sijmen Schoon
071eda7baa Move query outside the loop and reduce chunk size to 1000 
This involved changing CacheQueryBuilder\whereParentIn to take a
parameter name, renaming the function accordingly.

Signed-off-by: Sijmen Schoon <me@sijmenschoon.nl>
 2021-11-01 11:08:32 +00:00
Sijmen Schoon
ec3b1ccd91 Limit parameter count per query in Cache.removeChildren 
Signed-off-by: Sijmen Schoon <me@sijmenschoon.nl>
 2021-11-01 11:08:31 +00:00
Arthur Schiwon
89cb3c7b29
update CRL 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2021-11-01 11:41:27 +01:00
Nextcloud bot
3c1426a477
[tx-robot] updated from transifex 
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
 2021-11-01 02:22:49 +00:00
Nextcloud bot
c152f48328
[tx-robot] updated from transifex 
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
 2021-10-31 02:22:13 +00:00
dependabot[bot]
ae1faec4c5
Merge pull request #29495 from nextcloud/dependabot/npm_and_yarn/stable22/bootstrap-4.6.1 2021-10-30 16:24:58 +00:00
dependabot[bot]
f232f737a9 Bump bootstrap from 4.6.0 to 4.6.1 
Bumps [bootstrap](https://github.com/twbs/bootstrap) from 4.6.0 to 4.6.1.
- [Release notes](https://github.com/twbs/bootstrap/releases)
- [Commits](https://github.com/twbs/bootstrap/compare/v4.6.0...v4.6.1)

---
updated-dependencies:
- dependency-name: bootstrap
  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-10-30 15:47:34 +00:00
dependabot[bot]
86b14a0197
Merge pull request #29494 from nextcloud/dependabot/npm_and_yarn/stable22/vue-router-3.5.3 2021-10-30 15:00:04 +00:00
dependabot[bot]
6eb31dc8d0 Bump vue-router from 3.5.2 to 3.5.3 
Bumps [vue-router](https://github.com/vuejs/vue-router) from 3.5.2 to 3.5.3.
- [Release notes](https://github.com/vuejs/vue-router/releases)
- [Changelog](https://github.com/vuejs/vue-router/blob/dev/CHANGELOG.md)
- [Commits](https://github.com/vuejs/vue-router/compare/v3.5.2...v3.5.3)

---
updated-dependencies:
- dependency-name: vue-router
  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-10-30 14:25:12 +00:00
Carl Schwan
8993cf86f1
Merge pull request #29475 from nextcloud/backport/29115/stable22 
[stable22] Fix permissions when copying from ObjectStorage
 2021-10-30 11:20:07 +02:00
Nextcloud bot
1cf9660767
[tx-robot] updated from transifex 
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
 2021-10-30 02:22:28 +00:00
Joas Schilling
b392321e73 Fix basic auth for OAuth token endpoint 
Don't try to login when a client is trying to get a OAuth token.
OAuth needs to support basic auth too, so the login is not valid
inside Nextcloud and the Login exception would ruin it.

Signed-off-by: Joas Schilling <coding@schilljs.com>
 2021-10-30 02:25:06 +02:00
MichaIng
5bd6a4fd29
Merge pull request #29415 from nextcloud/backport/27440/stable22 
[stable22] Handle files with `is_file` instead of `file_exists`
 2021-10-30 00:19:28 +02:00
Carl Schwan
7bf4a45f49 Fix permissions when copying from ObjectStorage 
Make sure that when a user copy a file from a directory they don't have
all permissions to a directory where they have more permissions, the
permissions are correctly set to the one from the parent taget folder.

This was caused by the ObjectStoreStorage::copyFromStorage using
the jailed storage and cache entry instead of the unjailed one like other
storages (the local one).
Steps to reproduce

+ Use object storage
+ Create a groupfolder with one group having full permission and another one
  who can just read files.
+ With an user who is in the second group, copy a file from the groupfolder to
  the home folder of this user.
+ The file in the home folder of the user will be read only and can't be deleted
  even though it is in their home folder and they are the owner. In oc_filecache,
  the permissions stored for this file are 1 (READ)

Signed-off-by: Carl Schwan <carl@carlschwan.eu>
 2021-10-30 00:18:26 +02:00
Nextcloud bot
331bf8ec22
[tx-robot] updated from transifex 
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
 2021-10-29 02:22:34 +00:00
Nextcloud bot
bc4c4f5d55
[tx-robot] updated from transifex 
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
 2021-10-28 02:23:05 +00:00
blizzz
04572bc20f
Merge pull request #29459 from nextcloud/backport/29454/stable22 
[stable22] Detect mimetype by content only with content
 2021-10-27 17:22:31 +02:00
Joas Schilling
7fe95c5576 Detect mimetype by content only with content 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2021-10-27 13:47:35 +00:00
Nextcloud bot
f08f410140
[tx-robot] updated from transifex 
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
 2021-10-27 02:23:49 +00:00
John Molakvoæ
a3ee517895
Merge pull request #29442 from nextcloud/backport/stable22/26841 2021-10-26 16:47:20 +02:00
Joas Schilling
c154b5289a
Fix "No entries in this …" template 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2021-10-26 10:58:25 +02:00
Julius Härtl
4133774c0c
Move to combined files entrypoint 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2021-10-26 10:51:42 +02:00
Julius Härtl
c7a9bd1f47
Implement local filtering in file list 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2021-10-26 10:15:43 +02:00