diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml deleted file mode 100644 index 674a67d..0000000 --- a/.github/workflows/stale.yml +++ /dev/null @@ -1,17 +0,0 @@ -name: 'Close stale issues' -on: - schedule: - - cron: '30 1 * * *' - -jobs: - stale: - runs-on: ubuntu-latest - steps: - - uses: actions/stale@v6 - with: - stale-issue-message: 'This issue is stale because it has been open 150 days with no activity. Remove stale label or comment or this will be closed in 14 days.' - days-before-issue-stale: 150 - days-before-issue-close: 14 - days-before-pr-stale: -1 - days-before-pr-close: -1 - exempt-issue-labels: 'longterm,enhancement,parity-with-android,prio:medium,prio:high,electron issue,encrypted room search,build infrastructure' diff --git a/configs/sc/config.json b/configs/sc/config.json index 0402a78..4af6da3 100644 --- a/configs/sc/config.json +++ b/configs/sc/config.json @@ -16,8 +16,8 @@ "https://scalar-staging.vector.im/api", "https://scalar-staging.riot.im/scalar/api" ], - "show_labs_settings": true, - "room_directory": { + "showLabsSettings": true, + "roomDirectory": { "servers": [ "matrix.org", "gitter.im", diff --git a/element-desktop b/element-desktop index 23da578..dfc6afa 160000 --- a/element-desktop +++ b/element-desktop @@ -1 +1 @@ -Subproject commit 23da57819919e4c952c943d391261d1603036be4 +Subproject commit dfc6afa8d8d8e100010d67a3aa328e99ec9813de diff --git a/element-web b/element-web index 1f0b06d..91850ae 160000 --- a/element-web +++ b/element-web @@ -1 +1 @@ -Subproject commit 1f0b06df1402ca6b2559bccead05446b9df8a5eb +Subproject commit 91850ae97a951c4c011d9767203b839a274c2b55 diff --git a/i18n-overlays/matrix-react-sdk/cs.json b/i18n-overlays/matrix-react-sdk/cs.json index c07e3a1..861e944 100644 --- a/i18n-overlays/matrix-react-sdk/cs.json +++ b/i18n-overlays/matrix-react-sdk/cs.json @@ -21,8 +21,8 @@ "MXID": "MXID", "In group chats": "Ve skupinových chatech", "In public rooms": "Ve veřejných místnostech", - "All rooms you're in will appear in Home.": "Všechny místnosti, ve kterých se nacházíte, se zobrazí v Úvodu.", - "Show all rooms in Home": "Zobrazit všechny místnosti v Úvodu", + "All rooms you're in will appear in Home.": "Všechny místnosti, ve kterých se nacházíte, se zobrazí v domovském zobrazení.", + "Show all rooms in Home": "Ukázat všechny místnosti v domovském zobrazení", "Show people in spaces": "Ukázat lidi v prostorech", "Show notification badges for People in Spaces": "Zobrazit odznaky oznámení pro Lidé v prostorech", "Return to the room previously opened in a space": "Návrat do dříve otevřené místnosti v prostoru", diff --git a/i18n-overlays/matrix-react-sdk/pt_BR.json b/i18n-overlays/matrix-react-sdk/pt_BR.json index 1b4c8af..5bac536 100644 --- a/i18n-overlays/matrix-react-sdk/pt_BR.json +++ b/i18n-overlays/matrix-react-sdk/pt_BR.json @@ -40,6 +40,5 @@ "Room list style": "Estilo da lista de salas", "Mark rooms as unread": "Permitir markar conversas como não lidos", "Mark as unread": "Markar como não lido", - "Mark as read": "Markar como lido", - "Collapse additional buttons": "Recolher botões adicionais" + "Mark as read": "Markar como lido" } diff --git a/matrix-js-sdk b/matrix-js-sdk index 0c0854b..789e2bf 160000 --- a/matrix-js-sdk +++ b/matrix-js-sdk @@ -1 +1 @@ -Subproject commit 0c0854b86419876835d1c6930a3b0c4d9861d3e5 +Subproject commit 789e2bf3f3b6abd0877e50df29802b1382a8399f diff --git a/matrix-react-sdk b/matrix-react-sdk index 7a814df..2d34475 160000 --- a/matrix-react-sdk +++ b/matrix-react-sdk @@ -1 +1 @@ -Subproject commit 7a814df97f2afafbb1c0181e6b2996113bfbc971 +Subproject commit 2d34475d29e074c6f35623f2882c09c95b31dd70