mirrors/nextcloud-server
3
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2025-10-26 19:21:34 +00:00
Code Issues Packages Projects Releases Wiki Activity
59,315 Commits 696 Branches 1,154 Tags 27 GiB
e840e08cef
Commit Graph

59315 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Julius Härtl
e840e08cef
Merge pull request #28210 from nextcloud/allow-to-disable-group-change-mail-notification 
Allow to disable group membership change notification
 2021-07-28 17:13:49 +02:00
John Molakvoæ
3ced8406a0
Merge pull request #28174 from nextcloud/feature/set_openfile_for_internal_links 2021-07-28 15:03:54 +02:00
Marco Ambrosini
a4d1c55624 Allow to disable group change notification 
Signed-off-by: Marco Ambrosini <marcoambrosini@pm.me>
 2021-07-28 12:23:47 +02:00
Louis
1ad5e8ad73
Fix typo 
Co-authored-by: Pytal <24800714+Pytal@users.noreply.github.com>
 2021-07-28 11:15:03 +02:00
Julius Härtl
a71294ed34
Merge pull request #27751 from nextcloud/enh/23769/accept-decline-fed-sharing-ui 2021-07-28 10:38:23 +02:00
John Molakvoæ
640f339b7d
Add checkout token 2021-07-28 07:40:58 +02:00
John Molakvoæ
525460c04d
Use COMMAND_BOT_PAT 2021-07-28 07:34:47 +02:00
Julien Veyssier
0b8e90cb67
Merge pull request #27893 from nextcloud/fix/comments-file-action 
Fix comments file action sidebar opening
 2021-07-27 17:04:47 +02:00
Lukas Reschke
d4352aaace
Merge pull request #27886 from ecsecta/keep_pw_based_authntoken_alive_on_pwlesslogin 
Keep pw based auth tokens valid when pw-less login happens
 2021-07-27 14:37:15 +02:00
Vincent Petry
f6f2f63016
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-07-27 14:32:51 +02:00
John Molakvoæ
7652d732cb
Delete dependabot-approve-merge.yml 2021-07-27 13:46:44 +02:00
Louis Chemineau
e558a00496 Set openfile params when following internal links 
Signed-off-by: Louis Chemineau <louis@chmn.me>
 2021-07-27 11:41:32 +00:00
Vincent Petry
1125832623
Fix route path for pending remote shares 
Signed-off-by: Vincent Petry <vincent@nextcloud.com>
 2021-07-27 13:30:44 +02:00
Vincent Petry
dac676c14e
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-07-27 13:04:39 +02:00
Julien Veyssier
a8ebf37b08
fix jsunit tests for comments 
Signed-off-by: Julien Veyssier <eneiluj@posteo.net>
 2021-07-27 12:57:44 +02:00
Vincent Petry
e67e90afce
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-07-27 12:20:03 +02:00
Vincent Petry
3deffc3161
Use mimetype instead of type when defaulting in remote shares 
Signed-off-by: Vincent Petry <vincent@nextcloud.com>
 2021-07-27 12:20:01 +02:00
Vincent Petry
e8f4a524a2
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-07-27 12:19:26 +02:00
Vincent Petry
15f41a6b72
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-07-27 12:19:26 +02:00
Vincent Petry
c1563215e6
Disable default actions in pending file list 
Signed-off-by: Vincent Petry <vincent@nextcloud.com>
 2021-07-27 12:19:25 +02:00
Vincent Petry
f3f2faa815
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-07-27 12:19:25 +02:00
Vincent Petry
4b5bb4d9cf
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-07-27 12:19:24 +02:00
Vincent Petry
cff8ae7ded
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-07-27 12:19:24 +02:00
Vincent Petry
46b8cf4f64
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-07-27 12:19:24 +02:00
Vincent Petry
7130a98e47
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-07-27 12:19:23 +02:00
Vincent Petry
53aafff972
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-07-27 12:19:18 +02:00
John Molakvoæ
702bced2b7
Add files via upload 2021-07-27 12:00:36 +02:00
Julien Veyssier
5914c5e59c fix comments file action sidebar opening 
Signed-off-by: Julien Veyssier <eneiluj@posteo.net>
Signed-off-by: npmbuildbot-nextcloud[bot] <npmbuildbot-nextcloud[bot]@users.noreply.github.com>
 2021-07-27 08:50:04 +00:00
John Molakvoæ
39931cab94
Update dependabot-approve-merge.yml 2021-07-27 08:16:41 +02:00
Julius Härtl
5efbdda151
Merge pull request #28173 from nextcloud/fix/variable_override_in_file_view 
Fix variable override in file view
 2021-07-26 21:11:10 +02:00
