Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nextcloud/spreed.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.github/workflows/lint-php.yml2
-rw-r--r--.github/workflows/phpunit.yml2
-rw-r--r--l10n/pt_BR.js7
-rw-r--r--l10n/pt_BR.json7
-rw-r--r--l10n/zh_HK.js2
-rw-r--r--l10n/zh_HK.json2
-rw-r--r--package-lock.json14
-rw-r--r--package.json2
-rw-r--r--src/components/MessagesList/MessagesList.vue23
9 files changed, 38 insertions, 23 deletions
diff --git a/.github/workflows/lint-php.yml b/.github/workflows/lint-php.yml
index 7be6843b7..9cfb484e9 100644
--- a/.github/workflows/lint-php.yml
+++ b/.github/workflows/lint-php.yml
@@ -17,7 +17,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
- php-versions: ["7.4", "8.0"]
+ php-versions: ["7.4", "8.0", "8.1"]
name: php-lint
diff --git a/.github/workflows/phpunit.yml b/.github/workflows/phpunit.yml
index ef52e8198..5cc6a080e 100644
--- a/.github/workflows/phpunit.yml
+++ b/.github/workflows/phpunit.yml
@@ -87,7 +87,7 @@ jobs:
# do not stop on another job's failure
fail-fast: false
matrix:
- php-versions: ['7.4', '8.0']
+ php-versions: ['7.4', '8.0', "8.1"]
databases: ['mysql']
server-versions: ['master']
diff --git a/l10n/pt_BR.js b/l10n/pt_BR.js
index d18acae81..248b7d704 100644
--- a/l10n/pt_BR.js
+++ b/l10n/pt_BR.js
@@ -207,6 +207,11 @@ OC.L10N.register(
"A deleted user replied to your message in conversation {call}" : "Um usuário removido respondeu à sua mensagem na conversa {call}",
"{guest} (guest) replied to your message in conversation {call}" : "{guest} (guest) respondeu sua mensagem na conversa {call}",
"A guest replied to your message in conversation {call}" : "Um convidado respondeu à sua mensagem na conversa {call}",
+ "{user} reacted with {reaction} to your private message" : "{user} reagiu com {reaction} à sua mensagem privada",
+ "{user} reacted with {reaction} to your message in conversation {call}" : "{user} reagiu com {reaction} à sua mensagem na conversa {call}",
+ "A deleted user reacted with {reaction} to your message in conversation {call}" : "Um usuário excluído reagiu com {reaction} à sua mensagem na conversa {call}",
+ "{guest} (guest) reacted with {reaction} to your message in conversation {call}" : "{guest} (guest) reagiu com {reaction} à sua mensagem na conversa {call}",
+ "A guest reacted with {reaction} to your message in conversation {call}" : "Um convidado reagiu com {reaction} à sua mensagem na conversa {call}",
"{user} mentioned you in a private conversation" : "{user} mencionou você em uma conversa privada",
"{user} mentioned you in conversation {call}" : "{user} citou você na conversa {call}",
"A deleted user mentioned you in conversation {call}" : "Um usuário excluído citou você na conversa {call}",
@@ -616,6 +621,8 @@ OC.L10N.register(
"OK: Running version: {version}" : "OK: Versão rodando: {version}",
"Error: Cannot connect to server" : "Erro: Não foi possível conectar ao servidor",
"Error: Server did not respond with proper JSON" : "Erro: Servidor não respondeu com o JSON apropriado",
+ "Could not get version" : "Não foi possível obter a versão",
+ "Error: Running version: {version}; Server needs to be updated to be compatible with this version of Talk" : "Erro: Versão em execução: {version}; O servidor precisa ser atualizado para ser compatível com esta versão do Talk",
"Error: Server responded with: {error}" : "Erro: Servidor respondeu com: {error}",
"Error: Unknown error occurred" : "Erro: Ocorreu um erro desconhecido",
"High-performance backend" : "Infra-estrutura de alto desempenho",
diff --git a/l10n/pt_BR.json b/l10n/pt_BR.json
index f2bfccc37..eda94ab66 100644
--- a/l10n/pt_BR.json
+++ b/l10n/pt_BR.json
@@ -205,6 +205,11 @@
"A deleted user replied to your message in conversation {call}" : "Um usuário removido respondeu à sua mensagem na conversa {call}",
"{guest} (guest) replied to your message in conversation {call}" : "{guest} (guest) respondeu sua mensagem na conversa {call}",
"A guest replied to your message in conversation {call}" : "Um convidado respondeu à sua mensagem na conversa {call}",
+ "{user} reacted with {reaction} to your private message" : "{user} reagiu com {reaction} à sua mensagem privada",
+ "{user} reacted with {reaction} to your message in conversation {call}" : "{user} reagiu com {reaction} à sua mensagem na conversa {call}",
+ "A deleted user reacted with {reaction} to your message in conversation {call}" : "Um usuário excluído reagiu com {reaction} à sua mensagem na conversa {call}",
+ "{guest} (guest) reacted with {reaction} to your message in conversation {call}" : "{guest} (guest) reagiu com {reaction} à sua mensagem na conversa {call}",
+ "A guest reacted with {reaction} to your message in conversation {call}" : "Um convidado reagiu com {reaction} à sua mensagem na conversa {call}",
"{user} mentioned you in a private conversation" : "{user} mencionou você em uma conversa privada",
"{user} mentioned you in conversation {call}" : "{user} citou você na conversa {call}",
"A deleted user mentioned you in conversation {call}" : "Um usuário excluído citou você na conversa {call}",
@@ -614,6 +619,8 @@
"OK: Running version: {version}" : "OK: Versão rodando: {version}",
"Error: Cannot connect to server" : "Erro: Não foi possível conectar ao servidor",
"Error: Server did not respond with proper JSON" : "Erro: Servidor não respondeu com o JSON apropriado",
+ "Could not get version" : "Não foi possível obter a versão",
+ "Error: Running version: {version}; Server needs to be updated to be compatible with this version of Talk" : "Erro: Versão em execução: {version}; O servidor precisa ser atualizado para ser compatível com esta versão do Talk",
"Error: Server responded with: {error}" : "Erro: Servidor respondeu com: {error}",
"Error: Unknown error occurred" : "Erro: Ocorreu um erro desconhecido",
"High-performance backend" : "Infra-estrutura de alto desempenho",
diff --git a/l10n/zh_HK.js b/l10n/zh_HK.js
index c24c1d4aa..cae3ff2a6 100644
--- a/l10n/zh_HK.js
+++ b/l10n/zh_HK.js
@@ -1115,6 +1115,8 @@ OC.L10N.register(
"Error while uploading file \"{fileName}\"" : "上傳檔案時發生錯誤 \"{fileName}\"",
"An error happened when trying to share your file" : "分享檔案時發生錯誤",
"Could not post message: {errorMessage}" : "無法發佈訊息：{errorMessage}",
+ "Failed to add reaction" : "添加反應失敗",
+ "Failed to remove reaction" : "移除反應失敗",
"Failed to join the conversation. Try to reload the page." : "無法加入對話。嘗試重新加載頁面。",
"You are trying to join a conversation while having an active session in another window or device. This is currently not supported by Nextcloud Talk. What do you want to do?" : "您正在嘗試加入對話，而在另一個窗口或裝置中擁有活動會話。Nextcloud Talk 當前不支持此功能。你想做什麼？",
"Join here" : "在這裡加入",
diff --git a/l10n/zh_HK.json b/l10n/zh_HK.json
index 0ea07ecb4..01fe94205 100644
--- a/l10n/zh_HK.json
+++ b/l10n/zh_HK.json
@@ -1113,6 +1113,8 @@
"Error while uploading file \"{fileName}\"" : "上傳檔案時發生錯誤 \"{fileName}\"",
"An error happened when trying to share your file" : "分享檔案時發生錯誤",
"Could not post message: {errorMessage}" : "無法發佈訊息：{errorMessage}",
+ "Failed to add reaction" : "添加反應失敗",
+ "Failed to remove reaction" : "移除反應失敗",
"Failed to join the conversation. Try to reload the page." : "無法加入對話。嘗試重新加載頁面。",
"You are trying to join a conversation while having an active session in another window or device. This is currently not supported by Nextcloud Talk. What do you want to do?" : "您正在嘗試加入對話，而在另一個窗口或裝置中擁有活動會話。Nextcloud Talk 當前不支持此功能。你想做什麼？",
"Join here" : "在這裡加入",
diff --git a/package-lock.json b/package-lock.json
index 79d4495c8..8b3ac7dbb 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -21,7 +21,7 @@
"@nextcloud/moment": "^1.2.0",
"@nextcloud/paths": "^2.1.0",
"@nextcloud/router": "^2.0.0",
- "@nextcloud/vue": "^5.2.1",
+ "@nextcloud/vue": "^5.3.0",
"@nextcloud/vue-dashboard": "^2.0.1",
"attachmediastream": "^2.1.0",
"color.js": "^1.2.0",
@@ -2795,9 +2795,9 @@
}
},
"node_modules/@nextcloud/vue": {
- "version": "5.2.1",
- "resolved": "https://registry.npmjs.org/@nextcloud/vue/-/vue-5.2.1.tgz",
- "integrity": "sha512-TAvVVa3Aab7XFgolS49KqWTRjziB7OsIInA8YPTXeE18MwhkdssxpnfsbIXHNrqu/Vg/P3OLVewqINMFeCqOjg==",
+ "version": "5.3.0",
+ "resolved": "https://registry.npmjs.org/@nextcloud/vue/-/vue-5.3.0.tgz",
+ "integrity": "sha512-yRxEeQIgNHafvD2MC//BQXCkyyXiNQQZUGErlwOuuKpZbTX2BYTdvrN15On7rTqJNzwmwuzXAIPIFc0D8c2h+g==",
"dependencies": {
"@nextcloud/auth": "^1.2.3",
"@nextcloud/axios": "^1.3.2",
@@ -26568,9 +26568,9 @@
}
},
"@nextcloud/vue": {
- "version": "5.2.1",
- "resolved": "https://registry.npmjs.org/@nextcloud/vue/-/vue-5.2.1.tgz",
- "integrity": "sha512-TAvVVa3Aab7XFgolS49KqWTRjziB7OsIInA8YPTXeE18MwhkdssxpnfsbIXHNrqu/Vg/P3OLVewqINMFeCqOjg==",
+ "version": "5.3.0",
+ "resolved": "https://registry.npmjs.org/@nextcloud/vue/-/vue-5.3.0.tgz",
+ "integrity": "sha512-yRxEeQIgNHafvD2MC//BQXCkyyXiNQQZUGErlwOuuKpZbTX2BYTdvrN15On7rTqJNzwmwuzXAIPIFc0D8c2h+g==",
"requires": {
"@nextcloud/auth": "^1.2.3",
"@nextcloud/axios": "^1.3.2",
diff --git a/package.json b/package.json
index 641088559..e288cbe15 100644
--- a/package.json
+++ b/package.json
@@ -29,7 +29,7 @@
"@nextcloud/moment": "^1.2.0",
"@nextcloud/paths": "^2.1.0",
"@nextcloud/router": "^2.0.0",
- "@nextcloud/vue": "^5.2.1",
+ "@nextcloud/vue": "^5.3.0",
"@nextcloud/vue-dashboard": "^2.0.1",
"attachmediastream": "^2.1.0",
"color.js": "^1.2.0",
diff --git a/src/components/MessagesList/MessagesList.vue b/src/components/MessagesList/MessagesList.vue
index 043a90189..b22fe61c2 100644
--- a/src/components/MessagesList/MessagesList.vue
+++ b/src/components/MessagesList/MessagesList.vue
@@ -49,14 +49,17 @@ get the messagesList array and loop through the list to generate the messages.
:count="15" />
</template>
<transition name="fade">
- <button v-show="!isChatScrolledToBottom"
+ <Button v-show="!isChatScrolledToBottom"
+ type="secondary"
:aria-label="scrollToBottomAriaLabel"
class="scroll-to-bottom"
@click="smoothScrollToBottom">
- <ChevronDown decorative
- title=""
- :size="20" />
- </button>
+ <template #icon>
+ <ChevronDown decorative
+ title=""
+ :size="20" />
+ </template>
+ </Button>
</transition>
</div>
</template>
@@ -73,6 +76,7 @@ import { EventBus } from '../../services/EventBus'
import LoadingPlaceholder from '../LoadingPlaceholder'
import ChevronDown from 'vue-material-design-icons/ChevronDown'
import uniqueId from 'lodash/uniqueId'
+import Button from '@nextcloud/vue/dist/Components/Button'
export default {
name: 'MessagesList',
@@ -80,6 +84,7 @@ export default {
LoadingPlaceholder,
MessagesGroup,
ChevronDown,
+ Button,
},
mixins: [
@@ -897,7 +902,6 @@ export default {
<style lang="scss" scoped>
@import '../../assets/variables';
-
.scroller {
flex: 1 0;
overflow-y: auto;
@@ -911,16 +915,9 @@ export default {
.scroll-to-bottom {
position: absolute;
- width: 44px;
- height: 44px;
bottom: 76px;
right: 24px;
z-index: 2;
- padding: 0;
- margin: 0;
- display: flex;
- align-items: center;
- justify-content: center;
}
</style>
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-12 21:09:33 +0300