Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Make no-user entry with avatar when there is no others with access #39022

2 changes: 1 addition & 1 deletion 3rdparty
Submodule 3rdparty updated 55 files
+0 −2 .gitignore
+674 −0 christophwurst/id3parser/LICENSE
+22 −0 christophwurst/id3parser/src/ID3Parser.php
+356 −0 christophwurst/id3parser/src/getID3/Tags/getid3_id3v1.php
+3,374 −0 christophwurst/id3parser/src/getID3/Tags/getid3_id3v2.php
+252 −0 christophwurst/id3parser/src/getID3/getid3.php
+13 −0 christophwurst/id3parser/src/getID3/getid3_exception.php
+155 −0 christophwurst/id3parser/src/getID3/getid3_handler.php
+1,161 −0 christophwurst/id3parser/src/getID3/getid3_lib.php
+1 −1 composer.json
+66 −75 composer.lock
+51 −45 composer/ClassLoader.php
+7 −1 composer/autoload_classmap.php
+1 −1 composer/autoload_psr4.php
+12 −9 composer/autoload_static.php
+73 −82 composer/installed.json
+23 −23 composer/installed.php
+1 −1 sabre/http/lib/Auth/AbstractAuth.php
+1 −1 sabre/http/lib/Auth/Basic.php
+1 −1 sabre/http/lib/Auth/Bearer.php
+2 −2 sabre/http/lib/Auth/Digest.php
+2 −2 sabre/http/lib/Client.php
+3 −3 sabre/http/lib/Message.php
+3 −3 sabre/http/lib/MessageDecoratorTrait.php
+5 −5 sabre/http/lib/MessageInterface.php
+1 −1 sabre/http/lib/Request.php
+1 −1 sabre/http/lib/RequestDecorator.php
+1 −1 sabre/http/lib/RequestInterface.php
+2 −2 sabre/http/lib/Response.php
+1 −1 sabre/http/lib/ResponseDecorator.php
+1 −1 sabre/http/lib/ResponseInterface.php
+2 −8 sabre/http/lib/Sapi.php
+1 −1 sabre/http/lib/Version.php
+1 −1 sabre/http/lib/functions.php
+0 −13 sabre/uri/.php-cs-fixer.dist.php
+1 −1 sabre/uri/lib/Version.php
+40 −76 sabre/uri/lib/functions.php
+1 −1 sabre/vobject/lib/Cli.php
+7 −7 sabre/vobject/lib/Component.php
+1 −1 sabre/vobject/lib/Component/VCard.php
+1 −1 sabre/vobject/lib/Node.php
+2 −3 sabre/vobject/lib/Parameter.php
+4 −16 sabre/vobject/lib/Parser/MimeDir.php
+3 −1 sabre/vobject/lib/Parser/XML/Element/KeyValue.php
+2 −2 sabre/vobject/lib/Property.php
+10 −12 sabre/vobject/lib/Property/Text.php
+4 −26 sabre/vobject/lib/Recur/RRuleIterator.php
+0 −5 sabre/vobject/lib/VCardConverter.php
+1 −1 sabre/vobject/lib/Version.php
+1 −1 sabre/xml/lib/Deserializer/functions.php
+1 −1 sabre/xml/lib/Version.php
+0 −165 wapmorgan/mp3info/LICENSE
+0 −18 wapmorgan/mp3info/data/bitRateTable.php
+0 −8 wapmorgan/mp3info/data/sampleRateTable.php
+0 −1,081 wapmorgan/mp3info/src/Mp3Info.php
2 changes: 1 addition & 1 deletion apps/comments/src/utils/cancelableRequest.js
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ const cancelableRequest = function(request) {
const fetch = async function(url, options) {
const response = await request(
url,
Object.assign({ signal }, options)
Object.assign({ signal }, options),
)
return response
}
Expand Down
6 changes: 3 additions & 3 deletions apps/comments/src/views/Comments.vue
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@
-->

<template>
<div class="comments"
:class="{ 'icon-loading': isFirstLoading }"
v-observe-visibility="onVisibilityChange">
<div v-observe-visibility="onVisibilityChange"
class="comments"
:class="{ 'icon-loading': isFirstLoading }">
<!-- Editor -->
<Comment v-bind="editorData"
:auto-complete="autoComplete"
Expand Down
2 changes: 1 addition & 1 deletion apps/dav/src/dav/client.js
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,6 @@ export const getClient = memoize((service) => {
patcher.patch('request', axios)

return webdav.createClient(
generateRemoteUrl(`dav/${service}/${getCurrentUser().uid}`)
generateRemoteUrl(`dav/${service}/${getCurrentUser().uid}`),
)
})
4 changes: 2 additions & 2 deletions apps/dav/src/service/PreferenceService.js
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ export async function enableUserStatusAutomation() {
}),
{
configValue: 'yes',
}
},
)
}

