Skip to content

Commit

Permalink
Merge branch 'master' into Jerome-Herbinet-internal-shares-parameter-…
Browse files Browse the repository at this point in the history 
…better-distinction

Signed-off-by: Jérôme Herbinet <33763786+Jerome-Herbinet@users.noreply.github.com>
  • Loading branch information
@Jerome-Herbinet
Jerome-Herbinet authored Oct 18, 2024
2 parents 2059a4a + e65f310 commit 62987b8
Show file tree
Hide file tree
Showing 1,417 changed files with 11,987 additions and 16,150 deletions.
14 changes: 11 additions & 3 deletions .github/CODEOWNERS
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,14 @@
/apps/admin_audit/appinfo/info.xml @luka-nextcloud @blizzz
/apps/cloud_federation_api/appinfo/info.xml @mejo-
/apps/comments/appinfo/info.xml @edward-ly @Pytal
/apps/contactsinteraction/appinfo/info.xml @kesselb @miaulalala @ChristophWurst @GretaD @hamza221 @st3iny
/apps/contactsinteraction/appinfo/info.xml @kesselb @SebastianKrupinski
/apps/contactsinteraction/lib @kesselb @SebastianKrupinski
/apps/contactsinteraction/tests @kesselb @SebastianKrupinski
/apps/dashboard/appinfo/info.xml @julien-nc @juliushaertl
/apps/dav/lib/CalDAV @ChristophWurst @miaulalala @tcitworld
/apps/dav/lib/CardDAV @ChristophWurst @miaulalala @tcitworld
/apps/dav/lib/CalDAV @miaulalala @st3iny @SebastianKrupinski
/apps/dav/lib/CardDAV @miaulalala @st3iny @SebastianKrupinski
/apps/dav/tests/unit/CalDAV @miaulalala @st3iny @SebastianKrupinski
/apps/dav/tests/unit/CardDAV @miaulalala @st3iny @SebastianKrupinski
/apps/encryption/appinfo/info.xml @come-nc @icewind1991
/apps/federatedfilesharing/appinfo/info.xml @icewind1991 @danxuliu
/apps/federation/appinfo/info.xml @datenangebot
Expand Down Expand Up @@ -65,6 +69,10 @@ ResponseDefinitions.php @provokateurin
/lib/public/Talk @nickvergessen
/lib/public/UserStatus @nickvergessen

# Groupware
/build/integration/dav_features/caldav.feature @miaulalala @st3iny @SebastianKrupinski
/build/integration/dav_features/carddav.feature @miaulalala @st3iny @SebastianKrupinski

