forked from github/schildichat-desktop
Compare commits
39 Commits
v1.11.15-s
...
v1.11.35-s
Author | SHA1 | Date | |
---|---|---|---|
2597454e96 | |||
cb6f6d9901 | |||
8cf7414a85 | |||
2c9f4caa8b | |||
8a1b9ab40f | |||
143bf7af1e | |||
e68cd72772 | |||
3ac88b9132 | |||
9561c95bb6 | |||
a8be3ffcde | |||
0ba494e955 | |||
be44d4a1a6 | |||
f9ab1ef2e0 | |||
1a485faf72 | |||
64557e1da9 | |||
5122f0e870 | |||
0eb99a6a60 | |||
979be00158 | |||
10a5112285 | |||
40c598e91b | |||
1e0e3b718c | |||
219c0e3cf7 | |||
0ecdbb1bb8 | |||
c5042532eb | |||
b3516d1621 | |||
788816299c | |||
2e3d370c38 | |||
d977e5c753 | |||
0ef609f57b | |||
2066ef2623 | |||
b0177a4276 | |||
87e7893d07 | |||
ae4eb4c3da | |||
32f58e1c3f | |||
db908634ea | |||
965a3b2d0e | |||
775fb00b75 | |||
9d4602fea6 | |||
eb17c2ad94 |
17
.github/workflows/stale.yml
vendored
Normal file
17
.github/workflows/stale.yml
vendored
Normal file
@ -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'
|
@ -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 llvm libsecret libsecret-devel g++ ruby-devel gcc make rpm-build libffi-devel tcl libxcrypt-compat
|
||||
|
||||
# node setup
|
||||
ARG NODE_VERSION
|
||||
@ -11,10 +11,10 @@ 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
|
||||
|
||||
# There might be remnants of the host which break the build
|
||||
RUN make fixup
|
||||
RUN make fixup
|
||||
|
6
Makefile
6
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
|
||||
|
@ -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",
|
||||
|
Submodule element-desktop updated: d25e426c42...f00d8f6b3f
Submodule element-web updated: ebb0d6a212...8a4b06c6bc
6
flake.lock
generated
6
flake.lock
generated
@ -2,11 +2,11 @@
|
||||
"nodes": {
|
||||
"nixpkgs": {
|
||||
"locked": {
|
||||
"lastModified": 1633901457,
|
||||
"narHash": "sha256-GNJLwKENqEA4xlzkWI76VLHBAua4LUIlTeeiH4FR7Gc=",
|
||||
"lastModified": 1699380656,
|
||||
"narHash": "sha256-H9kQH3J2Z15Ady3zVQsN/tXv8qnRr+p1B0eUkR1bKfE=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "f358794824b4595d77fec93732485d329ed7b0e0",
|
||||
"rev": "03e7a22654c44489a0a70ea0e237de3e512cd8a6",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
15
hard_reset_repos.sh
Executable file
15
hard_reset_repos.sh
Executable file
@ -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
|
@ -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) {
|
||||
|
@ -1 +1,3 @@
|
||||
{}
|
||||
{
|
||||
"Show": "Mutat"
|
||||
}
|
||||
|
@ -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",
|
||||
@ -50,5 +50,6 @@
|
||||
"Mixed": "Smíšené",
|
||||
"Sound pack": "Balíček zvuků",
|
||||
"Schildi: Softer sounds for reduced anxiety": "Schildi: Jemnější zvuky pro snížení úzkosti",
|
||||
"Classic: The same sharp sounds as Element": "Klasické: Stejně ostré zvuky jako Element"
|
||||
"Classic: The same sharp sounds as Element": "Klasické: Stejně ostré zvuky jako Element",
|
||||
"React with \"%(reaction)s\"": "Reagovat pomocí \"%(reaction)s\""
|
||||
}
|
||||
|
@ -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\""
|
||||
}
|
||||
|
@ -3,5 +3,27 @@
|
||||
"Show message bubbles on one side only": "Üzenetbuborékok megjelenítése csak az egyik oldalon",
|
||||
"Message bubbles": "Üzenet buborékok",
|
||||
"Show message bubbles depending on the width either on both sides or only on one side": "Üzenetbuborékok megjelenítése a szélességtől függően mindkét oldalon vagy csak az egyik oldalon",
|
||||
"Normal priority": "Normál prioritás"
|
||||
"Normal priority": "Normál prioritás",
|
||||
"Show people and rooms in a combined list": "Személyek és szobák megjelenítése egy egyesített listában",
|
||||
"Update notifications": "Értesítések frissítése",
|
||||
"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).": "Szeretne csatlakozni olyan szobához, amely értesíti Önt az új megjelenésekről? Ez különösen akkor hasznos, ha az Ön platformja nem támogatja a SchildiChat automatikus frissítéseit (pl. Windows és macOS).",
|
||||
"System": "Rendszer",
|
||||
"Show all rooms in Home": "Az összes szoba megjelenítése a kezdőoldalon",
|
||||
"All rooms you're in will appear in Home.": "Az összes szoba, amelyben tartózkodik, megjelenik a Kezdőlapon.",
|
||||
"Mark as read": "Olvasottnak jelöl",
|
||||
"Enable YouTube embed player": "YouTube beágyazott lejátszó engedélyezése",
|
||||
"Home is useful for getting an overview of everything. Keep in mind that disabling it could leave you unable to see certain rooms.": "A Kezdőlap hasznos ahhoz, hogy mindenről áttekintést kapjunk. Ne feledje, hogy a kikapcsolásával bizonyos szobákat nem fog látni.",
|
||||
"Schildi: Softer sounds for reduced anxiety": "Schildi: Lágyabb hangok a kevesebb stresszért",
|
||||
"Sound pack": "Hangcsomag",
|
||||
"Classic: The same sharp sounds as Element": "Klasszikus: Ugyanazok az éles hangok, mint az Elementnél",
|
||||
"Don't ask again": "Ne kérdezze újra",
|
||||
"Light theme": "Világos téma",
|
||||
"Dark theme": "Sötét téma",
|
||||
"Mark as unread": "Olvasatlannak jelöl",
|
||||
"Collapse additional buttons": "További gombok összecsukása",
|
||||
"Theme": "Téma",
|
||||
"Room list": "Szobák listája",
|
||||
"Font size and typeface": "Betűméret és betűtípus",
|
||||
"Message layout": "Üzenetek elrendezése",
|
||||
"Modern": "Modern"
|
||||
}
|
||||
|
@ -49,5 +49,6 @@
|
||||
"Mixed": "Campur",
|
||||
"Sound pack": "Paket suara",
|
||||
"Schildi: Softer sounds for reduced anxiety": "Schildi: Suara lebih lembut untuk mengurangi kecemasan",
|
||||
"Classic: The same sharp sounds as Element": "Klasik: Suara keras yang biasa seperti Element"
|
||||
"Classic: The same sharp sounds as Element": "Klasik: Suara keras yang biasa seperti Element",
|
||||
"React with \"%(reaction)s\"": "Reaksi dengan \"%(reaction)s\""
|
||||
}
|
||||
|
@ -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"
|
||||
}
|
||||
|
@ -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"
|
||||
}
|
||||
|
@ -42,5 +42,13 @@
|
||||
"Mark as unread": "标记为未读",
|
||||
"Home is useful for getting an overview of everything. Keep in mind that disabling it could leave you unable to see certain rooms.": "主页对于概览所有消息来说非常有用。请注意:禁用主页可能会让您无法看到某些房间。",
|
||||
"Enable YouTube embed player": "启用 YouTube 嵌入式播放器",
|
||||
"Collapse additional buttons": "折叠额外的按钮"
|
||||
"Collapse additional buttons": "折叠额外的按钮",
|
||||
"Round": "圆角",
|
||||
"React with \"%(reaction)s\"": "与 \"%(reaction)s\" 互动",
|
||||
"Schildi: Softer sounds for reduced anxiety": "Schildi: 舒缓音效以减少焦虑",
|
||||
"Mixed": "混合",
|
||||
"Extra round": "超圆角",
|
||||
"Sound pack": "音频包",
|
||||
"Classic: The same sharp sounds as Element": "Classic: 与 Element 相同的尖锐声音",
|
||||
"Corners": "边缘"
|
||||
}
|
||||
|
Submodule matrix-js-sdk updated: 6128de1baf...5d086fe0a3
Submodule matrix-react-sdk updated: 23de404c63...3442618692
@ -23,7 +23,13 @@ automatic_i18n_reversion
|
||||
automatic_packagejson_reversion
|
||||
|
||||
# Merge upstream
|
||||
get_latest_upstream_tag
|
||||
|
||||
# Check if specific version to merge passed
|
||||
if [ -z "$1" ]; then
|
||||
get_latest_upstream_tag
|
||||
else
|
||||
latest_upstream_tag="$1"
|
||||
fi
|
||||
forelement_repos git merge "$latest_upstream_tag"
|
||||
|
||||
get_current_mxsdk_tags
|
||||
|
Reference in New Issue
Block a user