Expand All @@ -45,6 +45,6 @@ export async function disableUserStatusAutomation() {
generateOcsUrl('/apps/provisioning_api/api/v1/config/users/{appId}/{configKey}', {
appId: 'dav',
configKey: 'user_status_automation',
})
}),
)
}
4 changes: 2 additions & 2 deletions apps/dav/src/settings.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,12 @@ const CalDavSettingsView = new View({
sendInvitations: loadState('dav', 'sendInvitations'),
generateBirthdayCalendar: loadState(
'dav',
'generateBirthdayCalendar'
'generateBirthdayCalendar',
),
sendEventReminders: loadState('dav', 'sendEventReminders'),
sendEventRemindersToSharedUsers: loadState(
'dav',
'sendEventRemindersToSharedUsers'
'sendEventRemindersToSharedUsers',
),
sendEventRemindersPush: loadState('dav', 'sendEventRemindersPush'),
}
Expand Down
12 changes: 6 additions & 6 deletions apps/dav/src/views/CalDavSettings.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -50,27 +50,27 @@ describe('CalDavSettings', () => {
},
Vue => {
Vue.prototype.$t = jest.fn((app, text) => text)
}
},
)
expect(TLUtils.container).toMatchSnapshot()
const sendInvitations = TLUtils.getByLabelText(
'Send invitations to attendees'
'Send invitations to attendees',
)
expect(sendInvitations).toBeChecked()
const generateBirthdayCalendar = TLUtils.getByLabelText(
'Automatically generate a birthday calendar'
'Automatically generate a birthday calendar',
)
expect(generateBirthdayCalendar).toBeChecked()
const sendEventReminders = TLUtils.getByLabelText(
'Send notifications for events'
'Send notifications for events',
)
expect(sendEventReminders).toBeChecked()
const sendEventRemindersToSharedUsers = TLUtils.getByLabelText(
'Send reminder notifications to calendar sharees as well'
'Send reminder notifications to calendar sharees as well',
)
expect(sendEventRemindersToSharedUsers).toBeChecked()
const sendEventRemindersPush = TLUtils.getByLabelText(
'Enable notifications for events via push'
'Enable notifications for events via push',
)
expect(sendEventRemindersPush).toBeChecked()