# Personal interest
*/Activity/* @nickvergessen
*/Notifications/* @nickvergessen
Expand Down
4 changes: 2 additions & 2 deletions .reuse/dep5
View file
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@ Files: vendor-bin/*/composer.json vendor-bin/*/composer.lock
Copyright: 2021 Nextcloud GmbH and Nextcloud contributors
License: AGPL-3.0-or-later

Files: apps/encryption/img/app.svg apps/federation/img/app.svg apps/files/img/add-color.png apps/files/img/add-color.svg apps/files/img/app-dark.svg apps/files/img/app.svg apps/files/img/change.png apps/files/img/change.svg apps/files/img/delete-color.png apps/files/img/delete-color.svg apps/files/img/folder.svg apps/files_external/img/app-dark.svg apps/files_external/img/app.svg apps/user_ldap/img/app-dark.svg apps/user_ldap/img/app.svg apps/comments/img/comments-dark.svg apps/comments/img/comments.svg apps/files_reminders/img/alarm.svg apps/files_reminders/img/app-dark.svg apps/files_reminders/img/app.svg apps/files_versions/img/app-dark.svg apps/files_versions/img/app.svg apps/files_trashbin/img/app-dark.svg apps/files_trashbin/img/app.svg apps/theming/img/accessibility-dark.svg apps/testing/img/app.svg apps/sharebymail/img/app.svg apps/systemtags/img/app.svg apps/provisioning_api/img/app.svg apps/settings/img/apps.svg apps/settings/img/change.svg apps/settings/img/help.svg apps/settings/img/password.svg apps/settings/img/personal.png apps/settings/img/personal.svg apps/settings/img/share.svg apps/settings/img/users-white.svg apps/settings/img/users.svg apps/files_sharing/img/app.svg apps/settings/img/admin.svg apps/settings/img/settings.svg apps/settings/img/settings_apps.svg apps/settings/img/toggle-filelist.svg apps/webhook_listeners/img/app-dark.svg apps/webhook_listeners/img/app.svg core/img/filetypes/application-pdf.svg core/img/breadcrumb.svg core/img/filetypes/application.svg core/img/filetypes/audio.svg core/img/filetypes/file.svg core/img/filetypes/folder-drag-accept.svg core/img/filetypes/folder-encrypted.svg core/img/filetypes/folder-external.svg core/img/filetypes/folder-public.svg core/img/filetypes/folder-shared.svg core/img/filetypes/folder-starred.svg core/img/filetypes/folder.svg core/img/filetypes/image.svg core/img/filetypes/link.svg core/img/filetypes/location.svg core/img/filetypes/mindmap.svg core/img/filetypes/text-calendar.svg core/img/filetypes/text-code.svg core/img/filetypes/text-vcard.svg core/img/filetypes/text.svg core/img/filetypes/video.svg core/img/filetypes/x-office-document.svg core/img/filetypes/x-office-drawing.svg core/img/filetypes/x-office-form-template.svg core/img/filetypes/x-office-form.svg core/img/filetypes/x-office-presentation.svg core/img/filetypes/x-office-spreadsheet.svg core/img/places/calendar-dark.png core/img/places/calendar.png core/img/places/calendar.svg core/img/places/contacts-dark.png core/img/places/contacts.svg core/img/places/default-app-icon.svg core/img/places/files.svg core/img/places/home.svg core/img/places/link.svg core/img/places/music.svg core/img/places/picture.svg core/img/rating/s0.svg core/img/rating/s1.svg core/img/rating/s10.svg core/img/rating/s2.svg core/img/rating/s3.svg core/img/rating/s4.svg core/img/rating/s5.svg core/img/rating/s6.svg core/img/rating/s7.svg core/img/rating/s8.svg core/img/rating/s9.svg core/img/mail.svg core/img/rss.svg core/img/clients/desktop.svg core/img/clients/phone.svg core/img/clients/tablet.svg core/img/categories/auth.svg core/img/categories/bundles.svg core/img/categories/customization.svg core/img/categories/files.svg core/img/categories/games.svg core/img/categories/integration.svg core/img/categories/monitoring.svg core/img/categories/multimedia.svg core/img/categories/office.svg core/img/categories/organization.svg core/img/categories/social.svg core/img/categories/workflow.svg core/img/apps/circles.svg core/img/apps/notes.svg core/img/apps/richdocuments.svg core/img/caldav/attendees.png core/img/caldav/attendees.svg core/img/caldav/description.png core/img/caldav/description.svg core/img/caldav/link.png core/img/caldav/link.svg core/img/caldav/location.png core/img/caldav/location.svg core/img/caldav/organizer.png core/img/caldav/organizer.svg core/img/caldav/time.png core/img/caldav/time.svg core/img/caldav/title.png core/img/caldav/title.svg core/img/actions/add-folder-description.svg core/img/actions/add.svg core/img/actions/address.png core/img/actions/address.svg core/img/actions/alert-outline.svg core/img/actions/arrow-left.svg core/img/actions/arrow-right.svg core/img/actions/audio-off.svg core/img/actions/audio.svg core/img/actions/caret-white.svg core/img/actions/caret.svg core/img/actions/change.svg core/img/actions/clippy.svg core/img/actions/close.svg core/img/actions/comment.png core/img/actions/comment.svg core/img/actions/confirm-fade.svg core/img/actions/confirm-white.svg core/img/actions/confirm.svg core/img/actions/delete.png core/img/actions/delete.svg core/img/actions/details.svg core/img/actions/disabled-user.svg core/img/actions/disabled-users.svg core/img/actions/download.png core/img/actions/download.svg core/img/actions/edit.svg core/img/actions/error-white.svg core/img/actions/error.svg core/img/actions/external.svg core/img/actions/filter.svg core/img/actions/fullscreen.svg core/img/actions/group.svg core/img/actions/history.png core/img/actions/history.svg core/img/actions/info-white.svg core/img/actions/info.png core/img/actions/info.svg core/img/actions/logout.svg core/img/actions/mail.svg core/img/actions/menu-sidebar.svg core/img/actions/menu.svg core/img/actions/more-white.svg core/img/actions/more.png core/img/actions/more.svg core/img/actions/password-white.svg core/img/actions/password.png core/img/actions/password.svg core/img/actions/pause.svg core/img/actions/phone.svg core/img/actions/play-add.svg core/img/actions/play-next.svg core/img/actions/play-previous.svg core/img/actions/play.svg core/img/actions/profile.svg core/img/actions/projects.svg core/img/actions/public-white.svg core/img/actions/public.svg core/img/actions/quota.svg core/img/actions/recent.svg core/img/actions/rename.svg core/img/actions/screen-off.svg core/img/actions/screen.svg core/img/actions/search.svg core/img/actions/settings-dark.svg core/img/actions/settings.svg core/img/actions/share.png core/img/actions/share.svg core/img/actions/shared.svg core/img/actions/sound-off.svg core/img/actions/sound.svg core/img/actions/star-dark.svg core/img/actions/star.png core/img/actions/star.svg core/img/actions/starred.png core/img/actions/starred.svg core/img/actions/tag.png core/img/actions/tag.svg core/img/actions/template-add.svg core/img/actions/timezone.svg core/img/actions/toggle-background.svg core/img/actions/toggle-filelist.svg core/img/actions/toggle-pictures.svg core/img/actions/toggle.svg core/img/actions/triangle-e.svg core/img/actions/triangle-n.svg core/img/actions/triangle-s.svg core/img/actions/unshare.svg core/img/actions/upload.svg core/img/actions/user-admin.svg core/img/actions/user.svg core/img/actions/verified.svg core/img/actions/verify.svg core/img/actions/verifying.svg core/img/actions/video-off.svg core/img/actions/video-switch.svg core/img/actions/video.svg core/img/actions/view-close.svg core/img/actions/view-download.svg core/img/actions/view-next.svg core/img/actions/view-pause.svg core/img/actions/view-play.svg core/img/actions/view-previous.svg core/img/places/contacts-dark.png core/img/places/contacts.svg apps/user_status/img/app-dark.svg apps/user_status/img/app.svg apps/theming/img/app-dark.svg apps/theming/img/app.svg apps/updatenotification/img/app.svg apps/weather_status/img/app-dark.svg apps/weather_status/img/app.svg apps/updatenotification/img/notification.svg
Files: apps/encryption/img/app.svg apps/federation/img/app.svg apps/files/img/add-color.png apps/files/img/add-color.svg apps/files/img/app-dark.svg apps/files/img/app.svg apps/files/img/change.png apps/files/img/change.svg apps/files/img/delete-color.png apps/files/img/delete-color.svg apps/files/img/folder.svg apps/files/img/folder-move.svg apps/files_external/img/app-dark.svg apps/files_external/img/app.svg apps/user_ldap/img/app-dark.svg apps/user_ldap/img/app.svg apps/comments/img/comments-dark.svg apps/comments/img/comments.svg apps/files_reminders/img/alarm.svg apps/files_reminders/img/app-dark.svg apps/files_reminders/img/app.svg apps/files_versions/img/app-dark.svg apps/files_versions/img/app.svg apps/files_trashbin/img/app-dark.svg apps/files_trashbin/img/app.svg apps/theming/img/accessibility-dark.svg apps/testing/img/app.svg apps/sharebymail/img/app.svg apps/systemtags/img/app.svg apps/provisioning_api/img/app.svg apps/settings/img/apps.svg apps/settings/img/change.svg apps/settings/img/help.svg apps/settings/img/password.svg apps/settings/img/personal.png apps/settings/img/personal.svg apps/settings/img/share.svg apps/settings/img/users-white.svg apps/settings/img/users.svg apps/files_sharing/img/app.svg apps/settings/img/admin.svg apps/settings/img/settings.svg apps/settings/img/settings_apps.svg apps/settings/img/toggle-filelist.svg apps/webhook_listeners/img/app-dark.svg apps/webhook_listeners/img/app.svg core/img/filetypes/application-pdf.svg core/img/breadcrumb.svg core/img/filetypes/application.svg core/img/filetypes/audio.svg core/img/filetypes/file.svg core/img/filetypes/folder-drag-accept.svg core/img/filetypes/folder-encrypted.svg core/img/filetypes/folder-external.svg core/img/filetypes/folder-public.svg core/img/filetypes/folder-shared.svg core/img/filetypes/folder-starred.svg core/img/filetypes/folder.svg core/img/filetypes/image.svg core/img/filetypes/link.svg core/img/filetypes/location.svg core/img/filetypes/mindmap.svg core/img/filetypes/text-calendar.svg core/img/filetypes/text-code.svg core/img/filetypes/text-vcard.svg core/img/filetypes/text.svg core/img/filetypes/video.svg core/img/filetypes/x-office-document.svg core/img/filetypes/x-office-drawing.svg core/img/filetypes/x-office-form-template.svg core/img/filetypes/x-office-form.svg core/img/filetypes/x-office-presentation.svg core/img/filetypes/x-office-spreadsheet.svg core/img/places/calendar-dark.png core/img/places/calendar.png core/img/places/calendar.svg core/img/places/contacts-dark.png core/img/places/contacts.svg core/img/places/default-app-icon.svg core/img/places/files.svg core/img/places/home.svg core/img/places/link.svg core/img/places/music.svg core/img/places/picture.svg core/img/rating/s0.svg core/img/rating/s1.svg core/img/rating/s10.svg core/img/rating/s2.svg core/img/rating/s3.svg core/img/rating/s4.svg core/img/rating/s5.svg core/img/rating/s6.svg core/img/rating/s7.svg core/img/rating/s8.svg core/img/rating/s9.svg core/img/mail.svg core/img/rss.svg core/img/clients/desktop.svg core/img/clients/phone.svg core/img/clients/tablet.svg core/img/categories/auth.svg core/img/categories/bundles.svg core/img/categories/customization.svg core/img/categories/files.svg core/img/categories/games.svg core/img/categories/integration.svg core/img/categories/monitoring.svg core/img/categories/multimedia.svg core/img/categories/office.svg core/img/categories/organization.svg core/img/categories/social.svg core/img/categories/workflow.svg core/img/apps/circles.svg core/img/apps/notes.svg core/img/apps/richdocuments.svg core/img/caldav/attendees.png core/img/caldav/attendees.svg core/img/caldav/description.png core/img/caldav/description.svg core/img/caldav/link.png core/img/caldav/link.svg core/img/caldav/location.png core/img/caldav/location.svg core/img/caldav/organizer.png core/img/caldav/organizer.svg core/img/caldav/time.png core/img/caldav/time.svg core/img/caldav/title.png core/img/caldav/title.svg core/img/actions/add-folder-description.svg core/img/actions/add.svg core/img/actions/address.png core/img/actions/address.svg core/img/actions/alert-outline.svg core/img/actions/arrow-left.svg core/img/actions/arrow-right.svg core/img/actions/audio-off.svg core/img/actions/audio.svg core/img/actions/caret-white.svg core/img/actions/caret.svg core/img/actions/change.svg core/img/actions/clippy.svg core/img/actions/close.svg core/img/actions/comment.png core/img/actions/comment.svg core/img/actions/confirm-fade.svg core/img/actions/confirm-white.svg core/img/actions/confirm.svg core/img/actions/delete.png core/img/actions/delete.svg core/img/actions/details.svg core/img/actions/disabled-user.svg core/img/actions/disabled-users.svg core/img/actions/download.png core/img/actions/download.svg core/img/actions/edit.svg core/img/actions/error-white.svg core/img/actions/error.svg core/img/actions/external.svg core/img/actions/filter.svg core/img/actions/fullscreen.svg core/img/actions/group.svg core/img/actions/history.png core/img/actions/history.svg core/img/actions/info-white.svg core/img/actions/info.png core/img/actions/info.svg core/img/actions/logout.svg core/img/actions/mail.svg core/img/actions/menu-sidebar.svg core/img/actions/menu.svg core/img/actions/more-white.svg core/img/actions/more.png core/img/actions/more.svg core/img/actions/password-white.svg core/img/actions/password.png core/img/actions/password.svg core/img/actions/pause.svg core/img/actions/phone.svg core/img/actions/play-add.svg core/img/actions/play-next.svg core/img/actions/play-previous.svg core/img/actions/play.svg core/img/actions/profile.svg core/img/actions/projects.svg core/img/actions/public-white.svg core/img/actions/public.svg core/img/actions/quota.svg core/img/actions/recent.svg core/img/actions/rename.svg core/img/actions/screen-off.svg core/img/actions/screen.svg core/img/actions/search.svg core/img/actions/settings-dark.svg core/img/actions/settings.svg core/img/actions/share.png core/img/actions/share.svg core/img/actions/shared.svg core/img/actions/sound-off.svg core/img/actions/sound.svg core/img/actions/star-dark.svg core/img/actions/star.png core/img/actions/star.svg core/img/actions/starred.png core/img/actions/starred.svg core/img/actions/tag.png core/img/actions/tag.svg core/img/actions/template-add.svg core/img/actions/timezone.svg core/img/actions/toggle-background.svg core/img/actions/toggle-filelist.svg core/img/actions/toggle-pictures.svg core/img/actions/toggle.svg core/img/actions/triangle-e.svg core/img/actions/triangle-n.svg core/img/actions/triangle-s.svg core/img/actions/unshare.svg core/img/actions/upload.svg core/img/actions/user-admin.svg core/img/actions/user.svg core/img/actions/verified.svg core/img/actions/verify.svg core/img/actions/verifying.svg core/img/actions/video-off.svg core/img/actions/video-switch.svg core/img/actions/video.svg core/img/actions/view-close.svg core/img/actions/view-download.svg core/img/actions/view-next.svg core/img/actions/view-pause.svg core/img/actions/view-play.svg core/img/actions/view-previous.svg core/img/places/contacts-dark.png core/img/places/contacts.svg apps/user_status/img/app-dark.svg apps/user_status/img/app.svg apps/theming/img/app-dark.svg apps/theming/img/app.svg apps/updatenotification/img/app.svg apps/weather_status/img/app-dark.svg apps/weather_status/img/app.svg apps/updatenotification/img/notification.svg
Copyright: 2018-2024 Google LLC
License: Apache-2.0

Expand Down Expand Up @@ -203,7 +203,7 @@ Files: core/img/apps/richdocumentscode.svg
Copyright: 2016-2024 Collabora Ltd.
License: LicenseRef-CollaboraTrademarks

Files: core/img/twitter.svg core/img/actions/twitter.svg apps/federatedfilesharing/img/social-twitter.svg
Files: core/img/x.svg core/img/twitter.svg core/img/actions/twitter.svg apps/federatedfilesharing/img/social-twitter.svg
Copyright: X Corp.
License: LicenseRef-XTrademarks

Expand Down
2 changes: 1 addition & 1 deletion 3rdparty
Submodule 3rdparty updated 484 files
Loading

0 comments on commit 62987b8

Please sign in to comment.