John Molakvoæ
cade646878
Merge pull request #28127 from nextcloud/dependabot/various 2021-07-26 20:05:04 +02:00
John Molakvoæ (skjnldsv)
b2b35c2b34
Bump p-queue 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2021-07-26 18:46:37 +02:00
John Molakvoæ (skjnldsv)
ccc63a4c83
Bump vue and fix babel warning 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2021-07-26 18:45:21 +02:00
John Molakvoæ (skjnldsv)
ae2719fcc4
Bump dependencies 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2021-07-26 18:45:21 +02:00
John Molakvoæ
f304633fbc
Add command-compile 2021-07-26 18:44:29 +02:00
Louis Chemineau
2cbc3e9245 Fix variabable override in file view 
Signed-off-by: Louis Chemineau <louis@chmn.me>
 2021-07-26 15:47:37 +02:00
szaimen
a65d3844c1
Merge pull request #28166 from nextcloud/enh/usermanagement/add-group-icon 
User management - Add icon to user groups
 2021-07-26 15:31:55 +02:00
Julien Veyssier
4c400a0283
Merge pull request #28164 from nextcloud/fix/file-multiselect-actions-sort 
Fix sort function of files multiple selection actions
 2021-07-26 15:08:09 +02:00
Julien Veyssier
d6b4944c4b
fix sort sort function of files multiple selection actions 
Signed-off-by: Julien Veyssier <eneiluj@posteo.net>
 2021-07-26 14:08:44 +02:00
szaimen
d9f8bce443 User management - Add icon to user groups 
Signed-off-by: szaimen <szaimen@e.mail.de>
Signed-off-by: npmbuildbot-nextcloud[bot] <npmbuildbot-nextcloud[bot]@users.noreply.github.com>
 2021-07-26 11:44:33 +00:00
Julius Härtl
b31c08e536
Merge pull request #28075 from nextcloud/enh/noid/admin_audit-report-full-path 
Admin Audit - Sharing: createShare - report the full path
 2021-07-26 12:35:48 +02:00
kesselb
0d5d3ad9fd
Merge pull request #28151 from nextcloud-pr-bot/automated/noid/psalm-baseline-update 
[Automated] Update psalm-baseline.xml
 2021-07-25 20:34:55 +02:00
Nextcloud-PR-Bot
21236473d7 Update psalm baseline 
Signed-off-by: GitHub <noreply@github.com>
 2021-07-25 04:10:46 +00:00
John Molakvoæ
a6d91c2ccf
Merge pull request #27281 from nextcloud/dependabot/npm_and_yarn/nextcloud/router-2.0.0 2021-07-24 13:11:53 +02:00
John Molakvoæ
ece22815a3
Merge pull request #28132 from nextcloud/work/carl/fix-tests 
Fix tests in files_versions
 2021-07-24 09:37:52 +02:00
dependabot[bot]
32953644a4
Merge pull request #28146 from nextcloud/dependabot/npm_and_yarn/sass-1.36.0 2021-07-24 04:01:42 +00:00
dependabot[bot]
ba8e006a4e
Merge pull request #28144 from nextcloud/dependabot/npm_and_yarn/testing-library/user-event-13.2.0 2021-07-24 03:40:03 +00:00
dependabot[bot]
14de962940
Bump sass from 1.35.2 to 1.36.0 
Bumps [sass](https://github.com/sass/dart-sass) from 1.35.2 to 1.36.0.
- [Release notes](https://github.com/sass/dart-sass/releases)
- [Changelog](https://github.com/sass/dart-sass/blob/main/CHANGELOG.md)
- [Commits](https://github.com/sass/dart-sass/compare/1.35.2...1.36.0)

---
updated-dependencies:
- dependency-name: sass
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-07-24 02:13:40 +00:00
dependabot[bot]
343b40e2fc
Bump @testing-library/user-event from 13.1.9 to 13.2.0 
Bumps [@testing-library/user-event](https://github.com/testing-library/user-event) from 13.1.9 to 13.2.0.
- [Release notes](https://github.com/testing-library/user-event/releases)
- [Changelog](https://github.com/testing-library/user-event/blob/main/CHANGELOG.md)
- [Commits](https://github.com/testing-library/user-event/compare/v13.1.9...v13.2.0)

---
updated-dependencies:
- dependency-name: "@testing-library/user-event"
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-07-24 01:03:18 +00:00
Christopher Ng
fd71b39d58 Rebuild 
Signed-off-by: Christopher Ng <chrng8@gmail.com>
 2021-07-23 23:10:29 +00:00