Expand Down
4 changes: 2 additions & 2 deletions apps/dav/src/views/CalDavSettings.vue
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ export default {
OCP.AppConfig.setValue(
'dav',
'sendInvitations',
value ? 'yes' : 'no'
value ? 'yes' : 'no',
)
},
sendEventReminders(value) {
Expand All @@ -134,7 +134,7 @@ export default {
OCP.AppConfig.setValue(
'dav',
'sendEventRemindersToSharedUsers',
value ? 'yes' : 'no'
value ? 'yes' : 'no',
)
},
sendEventRemindersPush(value) {
Expand Down
2 changes: 1 addition & 1 deletion apps/files/src/components/NavigationQuota.vue
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ export default {
* Update the storage stats
* Throttled at max 1 refresh per minute
*
* @param {Event} [event = null] if user interaction
* @param {Event} [event] if user interaction
*/
async updateStorageStats(event = null) {
if (this.loadingStorageStats) {
Expand Down
4 changes: 2 additions & 2 deletions apps/files/src/components/TransferOwnershipDialogue.vue
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,8 @@
<label for="targetUser">
<span>{{ t('files', 'New owner') }}</span>
</label>
<NcSelect input-id="targetUser"
v-model="selectedUser"
<NcSelect v-model="selectedUser"
input-id="targetUser"
:options="formatedUserSuggestions"
:multiple="false"
:loading="loadingUsers"
Expand Down
4 changes: 2 additions & 2 deletions apps/files/src/services/FileAction.ts
Original file line number Diff line number Diff line change
Expand Up @@ -46,13 +46,13 @@ interface FileActionData {
enabled?: (files: Node[], view: Navigation) => boolean
/**
* Function executed on single file action
* @returns true if the action was executed, false otherwise
* @return true if the action was executed, false otherwise
* @throws Error if the action failed
*/
exec: (file: Node, view: Navigation, dir: string) => Promise<boolean|null>,
/**
* Function executed on multiple files action
* @returns true if the action was executed successfully,
* @return true if the action was executed successfully,
* false otherwise and null if the action is silent/undefined.
* @throws Error if the action failed
*/
Expand Down
1 change: 1 addition & 0 deletions apps/files/src/services/PreviewService.ts
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ const SWCacheName = 'previews'

/**
* Check if the preview is already cached by the service worker
* @param previewUrl
*/
export const isCachedPreview = function(previewUrl: string) {
return caches.open(SWCacheName)
Expand Down
4 changes: 2 additions & 2 deletions apps/files_external/tests/appSpec.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* @copyright 2014 Vincent Petry <pvince81@owncloud.com>
* @copyright 2014 Vincent Petry <pvince81@owncloud.com>
*
* @author Joas Schilling <coding@schilljs.com>
* @author John Molakvoæ <skjnldsv@protonmail.com>
Expand Down Expand Up @@ -39,7 +39,7 @@ describe('OCA.Files_External.App tests', function() {
+ '<div id="app-content-extstoragemounts" class="hidden">'
+ '</div>'
+ '</div>'
+ '</div>'
+ '</div>',
)
fileList = App.initList($('#app-content-extstoragemounts'))
})
Expand Down
2 changes: 1 addition & 1 deletion apps/files_sharing/src/components/SharingEntryLink.vue
Original file line number Diff line number Diff line change
Expand Up @@ -671,7 +671,7 @@ export default {
* accordingly
*
* @param {Share} share the new share
* @param {boolean} [update=false] do we update the current share ?
* @param {boolean} [update] do we update the current share ?
*/
async pushNewLinkShare(share, update) {
try {
Expand Down
4 changes: 2 additions & 2 deletions apps/files_sharing/src/components/SharingEntrySimple.vue
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@
{{ subtitle }}
</p>
</div>
<NcActions ref="actionsComponent"
v-if="$slots['default']"
<NcActions v-if="$slots['default']"
ref="actionsComponent"
class="sharing-entry__actions"
menu-align="right"
:aria-expanded="ariaExpandedValue">
Expand Down
4 changes: 2 additions & 2 deletions apps/files_sharing/src/components/SharingInput.vue
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
<div class="sharing-search">
<label for="sharing-search-input">{{ t('files_sharing', 'Search for share recipients') }}</label>
<NcSelect ref="select"
v-model="value"
input-id="sharing-search-input"
class="sharing-search__input"
:disabled="!canReshare"
Expand All @@ -33,7 +34,6 @@
:clear-search-on-blur="() => false"
:user-select="true"
:options="options"
v-model="value"
@open="handleOpen"
@search="asyncFind"
@option:selected="addShare">
Expand Down Expand Up @@ -176,7 +176,7 @@ export default {
* Get suggestions
*
* @param {string} search the search query
* @param {boolean} [lookup=false] search on lookup server
* @param {boolean} [lookup] search on lookup server
*/
async getSuggestions(search, lookup = false) {
this.loading = true
Expand Down
18 changes: 9 additions & 9 deletions apps/files_sharing/src/mixins/ShareRequests.js
Original file line number Diff line number Diff line change
Expand Up @@ -42,13 +42,13 @@ export default {
* @param {string} data.path path to the file/folder which should be shared
* @param {number} data.shareType 0 = user; 1 = group; 3 = public link; 6 = federated cloud share
* @param {string} data.shareWith user/group id with which the file should be shared (optional for shareType > 1)
* @param {boolean} [data.publicUpload=false] allow public upload to a public shared folder
* @param {boolean} [data.publicUpload] allow public upload to a public shared folder
* @param {string} [data.password] password to protect public link Share with
* @param {number} [data.permissions=31] 1 = read; 2 = update; 4 = create; 8 = delete; 16 = share; 31 = all (default: 31, for public shares: 1)
* @param {boolean} [data.sendPasswordByTalk=false] send the password via a talk conversation
* @param {string} [data.expireDate=''] expire the shareautomatically after
* @param {string} [data.label=''] custom label
* @param {string} [data.attributes=null] Share attributes encoded as json
* @param {number} [data.permissions] 1 = read; 2 = update; 4 = create; 8 = delete; 16 = share; 31 = all (default: 31, for public shares: 1)
* @param {boolean} [data.sendPasswordByTalk] send the password via a talk conversation
* @param {string} [data.expireDate] expire the shareautomatically after
* @param {string} [data.label] custom label
* @param {string} [data.attributes] Share attributes encoded as json
* @return {Share} the new share
* @throws {Error}
*/
Expand All @@ -66,7 +66,7 @@ export default {
const errorMessage = error?.response?.data?.ocs?.meta?.message
OC.Notification.showTemporary(
errorMessage ? t('files_sharing', 'Error creating the share: {errorMessage}', { errorMessage }) : t('files_sharing', 'Error creating the share'),
{ type: 'error' }
{ type: 'error' },
)
throw error
}
Expand All @@ -91,7 +91,7 @@ export default {
const errorMessage = error?.response?.data?.ocs?.meta?.message
OC.Notification.showTemporary(
errorMessage ? t('files_sharing', 'Error deleting the share: {errorMessage}', { errorMessage }) : t('files_sharing', 'Error deleting the share'),
{ type: 'error' }
{ type: 'error' },
)
throw error
}
Expand All @@ -118,7 +118,7 @@ export default {
const errorMessage = error?.response?.data?.ocs?.meta?.message
OC.Notification.showTemporary(
errorMessage ? t('files_sharing', 'Error updating the share: {errorMessage}', { errorMessage }) : t('files_sharing', 'Error updating the share'),
{ type: 'error' }
{ type: 'error' },
)
}
const message = error.response.data.ocs.meta.message
Expand Down
10 changes: 5 additions & 5 deletions apps/files_sharing/src/utils/SharedWithMe.js
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ const shareWithTitle = function(share) {
owner: share.ownerDisplayName,
},
undefined,
{ escape: false }
{ escape: false },
)
} else if (share.type === ShareTypes.SHARE_TYPE_CIRCLE) {
return t(
Expand All @@ -44,7 +44,7 @@ const shareWithTitle = function(share) {
owner: share.ownerDisplayName,
},
undefined,
{ escape: false }
{ escape: false },
)
} else if (share.type === ShareTypes.SHARE_TYPE_ROOM) {
if (share.shareWithDisplayName) {
Expand All @@ -56,7 +56,7 @@ const shareWithTitle = function(share) {
owner: share.ownerDisplayName,
},
undefined,
{ escape: false }
{ escape: false },
)
} else {
return t(
Expand All @@ -66,7 +66,7 @@ const shareWithTitle = function(share) {
owner: share.ownerDisplayName,
},
undefined,
{ escape: false }
{ escape: false },
)
}
} else {
Expand All @@ -75,7 +75,7 @@ const shareWithTitle = function(share) {
'Shared with you by {owner}',
{ owner: share.ownerDisplayName },
undefined,
{ escape: false }
{ escape: false },
)
}
}
Expand Down
Loading