Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/CODEOWNERS
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
# SPDX-FileCopyrightText: 2026 Nextcloud GmbH and Nextcloud contributors
# SPDX-License-Identifier: AGPL-3.0-or-later
/appinfo/info.xml @kyteinsky @bigcat88
/appinfo/info.xml @julien-nc @kyteinsky
2 changes: 1 addition & 1 deletion REUSE.toml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ SPDX-FileCopyrightText = "2026 Nextcloud GmbH and Nextcloud contributors"
SPDX-License-Identifier = "AGPL-3.0-or-later"

[[annotations]]
path = ["img/app-dark.svg", "img/app.svg", "img/screenshot1.jpg", "img/screenshot2.jpg", "img/screenshot3.jpg", "img/sound-border.svg", "img/mention.svg"]
path = ["img/app-dark.svg", "img/app.svg", "img/screenshot1.jpg", "img/screenshot2.jpg", "img/screenshot3.jpg"]
precedence = "aggregate"
SPDX-FileCopyrightText = "2026 Nextcloud GmbH and Nextcloud contributors"
SPDX-License-Identifier = "AGPL-3.0-or-later"
10 changes: 6 additions & 4 deletions appinfo/info.xml
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,14 @@ SPDX-License-Identifier: AGPL-3.0-or-later
<author>Julien Veyssier</author>
<namespace>Matrix</namespace>
<documentation>
<developer>https://github.com/julien-nc/integration_matrix</developer>
<developer>https://github.com/nextcloud/integration_matrix</developer>
</documentation>
<category>integration</category>
<website>https://github.com/julien-nc/integration_matrix</website>
<bugs>https://github.com/julien-nc/integration_matrix/issues</bugs>
<screenshot>https://raw.githubusercontent.com/julien-nc/integration_matrix/main/img/screenshot1.jpg</screenshot>
<website>https://github.com/nextcloud/integration_matrix</website>
<bugs>https://github.com/nextcloud/integration_matrix/issues</bugs>
<screenshot>https://raw.githubusercontent.com/nextcloud/integration_matrix/main/img/screenshot1.jpg</screenshot>
<screenshot>https://raw.githubusercontent.com/nextcloud/integration_matrix/main/img/screenshot2.jpg</screenshot>
<screenshot>https://raw.githubusercontent.com/nextcloud/integration_matrix/main/img/screenshot3.jpg</screenshot>
<dependencies>
<nextcloud min-version="33" max-version="34"/>
</dependencies>
Expand Down
6 changes: 0 additions & 6 deletions img/mention.svg

This file was deleted.

Binary file modified img/screenshot1.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified img/screenshot2.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified img/screenshot3.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
13 changes: 0 additions & 13 deletions img/sound-border.svg

This file was deleted.

6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,17 +17,17 @@
},
"repository": {
"type": "git",
"url": "https://github.com/julien-nc/integration_matrix"
"url": "https://github.com/nextcloud/integration_matrix"
},
"keywords": [
"matrix"
],
"author": "Julien Veyssier",
"license": "AGPL-3.0",
"bugs": {
"url": "https://github.com/julien-nc/integration_matrix/issues"
"url": "https://github.com/nextcloud/integration_matrix/issues"
},
"homepage": "https://github.com/julien-nc/integration_matrix",
"homepage": "https://github.com/nextcloud/integration_matrix",
"browserslist": [
"extends @nextcloud/browserslist-config"
],
Expand Down
9 changes: 2 additions & 7 deletions src/components/RadioElementSet.vue
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,9 @@ SPDX-License-Identifier: AGPL-3.0-or-later
:border-radius="borderRadius"
@update:checked="onUpdateValue">
<template #icon>
<slot name="icon" :option="option">
<component :is="option.icon"
v-if="option.icon" />
</slot>
<slot name="icon" :option="option" />
</template>
<slot name="label" :option="option">
{{ option.label }}
</slot>
<slot name="label" :option="option" />
</RadioElement>
</span>
</template>
Expand Down
12 changes: 10 additions & 2 deletions src/components/SendFilesModal.vue
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ SPDX-License-Identifier: AGPL-3.0-or-later
<MatrixIcon />
<span>
{{ sendType === SEND_TYPE.file.id
? n('integration_matrix', 'Send file to Matrix room', 'Send files to Matrix room', files.length)
: n('integration_matrix', 'Send link to Matrix room', 'Send links to Matrix room', files.length)
? n('integration_matrix', 'Send file to a Matrix room', 'Send files to a Matrix room', files.length)
: n('integration_matrix', 'Send link to a Matrix room', 'Send links to a Matrix room', files.length)
}}
</span>
</h2>
Expand Down Expand Up @@ -93,6 +93,9 @@ SPDX-License-Identifier: AGPL-3.0-or-later
:size="24"
:url="option.avatar_url"
:display-name="option.info.type === 'room' ? 'R' : 'U'" />
<NcAvatar v-else
:size="24"
:display-name="option.info.type === 'room' ? 'R' : 'U'" />
<span
class="multiselect-name">
{{ option.info.name }}
Expand Down Expand Up @@ -130,6 +133,10 @@ SPDX-License-Identifier: AGPL-3.0-or-later
class="radios"
@update:value="selectedPermission = $event">
<template #icon="{option}">
<component :is="option.icon"
v-if="option.icon" />
</template>
<template #label="{option}">
{{ option.label }}
</template>
</RadioElementSet>
Expand Down Expand Up @@ -471,6 +478,7 @@ export default {
}

.modal-title {
margin-top: 0;
display: flex;
justify-content: center;
span {
Expand Down
Loading