upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-04-24 15:53:36 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 11
59220 commits 867 branches 1197 tags 8.3 GiB
Commit graph

59220 commits

This branch
This branch
All branches
Author SHA1 Message Date
Vincent Petry
f60ea8a260
Fix remote share deletion when deleting user 
When deleting a user, we should only delete the direct remote user
shares or the remote group based subshares.

Signed-off-by: Vincent Petry <vincent@nextcloud.com>
 2021-08-10 13:37:37 +02:00
Vincent Petry
a22ea02bea
Fix route path for pending remote shares 
Signed-off-by: Vincent Petry <vincent@nextcloud.com>
 2021-08-10 13:37:31 +02:00
Vincent Petry
33b01187cd
Replace ILogger with LoggerInterface in remote share manager 
Signed-off-by: Vincent Petry <vincent@nextcloud.com>

Co-authored-by: Carl Schwan <carl@carlschwan.eu>
 2021-08-10 13:27:59 +02:00
Vincent Petry
2e76d98e13
Fix remote group share decline+accept code path 
When declining a remote group share through the dialog that appears when
notifications are off, the mount point is now correctly saved when
re-accepting.

Signed-off-by: Vincent Petry <vincent@nextcloud.com>
 2021-08-10 13:27:59 +02:00
Vincent Petry
5b111961ae
Use mimetype instead of type when defaulting in remote shares 
Signed-off-by: Vincent Petry <vincent@nextcloud.com>
 2021-08-10 13:27:59 +02:00
Vincent Petry
df0ca2f1db
Fix external share manager with multiple user groups 
Use query builder with proper matching for finding the group names.

Signed-off-by: Vincent Petry <vincent@nextcloud.com>
 2021-08-10 13:27:59 +02:00
Vincent Petry
701de23857
Fix remote group share API interactions 
Accepting and declining can now be done repeatedly on both the parent
group share and sub-share with the same effects.

Added unit tests to cover these cases, and also when the same operation
is repeated.

Signed-off-by: Vincent Petry <vincent@nextcloud.com>
 2021-08-10 13:27:58 +02:00
Vincent Petry
dde4c9d9df
Disable default actions in pending file list 
Signed-off-by: Vincent Petry <vincent@nextcloud.com>
 2021-08-10 13:27:58 +02:00
Vincent Petry
9c0e1d8252
Pending remote group share fixes 
Only remove reject share for remote group shares
Also fix share indicator to appear for remote group shares as well.
Fix pending remote share icon to be the one of a share.

Signed-off-by: Vincent Petry <vincent@nextcloud.com>
 2021-08-10 13:27:58 +02:00
Vincent Petry
37a65237ea
Fix re-accepting or re-rejecting remote group shares 
When accepting a group share, a sub-share entry is created which also
has a different id.

When accepting or rejecting the sub-share, simply update the "accepted"
flag instead of trying to re-insert the entry.

Adjust getShare to also properly validate group share membership
when called on a sub-share id.

Signed-off-by: Vincent Petry <vincent@nextcloud.com>
 2021-08-10 13:27:58 +02:00
Vincent Petry
4d0f0095ea
Add logging to external shares manager 
Instead of just returning false, also log the exception to make
debugging database issues easier.

Signed-off-by: Vincent Petry <vincent@nextcloud.com>
 2021-08-10 13:27:58 +02:00
Vincent Petry
13781b0425
Remove "Reject share" for pending remote shares 
In the list of pending shares, the option for rejecting the share has
been removed.

Signed-off-by: Vincent Petry <vincent@nextcloud.com>
 2021-08-10 13:27:57 +02:00
Vincent Petry
08ab5d97da
Fix received federated group shares 
Fix pending shares endpoint to consider user-specific sub-entries
for group shares whenever a share was accepted or declined.

Added unit test for adding remote group shares.

Fixed "removeUserShares" to not send a remote request as we never send
remote requests for group shares.

Signed-off-by: Vincent Petry <vincent@nextcloud.com>
 2021-08-10 13:27:57 +02:00
Vincent Petry
df835ed350
Extend pending shares list to include remote shares 
And adjust the accept/decline actions to use the right endpoint for
remote shares.

