diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml new file mode 100644 index 0000000..674a67d --- /dev/null +++ b/.github/workflows/stale.yml @@ -0,0 +1,17 @@ +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/Containerfile.fedora b/Containerfile.fedora index 279d43f..21b905f 100644 --- a/Containerfile.fedora +++ b/Containerfile.fedora @@ -1,6 +1,6 @@ FROM fedora:latest -RUN dnf install -y openssl openssl-devel rust cargo libsecret libsecret-devel g++ ruby-devel gcc make rpm-build libffi-devel tcl libxcrypt-compat +RUN dnf install -y openssl openssl-devel rust cargo llvm15 libsecret libsecret-devel g++ ruby-devel gcc make rpm-build libffi-devel tcl libxcrypt-compat # node setup ARG NODE_VERSION @@ -11,7 +11,7 @@ RUN bash n ${NODE_VERSION} RUN npm install -g n RUN npm install -g yarn RUN npm install -g node-gyp -RUN gem install --ignore-dependencies --no-user-install --no-document fpm +RUN gem install --no-user-install --no-document fpm COPY . /project WORKDIR /project diff --git a/Makefile b/Makefile index c517e5b..205cea9 100644 --- a/Makefile +++ b/Makefile @@ -4,6 +4,7 @@ .PHONY: container-build-debian container-build-fedora .PHONY: container-web-release container-debian-release container-rpm-release container-appimage-release .PHONY: clean undo_setup fixup +.PHONY: fix_yarn_cache CFGDIR ?= configs/sc @@ -182,6 +183,9 @@ bom.lock: element-desktop/yarn.lock element-web/yarn.lock matrix-js-sdk/yarn.loc ./build-bom.sh bom: bom.lock +fix_yarn_cache: + $(YARN) cache list || $(YARN) cache clean + clean: $(YARN) --cwd matrix-js-sdk clean $(YARN) --cwd matrix-react-sdk clean @@ -195,7 +199,7 @@ clean: undo_setup: rm -rf element-desktop/node_modules element-web/node_modules matrix-react-sdk/node_modules matrix-js-sdk/node_modules i18n-helper/node_modules element-desktop/.hak -fixup: undo_setup +fixup: undo_setup fix_yarn_cache make setup make clean make setup diff --git a/configs/sc/config.json b/configs/sc/config.json index 4af6da3..0402a78 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" ], - "showLabsSettings": true, - "roomDirectory": { + "show_labs_settings": true, + "room_directory": { "servers": [ "matrix.org", "gitter.im", diff --git a/element-desktop b/element-desktop index dfc6afa..ca3c38e 160000 --- a/element-desktop +++ b/element-desktop @@ -1 +1 @@ -Subproject commit dfc6afa8d8d8e100010d67a3aa328e99ec9813de +Subproject commit ca3c38e98d79a852098df85612fb0c21989d88ca diff --git a/element-web b/element-web index 91850ae..d8643e4 160000 --- a/element-web +++ b/element-web @@ -1 +1 @@ -Subproject commit 91850ae97a951c4c011d9767203b839a274c2b55 +Subproject commit d8643e4983b11a87831af1729037976d14641454 diff --git a/hard_reset_repos.sh b/hard_reset_repos.sh new file mode 100755 index 0000000..4e17e2a --- /dev/null +++ b/hard_reset_repos.sh @@ -0,0 +1,15 @@ +#!/bin/bash + +set -e + +mydir="$(dirname "$(realpath "$0")")" + +cd "$mydir" + +source ./merge_helpers.sh + +# Note: this doesn't delete files starting with a dot, +# and in particular not the '.git' directory, which we +# want to keep +forall_repos bash -c 'rm -rf *' +forall_repos git reset HEAD --hard diff --git a/i18n-helper/index.js b/i18n-helper/index.js index f226e47..11e3fc4 100644 --- a/i18n-helper/index.js +++ b/i18n-helper/index.js @@ -35,7 +35,13 @@ function writeStrings(p, strings) { let strings = readStrings(p); for (const key of Object.keys(strings)) { - strings[key] = strings[key].replace(/Element/g, "SchildiChat").replace(/element\.io/g, "schildi.chat"); + strings[key] = strings[key] + .replace(/Element/g, "SchildiChat") + .replace(/element\.io/g, "schildi.chat") + + // It's still Element Call + .replace(/SchildiChat Call/g, "Element Call") + .replace(/SchildiChat-Call/g, "Element-Call"); } if (overlayPath) { diff --git a/i18n-overlays/element-desktop/hu.json b/i18n-overlays/element-desktop/hu.json index 0967ef4..8598663 100644 --- a/i18n-overlays/element-desktop/hu.json +++ b/i18n-overlays/element-desktop/hu.json @@ -1 +1,3 @@ -{} +{ + "Show": "Mutat" +} diff --git a/i18n-overlays/matrix-react-sdk/cs.json b/i18n-overlays/matrix-react-sdk/cs.json index 861e944..c07e3a1 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 domovském zobrazení.", - "Show all rooms in Home": "Ukázat všechny místnosti v domovském zobrazení", + "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", "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/en_EN.json b/i18n-overlays/matrix-react-sdk/en_EN.json index 7732df7..2c59706 100644 --- a/i18n-overlays/matrix-react-sdk/en_EN.json +++ b/i18n-overlays/matrix-react-sdk/en_EN.json @@ -49,5 +49,6 @@ "Mixed": "Mixed", "Sound pack": "Sound pack", "Schildi: Softer sounds for reduced anxiety": "Schildi: Softer sounds for reduced anxiety", - "Classic: The same sharp sounds as Element": "Classic: The same sharp sounds as Element" + "Classic: The same sharp sounds as Element": "Classic: The same sharp sounds as Element", + "React with \"%(reaction)s\"": "React with \"%(reaction)s\"" } diff --git a/i18n-overlays/matrix-react-sdk/it.json b/i18n-overlays/matrix-react-sdk/it.json index 72a5b3a..187e9c4 100644 --- a/i18n-overlays/matrix-react-sdk/it.json +++ b/i18n-overlays/matrix-react-sdk/it.json @@ -9,5 +9,26 @@ "Light theme": "Tema chiaro", "Dark theme": "Tema scuro", "Normal priority": "Priorità normale", - "Do you want to join a room notifying you about new releases? This is especially useful if your platform doesn't support automatic updates for SchildiChat (e.g. Windows and macOS).": "Vuoi entrare in una stanza che ti notificherà riguardo nuove release? Sarebbe comodo particolarmente se la tua piattaforma non supporta aggiornamenti automatici (Come per esempio Windows o MacOS.)" + "Do you want to join a room notifying you about new releases? This is especially useful if your platform doesn't support automatic updates for SchildiChat (e.g. Windows and macOS).": "Vuoi entrare in una stanza che ti notificherà riguardo nuove release? Sarebbe comodo particolarmente se la tua piattaforma non supporta aggiornamenti automatici (Come per esempio Windows o MacOS.)", + "Show message bubbles on one side only": "Visualizza bolle messaggi su un lato solo", + "Show message bubbles depending on the width either on both sides or only on one side": "Visualizza bolle messaggi in base alla lunghezza di entrambi i lati o di uno solo", + "User name color mode": "Modalità colore nome utente", + "Room list style": "Stile lista stanze", + "Theme": "Tema", + "Show all rooms in Home": "Visualizza tutte le stanze nella Home", + "All rooms you're in will appear in Home.": "Tutte le stanze in cui partecipi appariranno nella Home.", + "For people": "Per le persone", + "Room list": "Lista stanze", + "Show advanced theme settings": "Visualizza impostazioni avanzate tema", + "Mark rooms as unread": "Permetti di segnare le chat come non lette", + "Message bubbles": "Bolle messaggi", + "Message layout": "Impaginazione messaggi", + "Mark as unread": "Segna come non letto", + "Uniform": "Uniforme", + "Show people in spaces": "Visualizza persone negli spazi", + "MXID": "MXID", + "In public rooms": "Nelle stanze pubbliche", + "In group chats": "Nelle chat di gruppo", + "Font size and typeface": "Dimensione e tipo carattere", + "Hide advanced theme settings": "Nascondi impostazioni avanzate tema" } diff --git a/i18n-overlays/matrix-react-sdk/pt_BR.json b/i18n-overlays/matrix-react-sdk/pt_BR.json index 5bac536..1b4c8af 100644 --- a/i18n-overlays/matrix-react-sdk/pt_BR.json +++ b/i18n-overlays/matrix-react-sdk/pt_BR.json @@ -40,5 +40,6 @@ "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" + "Mark as read": "Markar como lido", + "Collapse additional buttons": "Recolher botões adicionais" } diff --git a/matrix-js-sdk b/matrix-js-sdk index 789e2bf..af4413b 160000 --- a/matrix-js-sdk +++ b/matrix-js-sdk @@ -1 +1 @@ -Subproject commit 789e2bf3f3b6abd0877e50df29802b1382a8399f +Subproject commit af4413b7a681d5f590b7674d87b3a103086705d1 diff --git a/matrix-react-sdk b/matrix-react-sdk index 2d34475..21ecba2 160000 --- a/matrix-react-sdk +++ b/matrix-react-sdk @@ -1 +1 @@ -Subproject commit 2d34475d29e074c6f35623f2882c09c95b31dd70 +Subproject commit 21ecba234658a89d22eccb33429d3770b7a28341