forked from github/schildichat-desktop
Compare commits
21 commits
v1.11.15-s
...
v1.11.29-s
Author | SHA1 | Date | |
---|---|---|---|
![]() |
1e0e3b718c | ||
![]() |
219c0e3cf7 | ||
![]() |
0ecdbb1bb8 | ||
![]() |
c5042532eb | ||
![]() |
b3516d1621 | ||
![]() |
788816299c | ||
![]() |
2e3d370c38 | ||
![]() |
d977e5c753 | ||
![]() |
0ef609f57b | ||
![]() |
2066ef2623 | ||
![]() |
b0177a4276 | ||
![]() |
87e7893d07 | ||
![]() |
ae4eb4c3da | ||
![]() |
32f58e1c3f | ||
![]() |
db908634ea | ||
![]() |
965a3b2d0e | ||
![]() |
775fb00b75 | ||
![]() |
9d4602fea6 | ||
![]() |
eb17c2ad94 | ||
![]() |
a4ab5f55c9 | ||
![]() |
fc27cbfd74 |
15 changed files with 135 additions and 12 deletions
1
.containerignore
Normal file
1
.containerignore
Normal file
|
@ -0,0 +1 @@
|
||||||
|
release/
|
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'
|
30
Containerfile.debian
Normal file
30
Containerfile.debian
Normal file
|
@ -0,0 +1,30 @@
|
||||||
|
ARG NODE_VERSION
|
||||||
|
FROM node:${NODE_VERSION}
|
||||||
|
|
||||||
|
RUN apt-get -qq update && apt-get -qq install --no-install-recommends -y \
|
||||||
|
curl \
|
||||||
|
g++ \
|
||||||
|
gcc \
|
||||||
|
git \
|
||||||
|
jq \
|
||||||
|
libarchive-tools \
|
||||||
|
libsecret-1-dev \
|
||||||
|
libsqlcipher-dev \
|
||||||
|
libssl-dev \
|
||||||
|
make \
|
||||||
|
openssl \
|
||||||
|
pkg-config \
|
||||||
|
python \
|
||||||
|
tcl \
|
||||||
|
vim
|
||||||
|
|
||||||
|
ENV RUSTUP_HOME=/usr/local/rustup \
|
||||||
|
CARGO_HOME=/usr/local/cargo \
|
||||||
|
PATH=/usr/local/cargo/bin:$PATH
|
||||||
|
RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --no-modify-path --profile minimal
|
||||||
|
|
||||||
|
COPY . /project
|
||||||
|
WORKDIR /project
|
||||||
|
|
||||||
|
# There might be remnants of the host which break the build
|
||||||
|
RUN make fixup
|
20
Containerfile.fedora
Normal file
20
Containerfile.fedora
Normal file
|
@ -0,0 +1,20 @@
|
||||||
|
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
|
||||||
|
|
||||||
|
# node setup
|
||||||
|
ARG NODE_VERSION
|
||||||
|
RUN mkdir -p /usr/local/n
|
||||||
|
RUN mkdir -p /usr/local/bin /usr/local/lib /usr/local/include /usr/local/share
|
||||||
|
RUN curl -L https://raw.githubusercontent.com/tj/n/master/bin/n -o n
|
||||||
|
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
|
||||||
|
|
||||||
|
COPY . /project
|
||||||
|
WORKDIR /project
|
||||||
|
|
||||||
|
# There might be remnants of the host which break the build
|
||||||
|
RUN make fixup
|
25
Makefile
25
Makefile
|
@ -1,6 +1,8 @@
|
||||||
.PHONY: all setup regenerate-i18n web desktop-common linux debian rpm pacman local-pkgbuild local-pkgbuild-install windows windows-portable
|
.PHONY: all setup regenerate-i18n web desktop-common linux debian rpm pacman local-pkgbuild local-pkgbuild-install windows windows-portable
|
||||||
.PHONY: web-release debian-release rpm-release pacman-release windows-setup-release windows-unpacked-release windows-portable-release windows-release
|
.PHONY: web-release debian-release rpm-release pacman-release windows-setup-release windows-unpacked-release windows-portable-release windows-release
|
||||||
.PHONY: macos-common macos macos-mas macos-release macos-mas-release icns
|
.PHONY: macos-common macos macos-mas macos-release macos-mas-release icns
|
||||||
|
.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: clean undo_setup fixup
|
||||||
|
|
||||||
CFGDIR ?= configs/sc
|
CFGDIR ?= configs/sc
|
||||||
|
@ -8,6 +10,8 @@ CFGDIR ?= configs/sc
|
||||||
all: web
|
all: web
|
||||||
|
|
||||||
YARN ?= yarnpkg
|
YARN ?= yarnpkg
|
||||||
|
CONTAINER_ENGINE ?= podman
|
||||||
|
NODE_VERSION ?= 16
|
||||||
|
|
||||||
VERSION := $(shell grep version element-desktop/package.json | sed 's|.*: \"\(.*\)\",|\1|')
|
VERSION := $(shell grep version element-desktop/package.json | sed 's|.*: \"\(.*\)\",|\1|')
|
||||||
WEB_APP_NAME := $(shell grep '"name"' element-web/package.json | head -n 1 | sed 's|.*: \"\(.*\)\",|\1|')
|
WEB_APP_NAME := $(shell grep '"name"' element-web/package.json | head -n 1 | sed 's|.*: \"\(.*\)\",|\1|')
|
||||||
|
@ -32,6 +36,9 @@ OUT_WIN64_PORTABLE_BETTER_NAME := $(PRODUCT_NAME)_win-portable_v$(VERSION)
|
||||||
OUT_MACOS := $(DESKTOP_OUT)/$(PRODUCT_NAME)-$(VERSION)-universal.dmg
|
OUT_MACOS := $(DESKTOP_OUT)/$(PRODUCT_NAME)-$(VERSION)-universal.dmg
|
||||||
OUT_MACOS_MAS := $(DESKTOP_OUT)/mas-universal/$(PRODUCT_NAME).app
|
OUT_MACOS_MAS := $(DESKTOP_OUT)/mas-universal/$(PRODUCT_NAME).app
|
||||||
|
|
||||||
|
CONTAINER_IMAGE_DEBIAN := schildichat-desktop-containerbuild-debian
|
||||||
|
CONTAINER_IMAGE_FEDORA := schildichat-desktop-containerbuild-fedora
|
||||||
|
|
||||||
RELEASE_DIR := release
|
RELEASE_DIR := release
|
||||||
CURRENT_RELEASE_DIR := $(RELEASE_DIR)/$(VERSION)
|
CURRENT_RELEASE_DIR := $(RELEASE_DIR)/$(VERSION)
|
||||||
|
|
||||||
|
@ -153,6 +160,24 @@ macos-mas-release: macos-mas
|
||||||
mkdir -p $(CURRENT_RELEASE_DIR)
|
mkdir -p $(CURRENT_RELEASE_DIR)
|
||||||
cp $(OUT_MACOS_MAS) $(CURRENT_RELEASE_DIR)
|
cp $(OUT_MACOS_MAS) $(CURRENT_RELEASE_DIR)
|
||||||
|
|
||||||
|
container-build-debian:
|
||||||
|
$(CONTAINER_ENGINE) build -t $(CONTAINER_IMAGE_DEBIAN) -f Containerfile.debian --build-arg NODE_VERSION=$(NODE_VERSION) .
|
||||||
|
|
||||||
|
container-build-fedora:
|
||||||
|
$(CONTAINER_ENGINE) build -t $(CONTAINER_IMAGE_FEDORA) -f Containerfile.fedora --build-arg NODE_VERSION=$(NODE_VERSION) .
|
||||||
|
|
||||||
|
container-web-release: container-build-debian
|
||||||
|
$(CONTAINER_ENGINE) run --rm -ti -v $(PWD)/release:/project/release --security-opt label=disable $(CONTAINER_IMAGE_DEBIAN):latest make web-release
|
||||||
|
|
||||||
|
container-debian-release: container-build-debian
|
||||||
|
$(CONTAINER_ENGINE) run --rm -ti -v $(PWD)/release:/project/release --security-opt label=disable $(CONTAINER_IMAGE_DEBIAN):latest make debian-release
|
||||||
|
|
||||||
|
container-rpm-release: container-build-fedora
|
||||||
|
$(CONTAINER_ENGINE) run --rm -ti -v $(PWD)/release:/project/release --security-opt label=disable $(CONTAINER_IMAGE_FEDORA):latest make rpm-release
|
||||||
|
|
||||||
|
container-appimage-release: container-build-debian
|
||||||
|
$(CONTAINER_ENGINE) run --rm -ti -v $(PWD)/release:/project/release --security-opt label=disable $(CONTAINER_IMAGE_DEBIAN):latest make appimage-release
|
||||||
|
|
||||||
bom.lock: element-desktop/yarn.lock element-web/yarn.lock matrix-js-sdk/yarn.lock matrix-react-sdk/yarn.lock
|
bom.lock: element-desktop/yarn.lock element-web/yarn.lock matrix-js-sdk/yarn.lock matrix-react-sdk/yarn.lock
|
||||||
./build-bom.sh
|
./build-bom.sh
|
||||||
bom: bom.lock
|
bom: bom.lock
|
||||||
|
|
|
@ -16,8 +16,8 @@
|
||||||
"https://scalar-staging.vector.im/api",
|
"https://scalar-staging.vector.im/api",
|
||||||
"https://scalar-staging.riot.im/scalar/api"
|
"https://scalar-staging.riot.im/scalar/api"
|
||||||
],
|
],
|
||||||
"showLabsSettings": true,
|
"show_labs_settings": true,
|
||||||
"roomDirectory": {
|
"room_directory": {
|
||||||
"servers": [
|
"servers": [
|
||||||
"matrix.org",
|
"matrix.org",
|
||||||
"gitter.im",
|
"gitter.im",
|
||||||
|
|
|
@ -1 +1 @@
|
||||||
Subproject commit dd74e3628176f0ad39097325e5603fec51408a83
|
Subproject commit 46a18d2dfd420cc1f654fbb218ed97d64a22b8f4
|
|
@ -1 +1 @@
|
||||||
Subproject commit fcf043c9989b995aee64322ac5e7ff3997da535d
|
Subproject commit a21fcb8fbf4bf1026c0cbcc813af9ea618e62743
|
|
@ -35,7 +35,13 @@ function writeStrings(p, strings) {
|
||||||
let strings = readStrings(p);
|
let strings = readStrings(p);
|
||||||
|
|
||||||
for (const key of Object.keys(strings)) {
|
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) {
|
if (overlayPath) {
|
||||||
|
|
|
@ -1 +1,3 @@
|
||||||
{}
|
{
|
||||||
|
"Show": "Mutat"
|
||||||
|
}
|
||||||
|
|
|
@ -21,8 +21,8 @@
|
||||||
"MXID": "MXID",
|
"MXID": "MXID",
|
||||||
"In group chats": "Ve skupinových chatech",
|
"In group chats": "Ve skupinových chatech",
|
||||||
"In public rooms": "Ve veřejných místnostech",
|
"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í.",
|
"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": "Ukázat všechny místnosti v domovském zobrazení",
|
"Show all rooms in Home": "Zobrazit všechny místnosti v Úvodu",
|
||||||
"Show people in spaces": "Ukázat lidi v prostorech",
|
"Show people in spaces": "Ukázat lidi v prostorech",
|
||||||
"Show notification badges for People in Spaces": "Zobrazit odznaky oznámení pro Lidé 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",
|
"Return to the room previously opened in a space": "Návrat do dříve otevřené místnosti v prostoru",
|
||||||
|
|
|
@ -9,5 +9,26 @@
|
||||||
"Light theme": "Tema chiaro",
|
"Light theme": "Tema chiaro",
|
||||||
"Dark theme": "Tema scuro",
|
"Dark theme": "Tema scuro",
|
||||||
"Normal priority": "Priorità normale",
|
"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",
|
"Room list style": "Estilo da lista de salas",
|
||||||
"Mark rooms as unread": "Permitir markar conversas como não lidos",
|
"Mark rooms as unread": "Permitir markar conversas como não lidos",
|
||||||
"Mark as unread": "Markar como não lido",
|
"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"
|
||||||
}
|
}
|
||||||
|
|
|
@ -1 +1 @@
|
||||||
Subproject commit 6128de1bafde5b2112f2fe6dd2101e822d2c0636
|
Subproject commit af4413b7a681d5f590b7674d87b3a103086705d1
|
|
@ -1 +1 @@
|
||||||
Subproject commit 0ad473a26dae2d37138e46024462b599ae67285e
|
Subproject commit 1d04bb0f28a0581a6ea93aa21cdac25843c9bb4d
|
Loading…
Add table
Add a link
Reference in a new issue