Signed-off-by: Vincent Petry <vincent@nextcloud.com>
 2021-08-10 13:27:53 +02:00
Nextcloud bot
5bd4ed19d4
[tx-robot] updated from transifex 
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
 2021-08-10 02:31:55 +00:00
szaimen
876545502c
Merge pull request #28353 from nextcloud/backport/28352/stable22 
[stable22] Change the concurrent upload limit to less than 10
 2021-08-09 18:02:09 +02:00
szaimen
6acf1a5493 Change the concurrent upload limit to less than 10 
Signed-off-by: szaimen <szaimen@e.mail.de>
 2021-08-09 08:33:53 +00:00
Nextcloud bot
faef6db11a
[tx-robot] updated from transifex 
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
 2021-08-09 02:26:58 +00:00
dependabot[bot]
eceee99081
Merge pull request #28342 from nextcloud/dependabot/npm_and_yarn/stable22/vue-loader-15.9.8 2021-08-08 08:39:58 +00:00
dependabot[bot]
59e6c25660
Bump vue-loader from 15.9.7 to 15.9.8 
Bumps [vue-loader](https://github.com/vuejs/vue-loader) from 15.9.7 to 15.9.8.
- [Release notes](https://github.com/vuejs/vue-loader/releases)
- [Changelog](https://github.com/vuejs/vue-loader/blob/master/CHANGELOG.md)
- [Commits](https://github.com/vuejs/vue-loader/compare/v15.9.7...v15.9.8)

---
updated-dependencies:
- dependency-name: vue-loader
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-08-08 08:07:04 +00:00
Nextcloud bot
1f4886d891
[tx-robot] updated from transifex 
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
 2021-08-08 02:21:52 +00:00
dependabot[bot]
6f57b3bc79
Merge pull request #28340 from nextcloud/dependabot/npm_and_yarn/stable22/dompurify-2.2.9 2021-08-08 00:26:12 +00:00
dependabot[bot]
164d5a296b Bump dompurify from 2.2.8 to 2.2.9 
Bumps [dompurify](https://github.com/cure53/DOMPurify) from 2.2.8 to 2.2.9.
- [Release notes](https://github.com/cure53/DOMPurify/releases)
- [Commits](https://github.com/cure53/DOMPurify/compare/2.2.8...2.2.9)

---
updated-dependencies:
- dependency-name: dompurify
  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-08-07 23:51:24 +00:00
dependabot[bot]
a58eafb53f
Merge pull request #28341 from nextcloud/dependabot/npm_and_yarn/stable22/babel/preset-env-7.14.9 2021-08-07 04:41:51 +00:00
dependabot[bot]
0af0874442
Bump @babel/preset-env from 7.14.8 to 7.14.9 
Bumps [@babel/preset-env](https://github.com/babel/babel/tree/HEAD/packages/babel-preset-env) from 7.14.8 to 7.14.9.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/commits/v7.14.9/packages/babel-preset-env)

---
updated-dependencies:
- dependency-name: "@babel/preset-env"
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-08-07 02:53:06 +00:00
Nextcloud bot
9da252811c
[tx-robot] updated from transifex 
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
 2021-08-07 02:27:36 +00:00
Nextcloud bot
9a95bb4f89
[tx-robot] updated from transifex 
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
 2021-08-06 02:27:07 +00:00
John Molakvoæ
f9dfb535ef
Merge pull request #28271 from nextcloud/dependabot/npm_and_yarn/stable22/marked-2.0.7 2021-08-05 14:30:00 +02:00
dependabot[bot]
ae3c49d375 Bump marked from 2.0.6 to 2.0.7 
Bumps [marked](https://github.com/markedjs/marked) from 2.0.6 to 2.0.7.
- [Release notes](https://github.com/markedjs/marked/releases)
- [Changelog](https://github.com/markedjs/marked/blob/master/release.config.js)
- [Commits](https://github.com/markedjs/marked/compare/v2.0.6...v2.0.7)

---
updated-dependencies:
- dependency-name: marked
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Signed-off-by: npmbuildbot-nextcloud[bot] <npmbuildbot-nextcloud[bot]@users.noreply.github.com>
 2021-08-05 10:16:08 +00:00
Julius Härtl
127d8e65a4
Merge pull request #28288 from nextcloud/backport/28259/stable22 
[stable22] Check that php was compiled with argon2 support or that the php-sodium extensions is installed
 2021-08-05 10:25:10 +02:00
Nextcloud bot
f030a16333
[tx-robot] updated from transifex 
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
 2021-08-05 02:27:20 +00:00
John Molakvoæ
3290c53d6a
Merge pull request #28252 from nextcloud/backport/28240/stable22 
[stable22] Add h2 to personal info page, fixing accessibility issue
 2021-08-04 09:53:51 +02:00
John Molakvoæ
aec771763c
Merge pull request #28274 from nextcloud/backport/28202/stable22 2021-08-04 08:12:15 +02:00
John Molakvoæ
525ff78aab
Merge pull request #28304 from nextcloud/bugfix/22.1-upgrade 2021-08-04 07:40:58 +02:00
Nextcloud bot
2a4b5752de
[tx-robot] updated from transifex 
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
 2021-08-04 02:26:47 +00:00
Christopher Ng
6da7f78ec2 Build 
Signed-off-by: Christopher Ng <chrng8@gmail.com>
 2021-08-04 00:22:57 +00:00
Christopher Ng
fc9066efb2 Remove chunkhash 
Signed-off-by: Christopher Ng <chrng8@gmail.com>
(cherry picked from commit 63c3b9a4cc)
 2021-08-04 00:10:18 +00:00
Julius Härtl
e0ab00e5f1
Allow upgrade from 22.1 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2021-08-03 22:03:51 +02:00
John Molakvoæ
a45d94af7b
Merge pull request #28298 from nextcloud/version/22.1.0/Final 
22.1.0
 2021-08-03 16:36:07 +02:00
John Molakvoæ (skjnldsv)
192858a79b
22.1.0 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2021-08-03 08:44:58 +02:00
Nextcloud bot
3f3206149e
[tx-robot] updated from transifex 
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
 2021-08-03 02:26:24 +00:00
Louis
972f678316
Merge pull request #28215 from nextcloud/backport/28174/stable22 
[stable22] Set openfile params when following internal links
 2021-08-02 18:37:58 +02:00
Louis
8c13c5a5be Fix typo 
Co-authored-by: Pytal <24800714+Pytal@users.noreply.github.com>
Signed-off-by: Christopher Ng <chrng8@gmail.com>
 2021-08-02 18:05:13 +02:00
Louis Chemineau
7f044655ed Set openfile params when following internal links 
Signed-off-by: Louis Chemineau <louis@chmn.me>
 2021-08-02 18:05:13 +02:00
Carl Schwan
94466918e3 Check that php was compiled with argon2 support or that the php-sodium 
extensions is installed

Signed-off-by: Carl Schwan <carl@carlschwan.eu>
 2021-08-02 09:19:09 +00:00
Nextcloud bot
e02dde323d
[tx-robot] updated from transifex 
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
 2021-08-02 07:56:43 +00:00
Nextcloud bot
7c7dc50ceb
[tx-robot] updated from transifex 
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
 2021-08-02 07:35:34 +00:00
dependabot[bot]
4932396052
Merge pull request #28269 from nextcloud/dependabot/composer/build/integration/stable22/guzzlehttp/guzzle-6.5.5 2021-08-01 18:32:48 +00:00
dependabot[bot]
3c494c4031
Update guzzlehttp/guzzle requirement in /build/integration 
Updates the requirements on [guzzlehttp/guzzle](https://github.com/guzzle/guzzle) to permit the latest version.
- [Release notes](https://github.com/guzzle/guzzle/releases)
- [Changelog](https://github.com/guzzle/guzzle/blob/6.5.5/CHANGELOG.md)
- [Commits](https://github.com/guzzle/guzzle/compare/6.5.2...6.5.5)

---
updated-dependencies:
- dependency-name: guzzlehttp/guzzle
  dependency-type: direct:development
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-08-01 18:00:23 +00:00
dependabot[bot]
b285f18595
Merge pull request #28270 from nextcloud/dependabot/npm_and_yarn/stable22/css-loader-5.2.7 2021-08-01 16:31:48 +00:00