mirror of
https://github.com/SchildiChat/schildichat-desktop.git
synced 2025-06-15 23:11:54 +02:00
Compare commits
34 Commits
v1.7.14
...
v1.7.29-sc
Author | SHA1 | Date | |
---|---|---|---|
f2ef0465a9 | |||
8cb68add15 | |||
303041011a | |||
27949ef626 | |||
f980cef006 | |||
c18cc22db7 | |||
ac9cf5e2d6 | |||
8424d864e5 | |||
496d74e810 | |||
d8e3854033 | |||
8d8a5044f1 | |||
2654090ccc | |||
e31047073f | |||
1f5be68a19 | |||
e2465f6176 | |||
4efaa0782b | |||
a95770fb49 | |||
e417f25130 | |||
80e65529bb | |||
263a269da9 | |||
3d4259827d | |||
52a7dfcd82 | |||
ed9740a4c2 | |||
cdd8ec775c | |||
88ef11d716 | |||
acd5e71f6c | |||
412cbad76b | |||
dfef402e7f | |||
651ffc13df | |||
f0b142e996 | |||
9896d3718d | |||
3b93d5e2c6 | |||
d3c91d680b | |||
d0b44c9f96 |
1
.gitignore
vendored
1
.gitignore
vendored
@ -1,2 +1,3 @@
|
||||
release.mk
|
||||
/release
|
||||
/local-pkgbuild
|
||||
|
201
LICENSE
Normal file
201
LICENSE
Normal file
@ -0,0 +1,201 @@
|
||||
Apache License
|
||||
Version 2.0, January 2004
|
||||
http://www.apache.org/licenses/
|
||||
|
||||
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
|
||||
|
||||
1. Definitions.
|
||||
|
||||
"License" shall mean the terms and conditions for use, reproduction,
|
||||
and distribution as defined by Sections 1 through 9 of this document.
|
||||
|
||||
"Licensor" shall mean the copyright owner or entity authorized by
|
||||
the copyright owner that is granting the License.
|
||||
|
||||
"Legal Entity" shall mean the union of the acting entity and all
|
||||
other entities that control, are controlled by, or are under common
|
||||
control with that entity. For the purposes of this definition,
|
||||
"control" means (i) the power, direct or indirect, to cause the
|
||||
direction or management of such entity, whether by contract or
|
||||
otherwise, or (ii) ownership of fifty percent (50%) or more of the
|
||||
outstanding shares, or (iii) beneficial ownership of such entity.
|
||||
|
||||
"You" (or "Your") shall mean an individual or Legal Entity
|
||||
exercising permissions granted by this License.
|
||||
|
||||
"Source" form shall mean the preferred form for making modifications,
|
||||
including but not limited to software source code, documentation
|
||||
source, and configuration files.
|
||||
|
||||
"Object" form shall mean any form resulting from mechanical
|
||||
transformation or translation of a Source form, including but
|
||||
not limited to compiled object code, generated documentation,
|
||||
and conversions to other media types.
|
||||
|
||||
"Work" shall mean the work of authorship, whether in Source or
|
||||
Object form, made available under the License, as indicated by a
|
||||
copyright notice that is included in or attached to the work
|
||||
(an example is provided in the Appendix below).
|
||||
|
||||
"Derivative Works" shall mean any work, whether in Source or Object
|
||||
form, that is based on (or derived from) the Work and for which the
|
||||
editorial revisions, annotations, elaborations, or other modifications
|
||||
represent, as a whole, an original work of authorship. For the purposes
|
||||
of this License, Derivative Works shall not include works that remain
|
||||
separable from, or merely link (or bind by name) to the interfaces of,
|
||||
the Work and Derivative Works thereof.
|
||||
|
||||
"Contribution" shall mean any work of authorship, including
|
||||
the original version of the Work and any modifications or additions
|
||||
to that Work or Derivative Works thereof, that is intentionally
|
||||
submitted to Licensor for inclusion in the Work by the copyright owner
|
||||
or by an individual or Legal Entity authorized to submit on behalf of
|
||||
the copyright owner. For the purposes of this definition, "submitted"
|
||||
means any form of electronic, verbal, or written communication sent
|
||||
to the Licensor or its representatives, including but not limited to
|
||||
communication on electronic mailing lists, source code control systems,
|
||||
and issue tracking systems that are managed by, or on behalf of, the
|
||||
Licensor for the purpose of discussing and improving the Work, but
|
||||
excluding communication that is conspicuously marked or otherwise
|
||||
designated in writing by the copyright owner as "Not a Contribution."
|
||||
|
||||
"Contributor" shall mean Licensor and any individual or Legal Entity
|
||||
on behalf of whom a Contribution has been received by Licensor and
|
||||
subsequently incorporated within the Work.
|
||||
|
||||
2. Grant of Copyright License. Subject to the terms and conditions of
|
||||
this License, each Contributor hereby grants to You a perpetual,
|
||||
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
|
||||
copyright license to reproduce, prepare Derivative Works of,
|
||||
publicly display, publicly perform, sublicense, and distribute the
|
||||
Work and such Derivative Works in Source or Object form.
|
||||
|
||||
3. Grant of Patent License. Subject to the terms and conditions of
|
||||
this License, each Contributor hereby grants to You a perpetual,
|
||||
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
|
||||
(except as stated in this section) patent license to make, have made,
|
||||
use, offer to sell, sell, import, and otherwise transfer the Work,
|
||||
where such license applies only to those patent claims licensable
|
||||
by such Contributor that are necessarily infringed by their
|
||||
Contribution(s) alone or by combination of their Contribution(s)
|
||||
with the Work to which such Contribution(s) was submitted. If You
|
||||
institute patent litigation against any entity (including a
|
||||
cross-claim or counterclaim in a lawsuit) alleging that the Work
|
||||
or a Contribution incorporated within the Work constitutes direct
|
||||
or contributory patent infringement, then any patent licenses
|
||||
granted to You under this License for that Work shall terminate
|
||||
as of the date such litigation is filed.
|
||||
|
||||
4. Redistribution. You may reproduce and distribute copies of the
|
||||
Work or Derivative Works thereof in any medium, with or without
|
||||
modifications, and in Source or Object form, provided that You
|
||||
meet the following conditions:
|
||||
|
||||
(a) You must give any other recipients of the Work or
|
||||
Derivative Works a copy of this License; and
|
||||
|
||||
(b) You must cause any modified files to carry prominent notices
|
||||
stating that You changed the files; and
|
||||
|
||||
(c) You must retain, in the Source form of any Derivative Works
|
||||
that You distribute, all copyright, patent, trademark, and
|
||||
attribution notices from the Source form of the Work,
|
||||
excluding those notices that do not pertain to any part of
|
||||
the Derivative Works; and
|
||||
|
||||
(d) If the Work includes a "NOTICE" text file as part of its
|
||||
distribution, then any Derivative Works that You distribute must
|
||||
include a readable copy of the attribution notices contained
|
||||
within such NOTICE file, excluding those notices that do not
|
||||
pertain to any part of the Derivative Works, in at least one
|
||||
of the following places: within a NOTICE text file distributed
|
||||
as part of the Derivative Works; within the Source form or
|
||||
documentation, if provided along with the Derivative Works; or,
|
||||
within a display generated by the Derivative Works, if and
|
||||
wherever such third-party notices normally appear. The contents
|
||||
of the NOTICE file are for informational purposes only and
|
||||
do not modify the License. You may add Your own attribution
|
||||
notices within Derivative Works that You distribute, alongside
|
||||
or as an addendum to the NOTICE text from the Work, provided
|
||||
that such additional attribution notices cannot be construed
|
||||
as modifying the License.
|
||||
|
||||
You may add Your own copyright statement to Your modifications and
|
||||
may provide additional or different license terms and conditions
|
||||
for use, reproduction, or distribution of Your modifications, or
|
||||
for any such Derivative Works as a whole, provided Your use,
|
||||
reproduction, and distribution of the Work otherwise complies with
|
||||
the conditions stated in this License.
|
||||
|
||||
5. Submission of Contributions. Unless You explicitly state otherwise,
|
||||
any Contribution intentionally submitted for inclusion in the Work
|
||||
by You to the Licensor shall be under the terms and conditions of
|
||||
this License, without any additional terms or conditions.
|
||||
Notwithstanding the above, nothing herein shall supersede or modify
|
||||
the terms of any separate license agreement you may have executed
|
||||
with Licensor regarding such Contributions.
|
||||
|
||||
6. Trademarks. This License does not grant permission to use the trade
|
||||
names, trademarks, service marks, or product names of the Licensor,
|
||||
except as required for reasonable and customary use in describing the
|
||||
origin of the Work and reproducing the content of the NOTICE file.
|
||||
|
||||
7. Disclaimer of Warranty. Unless required by applicable law or
|
||||
agreed to in writing, Licensor provides the Work (and each
|
||||
Contributor provides its Contributions) on an "AS IS" BASIS,
|
||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
|
||||
implied, including, without limitation, any warranties or conditions
|
||||
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
|
||||
PARTICULAR PURPOSE. You are solely responsible for determining the
|
||||
appropriateness of using or redistributing the Work and assume any
|
||||
risks associated with Your exercise of permissions under this License.
|
||||
|
||||
8. Limitation of Liability. In no event and under no legal theory,
|
||||
whether in tort (including negligence), contract, or otherwise,
|
||||
unless required by applicable law (such as deliberate and grossly
|
||||
negligent acts) or agreed to in writing, shall any Contributor be
|
||||
liable to You for damages, including any direct, indirect, special,
|
||||
incidental, or consequential damages of any character arising as a
|
||||
result of this License or out of the use or inability to use the
|
||||
Work (including but not limited to damages for loss of goodwill,
|
||||
work stoppage, computer failure or malfunction, or any and all
|
||||
other commercial damages or losses), even if such Contributor
|
||||
has been advised of the possibility of such damages.
|
||||
|
||||
9. Accepting Warranty or Additional Liability. While redistributing
|
||||
the Work or Derivative Works thereof, You may choose to offer,
|
||||
and charge a fee for, acceptance of support, warranty, indemnity,
|
||||
or other liability obligations and/or rights consistent with this
|
||||
License. However, in accepting such obligations, You may act only
|
||||
on Your own behalf and on Your sole responsibility, not on behalf
|
||||
of any other Contributor, and only if You agree to indemnify,
|
||||
defend, and hold each Contributor harmless for any liability
|
||||
incurred by, or claims asserted against, such Contributor by reason
|
||||
of your accepting any such warranty or additional liability.
|
||||
|
||||
END OF TERMS AND CONDITIONS
|
||||
|
||||
APPENDIX: How to apply the Apache License to your work.
|
||||
|
||||
To apply the Apache License to your work, attach the following
|
||||
boilerplate notice, with the fields enclosed by brackets "[]"
|
||||
replaced with your own identifying information. (Don't include
|
||||
the brackets!) The text should be enclosed in the appropriate
|
||||
comment syntax for the file format. We also recommend that a
|
||||
file or class name and description of purpose be included on the
|
||||
same "printed page" as the copyright notice for easier
|
||||
identification within third-party archives.
|
||||
|
||||
Copyright [yyyy] [name of copyright owner]
|
||||
|
||||
Licensed under the Apache License, Version 2.0 (the "License");
|
||||
you may not use this file except in compliance with the License.
|
||||
You may obtain a copy of the License at
|
||||
|
||||
http://www.apache.org/licenses/LICENSE-2.0
|
||||
|
||||
Unless required by applicable law or agreed to in writing, software
|
||||
distributed under the License is distributed on an "AS IS" BASIS,
|
||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
See the License for the specific language governing permissions and
|
||||
limitations under the License.
|
58
Makefile
58
Makefile
@ -1,31 +1,33 @@
|
||||
.PHONY: all setup web desktop desktop-common linux windows windows-portable
|
||||
.PHONY: web-release debian-release pacman-release windows-setup-release windows-unpacked-release windows-portable-release windows-release release
|
||||
.PHONY: all setup regenerate-i18n reskindex web desktop-common linux debian pacman local-pkgbuild local-pkgbuild-install windows windows-portable
|
||||
.PHONY: web-release debian-release pacman-release windows-setup-release windows-unpacked-release windows-portable-release windows-release
|
||||
.PHONY: clean
|
||||
|
||||
CFGDIR ?= configs/sc
|
||||
|
||||
all: release
|
||||
all: web
|
||||
|
||||
YARN ?= yarnpkg
|
||||
|
||||
VERSION := $(shell grep version element-desktop/package.json | sed 's|.*: \"\(.*\)\",|\1|')
|
||||
APP_NAME := $(shell grep '"name"' element-desktop/package.json | head -n 1 | sed 's|.*: \"\(.*\)\",|\1|')
|
||||
WEB_APP_NAME := $(shell grep '"name"' element-web/package.json | head -n 1 | sed 's|.*: \"\(.*\)\",|\1|')
|
||||
DESKTOP_APP_NAME := $(shell grep '"name"' element-desktop/package.json | head -n 1 | sed 's|.*: \"\(.*\)\",|\1|')
|
||||
PRODUCT_NAME := $(shell grep '"productName"' element-desktop/package.json | sed 's|.*: \"\(.*\)\",|\1|')
|
||||
|
||||
WEB_OUT := element-web/dist
|
||||
WEB_OUT_DIST_VERSION := web
|
||||
OUT_WEB := $(WEB_OUT)/riot-$(WEB_OUT_DIST_VERSION).tar.gz
|
||||
OUT_WEB_BETTER_NAME := schildichat-web-$(VERSION).tar.gz
|
||||
WEB_OUT_DIST_VERSION := $(VERSION)
|
||||
OUT_WEB := $(WEB_OUT)/$(WEB_APP_NAME)-$(WEB_OUT_DIST_VERSION).tar.gz
|
||||
|
||||
DESKTOP_OUT := element-desktop/dist
|
||||
OUT_DEB64 := $(DESKTOP_OUT)/$(APP_NAME)_$(VERSION)_amd64.deb
|
||||
OUT_PAC64 := $(DESKTOP_OUT)/$(APP_NAME)-$(VERSION).pacman
|
||||
OUT_TARXZ64 := $(DESKTOP_OUT)/$(APP_NAME)-$(VERSION).tar.xz
|
||||
OUT_DEB64 := $(DESKTOP_OUT)/$(DESKTOP_APP_NAME)_$(VERSION)_amd64.deb
|
||||
OUT_PAC64 := $(DESKTOP_OUT)/$(DESKTOP_APP_NAME)-$(VERSION).pacman
|
||||
OUT_APPIMAGE64 := $(DESKTOP_OUT)/$(PRODUCT_NAME)-$(VERSION).AppImage
|
||||
OUT_TARXZ64 := $(DESKTOP_OUT)/$(DESKTOP_APP_NAME)-$(VERSION).tar.xz
|
||||
OUT_WIN64 := $(DESKTOP_OUT)/$(PRODUCT_NAME)\ Setup\ $(VERSION).exe
|
||||
OUT_WIN64_PORTABLE := $(DESKTOP_OUT)/$(PRODUCT_NAME)\ $(VERSION).exe
|
||||
OUT_WIN64_BETTER_NAME := $(PRODUCT_NAME)_Setup_v$(VERSION).exe
|
||||
OUT_WIN64_UNPACKED_BETTER_NAME := $(PRODUCT_NAME)_win-unpacked_v$(VERSION).zip
|
||||
OUT_WIN64_PORTABLE_BETTER_NAME := $(PRODUCT_NAME)_win-portable_v$(VERSION)
|
||||
OUT_MACOS := $(DESKTOP_OUT)/$(PRODUCT_NAME)-$(VERSION).dmg
|
||||
|
||||
RELEASE_DIR := release
|
||||
CURRENT_RELEASE_DIR := $(RELEASE_DIR)/$(VERSION)
|
||||
@ -35,10 +37,17 @@ CURRENT_RELEASE_DIR := $(RELEASE_DIR)/$(VERSION)
|
||||
|
||||
setup:
|
||||
if [ ! -L "element-desktop/webapp" ]; then ./setup.sh; fi
|
||||
cp $(CFGDIR)/config.json element-web/
|
||||
|
||||
regenerate-i18n: setup
|
||||
./regenerate_i18n.sh
|
||||
|
||||
reskindex: setup
|
||||
$(YARN) --cwd matrix-react-sdk reskindex
|
||||
$(YARN) --cwd element-web reskindex
|
||||
|
||||
web: export DIST_VERSION=$(WEB_OUT_DIST_VERSION)
|
||||
web: setup
|
||||
web: setup reskindex
|
||||
cp $(CFGDIR)/config.json element-web/
|
||||
$(YARN) --cwd element-web dist
|
||||
echo "$(VERSION)" > element-web/webapp/version
|
||||
|
||||
@ -46,8 +55,6 @@ desktop-common: web
|
||||
$(YARN) --cwd element-desktop run fetch --cfgdir ''
|
||||
$(YARN) --cwd element-desktop run build:native
|
||||
|
||||
desktop: windows linux
|
||||
|
||||
linux: desktop-common
|
||||
$(YARN) --cwd element-desktop run build64linux
|
||||
|
||||
@ -57,15 +64,27 @@ debian: desktop-common
|
||||
pacman: desktop-common
|
||||
$(YARN) --cwd element-desktop run build64pacman
|
||||
|
||||
appimage: desktop-common
|
||||
$(YARN) --cwd element-desktop run build64appimage
|
||||
|
||||
windows: desktop-common
|
||||
$(YARN) --cwd element-desktop run build64windows
|
||||
|
||||
windows-portable: desktop-common
|
||||
$(YARN) --cwd element-desktop run build64windows-portable
|
||||
|
||||
macos: desktop-common
|
||||
$(YARN) --cwd element-desktop run build --mac dmg -c.mac.identity=null
|
||||
|
||||
local-pkgbuild: debian
|
||||
./create_local_pkgbuild.sh $(VERSION) $(DESKTOP_APP_NAME) $(PRODUCT_NAME) $(OUT_DEB64)
|
||||
|
||||
local-pkgbuild-install: local-pkgbuild
|
||||
cd local-pkgbuild; makepkg --install
|
||||
|
||||
web-release: web
|
||||
mkdir -p $(CURRENT_RELEASE_DIR)
|
||||
cp $(OUT_WEB) $(CURRENT_RELEASE_DIR)/$(OUT_WEB_BETTER_NAME)
|
||||
cp $(OUT_WEB) $(CURRENT_RELEASE_DIR)
|
||||
|
||||
debian-release: debian
|
||||
mkdir -p $(CURRENT_RELEASE_DIR)
|
||||
@ -75,6 +94,10 @@ pacman-release: pacman
|
||||
mkdir -p $(CURRENT_RELEASE_DIR)
|
||||
cp $(OUT_PAC64) $(CURRENT_RELEASE_DIR)
|
||||
|
||||
appimage-release: appimage
|
||||
mkdir -p $(CURRENT_RELEASE_DIR)
|
||||
cp $(OUT_APPIMAGE64) $(CURRENT_RELEASE_DIR)
|
||||
|
||||
windows-setup-release: windows
|
||||
mkdir -p $(CURRENT_RELEASE_DIR)
|
||||
cp $(OUT_WIN64) $(CURRENT_RELEASE_DIR)/$(OUT_WIN64_BETTER_NAME)
|
||||
@ -88,7 +111,9 @@ windows-portable-release: windows-portable
|
||||
|
||||
windows-release: windows-setup-release windows-unpacked-release windows-portable-release
|
||||
|
||||
release: web-release debian-release pacman-release windows-release
|
||||
macos-release: macos
|
||||
mkdir -p $(CURRENT_RELEASE_DIR)
|
||||
cp $(OUT_MACOS) $(CURRENT_RELEASE_DIR)
|
||||
|
||||
clean:
|
||||
$(YARN) --cwd matrix-js-sdk clean
|
||||
@ -97,3 +122,4 @@ clean:
|
||||
$(YARN) --cwd element-desktop clean
|
||||
rm -f element-desktop/webapp
|
||||
rm -rf element-web/dist
|
||||
rm -rf local-pkgbuild
|
||||
|
81
README.md
81
README.md
@ -1,37 +1,32 @@
|
||||
# SchildiChat-Desktop
|
||||
# SchildiChat Web/Desktop
|
||||
|
||||
SchildiChat-Desktop is a fork of [Element-Web](https://github.com/vector-im/element-web)/[-Desktop](https://github.com/vector-im/element-desktop).
|
||||
|
||||
The most important changes of SchildiChat-Desktop compared to Element are:
|
||||
SchildiChat Web/Desktop is a fork of Element [Web](https://github.com/vector-im/element-web)/[Desktop](https://github.com/vector-im/element-desktop).
|
||||
|
||||
The most important changes of SchildiChat Web/Desktop compared to Element Web/Desktop are:
|
||||
- A unifed chat list for both direct and group chats
|
||||
- Message bubbles
|
||||
- Bigger items in the room list
|
||||
- … and more!
|
||||
|
||||
While SchildiChat-Desktop should be already usable as is, it's still better seen as a
|
||||
proof-of-concept rather than a finished product, as there are still a few UX bugs
|
||||
remaining, and no ways to configure Schildi's features.
|
||||
Furthermore, I don't know how much more work I'm going to put into this, but
|
||||
if anybody wants to help improving it, contributions are welcome!
|
||||
|
||||
Downloads for Desktop: https://github.com/SchildiChat/schildichat-desktop/releases <br/>
|
||||
Hosted web variant: https://schildiweb.spiritcroc.de/
|
||||
Desktop downloads with installation instructions are listed on our website: [https://schildi.chat/desktop](https://schildi.chat/desktop)
|
||||
Hosted web variant: [https://app.schildi.chat/](https://app.schildi.chat/)
|
||||
|
||||
Feel free to [join the discussion on matrix](https://matrix.to/#/#schildichat-web:matrix.org).
|
||||
|
||||
<img src="https://raw.githubusercontent.com/SchildiChat/schildichat-desktop/sc/screenshots/1.png"/>
|
||||
|
||||
|
||||
# Building SchildiChat-Desktop
|
||||
## Building SchildiChat Web/Desktop
|
||||
|
||||
This particular repo is a wrapper project for element-desktop, element-web, matrix-react-sdk and matrix-js-sdk, in order to build SchildiChat-Desktop.
|
||||
This particular repo is a wrapper project for element-desktop, element-web, matrix-react-sdk and matrix-js-sdk in order to build SchildiChat Web **and** Desktop.
|
||||
|
||||
### Install dependencies
|
||||
|
||||
## Debian compilation dependencies
|
||||
#### Debian build dependencies
|
||||
|
||||
Since Debian is usually slow to update packages on its stable releases, some dependencies
|
||||
might not be recent enough to building Schildi.
|
||||
Here are the dependencies which I had to install for compilation on Debian 10:
|
||||
Since Debian is usually slow to update packages on its stable releases,
|
||||
some dependencies might not be recent enough to build SchildiChat.
|
||||
The following are the dependencies required to build SchildiChat Web/Desktop on Debian 10:
|
||||
|
||||
```
|
||||
# apt install vim curl git make gcc g++ libsqlcipher-dev pkg-config libsecret-1-dev bsdtar
|
||||
@ -49,7 +44,21 @@ $ echo 'export PATH="$PATH:$HOME/.cargo/bin"' >> .bashrc
|
||||
$ source .bashrc
|
||||
```
|
||||
|
||||
## Initial setup
|
||||
#### macOS build dependencies
|
||||
|
||||
##### Install brew package manager
|
||||
```
|
||||
/bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"
|
||||
```
|
||||
|
||||
##### Install packages
|
||||
|
||||
```
|
||||
brew install tcl rust node gpg vim curl git yarn git make gcc
|
||||
```
|
||||
|
||||
|
||||
### Initial setup
|
||||
|
||||
```
|
||||
git clone --recurse-submodules https://github.com/SchildiChat/schildichat-desktop.git
|
||||
@ -57,10 +66,36 @@ cd schildichat-desktop
|
||||
make setup # optional step if using the other make targets
|
||||
```
|
||||
|
||||
## Build
|
||||
### Create release builds
|
||||
|
||||
`make [{web|debian|pacman|windows}-release]`
|
||||
Those are the builds distributed via GitHub releases.
|
||||
|
||||
## Install
|
||||
```
|
||||
# The single make targets are explained below
|
||||
make [{web|debian|windows-setup|windows-portable|macos}-release]
|
||||
```
|
||||
|
||||
Installable packages should appear in release/.
|
||||
After that these packages which belong to to their respective make target should appear in release/\<version\>/:
|
||||
- `web`: _schildichat-web-\<version\>.tar.gz_: archive that can be unpacked and served by a **web** server (copy `config.sample.json` to `config.json` and adjust the [configuration](https://github.com/SchildiChat/element-web/blob/sc/docs/config.md) to your likings)
|
||||
- `debian`: file ready for installation on a **Debian Linux** (based) system via `dpkg -i schildichat-desktop_<version>_amd64.deb`
|
||||
- `windows-setup`: _SchildiChat_Setup_v\<version\>.exe_: file ready for **installation** on a **Windows** system
|
||||
- `windows-portable`: _SchildiChat_win-portable_v\<version\>.zip_: **portable** version for a **Windows** system – take SchildiChat together with your login data around with you (the archive contains a readme with **instructions** and **notes**)
|
||||
- `macos`: Build a *.dmg for macOS
|
||||
|
||||
#### Additional make targets not used for GitHub releases
|
||||
- `pacman`: file ready for installation on an **Arch Linux** (based) system via `pacman -U schildichat-desktop-<version>.pacman`
|
||||
- `windows-unpacked`: _SchildiChat_win-unpacked_v\<version\>.zip_: **unpacked** archive for a **Windows** system
|
||||
|
||||
### Build SchildiChat Web and deploy it directly to your web server
|
||||
|
||||
Put the `config.json` with the [configuration](https://github.com/SchildiChat/element-web/blob/sc/docs/config.md) you want for your hosted instance in a subfolder of the `configs` folder.
|
||||
Then create a file named `release.mk` and fill it similar to that:
|
||||
```
|
||||
.PHONY: your-deploy-web
|
||||
|
||||
YOUR_CFGDIR := configs/your_subfolder
|
||||
your-deploy-%: CFGDIR := $(YOUR_CFGDIR)
|
||||
|
||||
your-deploy-web: web
|
||||
rsync --info=progress2 -rup --del element-web/webapp/ you@yourwebserver:/the/folder/served/for/schildi/
|
||||
```
|
||||
|
@ -11,6 +11,7 @@
|
||||
"https://scalar-staging.vector.im/api",
|
||||
"https://scalar-staging.riot.im/scalar/api"
|
||||
],
|
||||
"showLabsSettings": true,
|
||||
"roomDirectory": {
|
||||
"servers": [
|
||||
"matrix.org"
|
||||
|
42
create_local_pkgbuild.sh
Executable file
42
create_local_pkgbuild.sh
Executable file
@ -0,0 +1,42 @@
|
||||
#!/bin/sh
|
||||
|
||||
set -e
|
||||
|
||||
mydir="$(dirname "$(realpath "$0")")"
|
||||
cd "$mydir"
|
||||
|
||||
version="$1"
|
||||
appName="$2"
|
||||
productName="$3"
|
||||
debOut="$4"
|
||||
|
||||
template_dir="local-pkgbuild-template"
|
||||
out_dir="local-pkgbuild"
|
||||
|
||||
if [ -z "$version" ] || [ -z "$appName" ] || [ -z "$productName" ] || [ -z "$debOut" ]; then
|
||||
echo "Usage: $0 version appName productName debOut"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
debName="$(basename "$debOut")"
|
||||
|
||||
rm -rf "$out_dir"
|
||||
mkdir "$out_dir"
|
||||
|
||||
setup_file() {
|
||||
local file="$1"
|
||||
local outfile="$2"
|
||||
if [ -z "$outfile" ]; then
|
||||
local outfile="$file"
|
||||
fi
|
||||
cat "$template_dir/$file" \
|
||||
| sed "s|---version---|$version|g" \
|
||||
| sed "s|---appName---|$appName|g" \
|
||||
| sed "s|---productName---|$productName|g" \
|
||||
| sed "s|---debName---|$debName|g" \
|
||||
> "$out_dir/$outfile"
|
||||
}
|
||||
|
||||
setup_file PKGBUILD
|
||||
setup_file schildichat-desktop.sh "$appName.sh"
|
||||
ln -r -s "$debOut" "$out_dir/$debName"
|
1
deploy/.gitignore
vendored
Normal file
1
deploy/.gitignore
vendored
Normal file
@ -0,0 +1 @@
|
||||
repos/*
|
80
deploy/create-github-release.sh
Executable file
80
deploy/create-github-release.sh
Executable file
@ -0,0 +1,80 @@
|
||||
#!/usr/bin/env bash
|
||||
#
|
||||
# Based upon https://hinty.io/ivictbor/publish-and-upload-release-to-github-with-bash-and-curl/
|
||||
# and https://gist.github.com/stefanbuck/ce788fee19ab6eb0b4447a85fc99f447
|
||||
#
|
||||
|
||||
set -e
|
||||
# set -x
|
||||
|
||||
version="$1"
|
||||
releasepath="$2"
|
||||
|
||||
github_api_token=`cat ~/githubtoken`
|
||||
release_notes_file="/tmp/scrn.md"
|
||||
|
||||
owner=SchildiChat
|
||||
repo=schildichat-desktop
|
||||
target=sc
|
||||
|
||||
# Define variables
|
||||
GH_API="https://api.github.com"
|
||||
GH_REPO="$GH_API/repos/$owner/$repo"
|
||||
AUTH="Authorization: token $github_api_token"
|
||||
|
||||
# Validate token
|
||||
curl -o /dev/null -sH "$AUTH" $GH_REPO || { echo "Error: Invalid repo, token or network issue!"; exit 1; }
|
||||
|
||||
# Get release notes
|
||||
$EDITOR "$release_notes_file"
|
||||
release_notes=`cat "$release_notes_file"`
|
||||
|
||||
# Create draft release
|
||||
echo "Create GitHub draft release ..."
|
||||
json_string=`jq -n --arg tag "v$version" --arg target "$target" --arg body "$release_notes" '{
|
||||
tag_name: $tag,
|
||||
target_commitish: $target,
|
||||
name: $tag,
|
||||
body: $body,
|
||||
draft: true,
|
||||
prerelease: false
|
||||
}'`
|
||||
# echo "$json_string"
|
||||
res=`echo "$json_string" | curl -sH "$AUTH" $GH_REPO/releases -d @-`
|
||||
# echo "$res" | jq "."
|
||||
|
||||
# Get release id
|
||||
id=`echo $res | jq ".id"`
|
||||
# echo "id: $id"
|
||||
|
||||
# Upload assets
|
||||
find "$releasepath" -type f | while read filename; do
|
||||
echo ""
|
||||
echo "Uploading $filename ..."
|
||||
|
||||
# Construct url
|
||||
GH_ASSET="https://uploads.github.com/repos/$owner/$repo/releases/$id/assets?name=$(basename $filename)"
|
||||
|
||||
# Upload
|
||||
res=`curl --progress-bar --data-binary @"$filename" -H "$AUTH" -H "Content-Type: application/octet-stream" $GH_ASSET`
|
||||
state=`echo $res | jq ".state"`
|
||||
if [ "$state" == "\"uploaded\"" ]; then
|
||||
echo "Success!"
|
||||
else
|
||||
echo "Error:"
|
||||
echo $res | jq "."
|
||||
exit -1
|
||||
fi
|
||||
done
|
||||
|
||||
# Publish draft
|
||||
res=`curl -sH "$AUTH" $GH_REPO/releases/$id -d '{"draft": false}'`
|
||||
draft=`echo $res | jq ".draft"`
|
||||
echo ""
|
||||
if [ "$draft" == "false" ]; then
|
||||
echo "Release v$version published on GitHub!"
|
||||
else
|
||||
echo "Error:"
|
||||
echo $res | jq "."
|
||||
exit -1
|
||||
fi
|
35
deploy/update-aur-bin.sh
Executable file
35
deploy/update-aur-bin.sh
Executable file
@ -0,0 +1,35 @@
|
||||
#!/bin/bash
|
||||
|
||||
set -e
|
||||
# set -x
|
||||
|
||||
DEPLOY_ROOT="$(dirname "$(realpath "$0")")"
|
||||
|
||||
version="$1"
|
||||
debpath="$2"
|
||||
|
||||
repopath="$DEPLOY_ROOT/repos/aur-bin"
|
||||
repourl="ssh://aur@aur.archlinux.org/schildichat-desktop-bin.git"
|
||||
|
||||
sha256sum=($(sha256sum $debpath))
|
||||
|
||||
[ -d "$repopath" ] || git clone $repourl $repopath
|
||||
|
||||
pushd "$repopath" > /dev/null
|
||||
|
||||
git fetch
|
||||
git reset --hard origin/master
|
||||
|
||||
sed -i "s|^_pkgver=.*$|_pkgver=$version|" PKGBUILD
|
||||
sed -i "s|^sha256sums=('.*'$|sha256sums=('$sha256sum'|" PKGBUILD
|
||||
|
||||
makepkg --printsrcinfo > .SRCINFO
|
||||
|
||||
git add .SRCINFO PKGBUILD
|
||||
git commit -m "Bump version to v$version"
|
||||
|
||||
git push
|
||||
|
||||
popd > /dev/null
|
||||
|
||||
echo "Release v$version published on AUR!"
|
46
deploy/update-flathub.sh
Executable file
46
deploy/update-flathub.sh
Executable file
@ -0,0 +1,46 @@
|
||||
#!/bin/bash
|
||||
|
||||
set -e
|
||||
# set -x
|
||||
|
||||
DEPLOY_ROOT="$(dirname "$(realpath "$0")")"
|
||||
|
||||
version="$1"
|
||||
debpath="$2"
|
||||
|
||||
repopath="$DEPLOY_ROOT/repos/flathub"
|
||||
repourl="git@github.com:flathub/chat.schildi.desktop.git"
|
||||
|
||||
downloadurl="https://github.com/SchildiChat/schildichat-desktop/releases/download/v${version}/schildichat-desktop_${version}_amd64.deb"
|
||||
sha256sum=($(sha256sum $debpath))
|
||||
debsize=($(wc -c $debpath))
|
||||
debdate=$(date +%Y-%m-%d -r $debpath)
|
||||
|
||||
[ -d "$repopath" ] || git clone $repourl $repopath
|
||||
|
||||
pushd "$repopath" > /dev/null
|
||||
|
||||
git fetch
|
||||
git reset --hard origin/master
|
||||
|
||||
jsonFile="chat.schildi.desktop.json"
|
||||
jsonString=$(jq -r "." $jsonFile)
|
||||
|
||||
xmlFile="chat.schildi.desktop.appdata.xml"
|
||||
|
||||
jsonString=$(echo $jsonString | jq -r ".modules[]? |= ((select(.name?==\"schildichat\") | .sources[0].url = \"${downloadurl}\") // .)")
|
||||
jsonString=$(echo $jsonString | jq -r ".modules[]? |= ((select(.name?==\"schildichat\") | .sources[0].sha256 = \"${sha256sum}\") // .)")
|
||||
jsonString=$(echo $jsonString | jq -r ".modules[]? |= ((select(.name?==\"schildichat\") | .sources[0].size = ${debsize}) // .)")
|
||||
|
||||
echo $jsonString | jq --indent 4 "." > $jsonFile
|
||||
|
||||
sed -i "s|^\s\s<releases>$| <releases>\n <release version=\"$version\" date=\"$debdate\"/>|" $xmlFile
|
||||
|
||||
git add $jsonFile $xmlFile
|
||||
git commit -m "Bump version to v$version"
|
||||
|
||||
git push
|
||||
|
||||
popd > /dev/null
|
||||
|
||||
echo "Release v$version published on flathub!"
|
Submodule element-desktop updated: 937f8a8c86...820d349609
Submodule element-web updated: 9eeb0af50a...37703fbbcd
3
i18n-helper/.gitignore
vendored
Normal file
3
i18n-helper/.gitignore
vendored
Normal file
@ -0,0 +1,3 @@
|
||||
yarn.lock
|
||||
yarn-error.log
|
||||
node_modules/
|
52
i18n-helper/index.js
Normal file
52
i18n-helper/index.js
Normal file
@ -0,0 +1,52 @@
|
||||
const fs = require('fs');
|
||||
const path = require('path');
|
||||
const globby = require('globby');
|
||||
|
||||
function readStrings(p) {
|
||||
return JSON.parse(fs.readFileSync(p).toString());
|
||||
}
|
||||
|
||||
function writeStrings(p, strings) {
|
||||
fs.writeFileSync(p, JSON.stringify(strings, null, 4) + "\n");
|
||||
}
|
||||
|
||||
(async () => {
|
||||
console.log(process.argv.length);
|
||||
console.log(process.argv[0]);
|
||||
console.log(process.argv[1]);
|
||||
console.log(process.argv[2]);
|
||||
console.log(process.argv[3]);
|
||||
if (process.argv.length < 3) {
|
||||
console.log("No path with the original strings given!");
|
||||
process.exit(-1);
|
||||
}
|
||||
originalPath = process.argv[2];
|
||||
|
||||
overlayPath = null;
|
||||
if (process.argv.length > 3) {
|
||||
overlayPath = process.argv[3];
|
||||
} else {
|
||||
console.log("Continue without overlays ...")
|
||||
}
|
||||
|
||||
const paths = await globby(path.join(originalPath, "*.json"));
|
||||
|
||||
paths.forEach(p => {
|
||||
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");
|
||||
}
|
||||
|
||||
if (overlayPath) {
|
||||
op = path.join(overlayPath, path.basename(p));
|
||||
|
||||
if (fs.existsSync(op)) {
|
||||
overlayStrings = readStrings(op);
|
||||
Object.assign(strings, overlayStrings);
|
||||
}
|
||||
}
|
||||
|
||||
writeStrings(p, strings);
|
||||
});
|
||||
})();
|
8
i18n-helper/package.json
Normal file
8
i18n-helper/package.json
Normal file
@ -0,0 +1,8 @@
|
||||
{
|
||||
"name": "i18n-helper",
|
||||
"version": "0.0.1",
|
||||
"main": "index.js",
|
||||
"dependencies": {
|
||||
"globby": "^11.0.3"
|
||||
}
|
||||
}
|
3
i18n-overlays/element-desktop/cs.json
Normal file
3
i18n-overlays/element-desktop/cs.json
Normal file
@ -0,0 +1,3 @@
|
||||
{
|
||||
"Show": "Zobrazit"
|
||||
}
|
3
i18n-overlays/element-desktop/de.json
Normal file
3
i18n-overlays/element-desktop/de.json
Normal file
@ -0,0 +1,3 @@
|
||||
{
|
||||
"Show": "Anzeigen"
|
||||
}
|
3
i18n-overlays/element-desktop/en_EN.json
Normal file
3
i18n-overlays/element-desktop/en_EN.json
Normal file
@ -0,0 +1,3 @@
|
||||
{
|
||||
"Show": "Show"
|
||||
}
|
5
i18n-overlays/element-web/cs.json
Normal file
5
i18n-overlays/element-web/cs.json
Normal file
@ -0,0 +1,5 @@
|
||||
{
|
||||
"Your Element configuration contains invalid JSON. Please correct the problem and reload the page.": "Konfigurace SchildiChatu obsahuje neplatný JSON. Opravte problém a načtěte stránku znovu.",
|
||||
"Download Completed": "Stahování dokončeno",
|
||||
"%(brand)s uses advanced browser features which aren't supported by your current browser.": "%(brand)s používá pokročilé funkce prohlížeče, které váš prohlížeč nepodporuje."
|
||||
}
|
5
i18n-overlays/element-web/de_DE.json
Normal file
5
i18n-overlays/element-web/de_DE.json
Normal file
@ -0,0 +1,5 @@
|
||||
{
|
||||
"Your Element configuration contains invalid JSON. Please correct the problem and reload the page.": "Deine SchildiChat-Konfiguration enthält ungültiges JSON. Bitte korrigiere das Problem und lade die Seite neu.",
|
||||
"Download Completed": "Download abgeschlossen",
|
||||
"%(brand)s uses advanced browser features which aren't supported by your current browser.": "%(brand)s verwendet erweiterte Browserfunktionen, die von deinem aktuellen Browser nicht unterstützt werden."
|
||||
}
|
7
i18n-overlays/matrix-react-sdk/cs.json
Normal file
7
i18n-overlays/matrix-react-sdk/cs.json
Normal file
@ -0,0 +1,7 @@
|
||||
{
|
||||
"Enable layout with message bubbles": "Povolit bubliny zpráv",
|
||||
"Show message bubbles on one side only": "Bubliny zpráv zobrazit pouze na jedné straně",
|
||||
"Show message bubbles depending on the width either on both sides or only on one side": "Bubliny zpráv zobrazit v závislosti na šířce stránky buď na obou stranách, nebo pouze na jedné straně.",
|
||||
"Message bubbles": "Bubliny zpráv",
|
||||
"Normal priority": "Normální priorita"
|
||||
}
|
107
i18n-overlays/matrix-react-sdk/de_DE.json
Normal file
107
i18n-overlays/matrix-react-sdk/de_DE.json
Normal file
@ -0,0 +1,107 @@
|
||||
{
|
||||
"Normal priority": "Normale Priorität",
|
||||
"Deops user with given id": "Setzt das Berechtigungslevel des Benutzers mit der angegebenen ID zurück",
|
||||
"No users have specific privileges in this room": "Keine Benutzer haben in diesem Raum privilegierte Berechtigungen",
|
||||
"Only people who have been invited": "Nur Personen, die eingeladen wurden",
|
||||
"Upload file": "Datei hochladen",
|
||||
"You cannot place VoIP calls in this browser.": "VoIP-Gespräche werden von diesem Browser nicht unterstützt.",
|
||||
"Failed to mute user": "Stummschalten des Benutzers fehlgeschlagen",
|
||||
"You will not be able to undo this change as you are promoting the user to have the same power level as yourself.": "Du wirst diese Änderung nicht rückgängig machen können, da der Benutzer dieselbe Berechtigungsstufe wie du selbst erhalten wird.",
|
||||
"Incorrect username and/or password.": "Inkorrekter Benutzername und/oder Passwort.",
|
||||
"Create new room": "Neuen Raum erstellen",
|
||||
"Define the power level of a user": "Berechtigungsstufe eines Benutzers setzen",
|
||||
"Enable automatic language detection for syntax highlighting": "Automatische Spracherkennung für die Syntaxhervorhebung aktivieren",
|
||||
"To get started, please pick a username!": "Um zu starten, wähle bitte einen Benutzernamen!",
|
||||
"Ignores a user, hiding their messages from you": "Benutzer blockieren und dessen Nachrichten ausblenden",
|
||||
"You will not be able to undo this change as you are demoting yourself, if you are the last privileged user in the room it will be impossible to regain privileges.": "Du wirst nicht in der Lage sein, die Änderung zurückzusetzen, da du dich degradierst. Wenn du der letze Benutzer mit Berechtigungen bist, wird es unmöglich sein, die Privilegien zurückzubekommen.",
|
||||
"Where this page includes identifiable information, such as a room, user or group ID, that data is removed before being sent to the server.": "Wenn diese Seite identifizierbare Informationen wie Raum-, Benutzer- oder Gruppen-ID enthält, werden diese Daten entfernt, bevor sie an den Server gesendet werden.",
|
||||
"If you've submitted a bug via GitHub, debug logs can help us track down the problem. Debug logs contain application usage data including your username, the IDs or aliases of the rooms or groups you have visited and the usernames of other users. They do not contain messages.": "Wenn du einen Fehler via GitHub meldest, können Fehlerberichte uns helfen, um das Problem zu finden. Sie enthalten Anwendungsdaten wie deinen Benutzernamen, Raum- und Gruppen-IDs, Aliase, die du besucht hast, und Benutzernamen anderer Benutzer. Sie enthalten keine Nachrichten.",
|
||||
"Changes made to your community <bold1>name</bold1> and <bold2>avatar</bold2> might not be seen by other users for up to 30 minutes.": "Änderungen am <bold1>Namen</bold1> und <bold2>Bild</bold2> deiner Community werden evtl. erst nach 30 Minuten von anderen Benutzern gesehen werden.",
|
||||
"Debug logs contain application usage data including your username, the IDs or aliases of the rooms or groups you have visited and the usernames of other users. They do not contain messages.": "Fehlerberichte enthalten Anwendungsdaten wie deinen Benutzernamen, Raum- und Gruppen-IDs und Aliase, die du besucht hast, sowie Benutzernamen anderer Benutzer. Sie enthalten keine Nachrichten.",
|
||||
"Enable widget screenshots on supported widgets": "Bildschirmfotos bei unterstützten Widgets aktivieren",
|
||||
"Message visibility in Matrix is similar to email. Our forgetting your messages means that messages you have sent will not be shared with any new or unregistered users, but registered users who already have access to these messages will still have access to their copy.": "Die Sichtbarkeit der Nachrichten in Matrix ist vergleichbar mit E-Mails: Wenn wir deine Nachrichten vergessen, heißt das, dass diese nicht mit neuen oder nicht registrierten Benutzern geteilt werden, aber registrierte Benutzer, die bereits zugriff haben, den Zugriff auf ihre Kopie behalten.",
|
||||
"Please forget all messages I have sent when my account is deactivated (<b>Warning:</b> this will cause future users to see an incomplete view of conversations)": "Bitte vergesst alle Nachrichten, die ich gesendet habe, wenn mein Konto deaktiviert wird. (<b>Warnung:</b> Zukünftige Benutzer werden eine unvollständige Konversation sehen)",
|
||||
"Share Link to User": "Link zum Benutzer teilen",
|
||||
"This homeserver has hit its Monthly Active User limit.": "Dieser Heimserver hat sein Limit an monatlich aktiven Benutzern erreicht.",
|
||||
"This homeserver has exceeded one of its resource limits.": "Dieser Heimserver hat eines seiner Ressourcen-Limits überschritten.",
|
||||
"Stop users from speaking in the old version of the room, and post a message advising users to move to the new room": "Benutzern verbieten in dem Raum mit der alten Version zu schreiben und eine Nachricht senden, die den Benutzern rät in den neuen Raum zu wechseln",
|
||||
"Before submitting logs, you must <a>create a GitHub issue</a> to describe your problem.": "Bevor du Protokolldateien übermittelst, musst du <a>auf GitHub ein \"Issue\" erstellen</a> um dein Problem zu beschreiben.",
|
||||
"%(brand)s now uses 3-5x less memory, by only loading information about other users when needed. Please wait whilst we resynchronise with the server!": "%(brand)s benutzt nun 3 - 5-mal weniger Arbeitsspeicher, indem Informationen über andere Benutzer erst bei Bedarf geladen werden. Bitte warte, während die Daten erneut mit dem Server abgeglichen werden!",
|
||||
"Custom user status messages": "Angepasste Benutzerstatusnachrichten",
|
||||
"Prompt before sending invites to potentially invalid matrix IDs": "Warnen, bevor du Einladungen zu möglicherweise ungültigen Matrix-IDs sendest",
|
||||
"Verify this user by confirming the following number appears on their screen.": "Verifiziere diesen Benutzer, indem du bestätigst, dass die folgende Nummer auf dessen Bildschirm erscheint.",
|
||||
"For help with using %(brand)s, click <a>here</a>.": "Um Hilfe zur Benutzung von %(brand)s zu erhalten, klicke <a>hier</a>.",
|
||||
"Verify this user by confirming the following emoji appear on their screen.": "Verifiziere diesen Benutzer, indem du bestätigst, dass folgende Emojis auf dessen Bildschirm erscheinen.",
|
||||
"User %(userId)s is already in the room": "Benutzer %(userId)s ist bereits im Raum",
|
||||
"The user must be unbanned before they can be invited.": "Die Verbannung des Benutzers muss aufgehoben werden, bevor er eingeladen werden kann.",
|
||||
"Could not load user profile": "Konnte Benutzerprofil nicht laden",
|
||||
"Unbans user with given ID": "Hebt die Verbannung des Benutzers mit der angegebenen ID auf",
|
||||
"Using an identity server is optional. If you choose not to use an identity server, you won't be discoverable by other users and you won't be able to invite others by email or phone.": "Die Verwendung eines Identitätsserver ist optional. Solltest du dich dazu entschließen, keinen Identitätsserver zu verwenden, kannst du von anderen Benutzern nicht gefunden werden und andere nicht per E-Mail oder Telefonnummer einladen.",
|
||||
"This is your list of users/servers you have blocked - don't leave the room!": "Dies ist die Liste von Benutzern und Servern, die du blockiert hast - verlasse diesen Raum nicht!",
|
||||
"Show info about bridges in room settings": "Information über Brücken in den Raumeinstellungen anzeigen",
|
||||
"Backup has a signature from <verify>unknown</verify> user with ID %(deviceId)s": "Die Sicherung hat eine Signatur von <verify>unbekanntem</verify> Benutzer mit ID %(deviceId)s",
|
||||
"User rules": "Benutzerregeln",
|
||||
"⚠ These settings are meant for advanced users.": "⚠ Diese Einstellungen sind für fortgeschrittene Benutzer gedacht.",
|
||||
"Whether you're using %(brand)s on a device where touch is the primary input mechanism": "Ob du %(brand)s auf einem Gerät verwendest, bei dem Touch die primäre Eingabemethode ist",
|
||||
"Your user agent": "Dein User-Agent",
|
||||
"If you cancel now, you won't complete verifying the other user.": "Wenn Sie jetzt abbrechen, werden Sie die Verifizierung des anderen Benutzers nicht beenden können.",
|
||||
"Encryption upgrade available": "Verschlüsselungsupgrade verfügbar",
|
||||
"Unknown (user, session) pair:": "Unbekanntes Benutzer-/Sitzungspaar:",
|
||||
"You have verified this user. This user has verified all of their sessions.": "Du hast diesen Benutzer verifiziert. Dieser Benutzer hat alle seine Sitzungen verifiziert.",
|
||||
"Displays information about a user": "Zeigt Informationen über einen Benutzer an",
|
||||
"%(senderName)s created a rule banning users matching %(glob)s for %(reason)s": "%(senderName)s erstellte eine Ausschlussregel für Benutzer, die aufgrund %(reason)s %(glob)s entsprechen",
|
||||
"%(senderName)s created a rule banning rooms matching %(glob)s for %(reason)s": "%(senderName)s erstellte eine Ausschlussregel für Räume, die %(glob)s aufgrund von %(reason)s entsprechen",
|
||||
"Reject & Ignore user": "Ablehnen und Benutzer blockieren",
|
||||
"Support adding custom themes": "Unterstütze das Hinzufügen von benutzerdefinierten Designs",
|
||||
"Ask this user to verify their session, or manually verify it below.": "Bitte diesen Benutzer, seine Sitzung zu verifizieren, oder verifiziere diese unten manuell.",
|
||||
"Error adding ignored user/server": "Fehler beim Blockieren eines Benutzers/Servers",
|
||||
"None": "Keine",
|
||||
"Add users and servers you want to ignore here. Use asterisks to have %(brand)s match any characters. For example, <code>@bot:*</code> would ignore all users that have the name 'bot' on any server.": "Füge hier Benutzer und Server hinzu, die du blockieren willst. Verwende Sternchen, damit %(brand)s mit beliebigen Zeichen übereinstimmt. Bspw. würde <code>@bot:*</code> alle Benutzer ignorieren, die auf einem Server den Namen 'bot' haben.",
|
||||
"Ignoring people is done through ban lists which contain rules for who to ban. Subscribing to a ban list means the users/servers blocked by that list will be hidden from you.": "Das Blockieren von Personen erfolgt über Sperrlisten. Wenn eine Sperrliste abonniert wird, werden die darin aufgeführten Benutzer und Server ausgeblendet.",
|
||||
"Subscribing to a ban list will cause you to join it!": "Eine Verbotsliste zu abonnieren bedeutet ihr beizutreten!",
|
||||
"Your keys are <b>not being backed up from this session</b>.": "Deine Schlüssel werden <b>nicht von dieser Sitzung gesichert</b>.",
|
||||
"You have not verified this user.": "Du hast diesen Benutzer nicht verifiziert.",
|
||||
"Send a reply…": "Antwort senden …",
|
||||
"Send a message…": "Nachricht senden …",
|
||||
"%(errcode)s was returned while trying to access the room. If you think you're seeing this message in error, please <issueLink>submit a bug report</issueLink>.": "%(errcode)s wurde, beim Versuch den Raum zu betreten, zurückgegeben. Wenn du denkst dass diese Meldung nicht korrekt ist, <issueLink>erstelle bitte einen Fehlerbericht</issueLink>.",
|
||||
"Your messages are secured and only you and the recipient have the unique keys to unlock them.": "Diese Nachrichten sind verschlüsselt und nur du und der Empfänger können sie lesen.",
|
||||
"Verify User": "Benutzer verifizieren",
|
||||
"For extra security, verify this user by checking a one-time code on both of your devices.": "Für zusätzliche Sicherheit verifiziere diesen Benutzer durch Vergleichen eines Einmal-Codes auf euren beiden Geräten.",
|
||||
"The homeserver the user you’re verifying is connected to": "Der Heimserver, an dem der zu verifizierende Benutzer angemeldet ist",
|
||||
"If you can't scan the code above, verify by comparing unique emoji.": "Wenn du den obigen Code nicht scannen kannst, verifiziere stattdessen durch den Emoji-Vergleich.",
|
||||
"Verify all users in a room to ensure it's secure.": "Verifiziere alle Benutzer in einem Raum, um die vollständige Sicherheit zu gewährleisten.",
|
||||
"Your user ID": "Deine Benutzer-ID",
|
||||
"Failed to invite the following users to chat: %(csvUsers)s": "Einladen der folgenden Benutzer fehlgeschlagen: %(csvUsers)s",
|
||||
"Something went wrong trying to invite the users.": "Beim Einladen der Benutzer lief etwas schief.",
|
||||
"Failed to find the following users": "Folgende Benutzer konnten nicht gefunden werden",
|
||||
"The following users might not exist or are invalid, and cannot be invited: %(csvNames)s": "Folgende Benutzer konnten nicht eingeladen werden, da sie nicht existieren oder ungültig sind: %(csvNames)s",
|
||||
"Automatically invite users": "Benutzer automatisch einladen",
|
||||
"User Status": "Benutzerstatus",
|
||||
"Verifying this user will mark their session as trusted, and also mark your session as trusted to them.": "Wenn du diesen Benutzer verifizierst, werden seine Sitzungen für dich und deine Sitzungen für ihn als vertrauenswürdig markiert.",
|
||||
"A widget located at %(widgetUrl)s would like to verify your identity. By allowing this, the widget will be able to verify your user ID, but not perform actions as you.": "Ein Widget unter %(widgetUrl)s möchte deine Identität überprüfen. Wenn du dies zulässt, kann das Widget deine Benutzer-ID überprüfen, jedoch keine Aktionen in deinem Namen ausführen.",
|
||||
"User Autocomplete": "Benutzer-Auto-Vervollständigung",
|
||||
"Jump to start/end of the composer": "Springe zum Anfang/Ende der Nachrichteneingabe",
|
||||
"Message bubbles": "Sprechblasen",
|
||||
"Enable advanced debugging for the room list": "Erweiterte Fehlersuche für die Raumliste aktivieren",
|
||||
"Enable experimental, compact IRC style layout": "Kompaktes, experimentelles Layout im IRC-Stil aktivieren",
|
||||
"Enable layout with message bubbles": "Layout mit Sprechblasen aktivieren",
|
||||
"Show message bubbles on one side only": "Sprechblasen nur auf einer Seite anzeigen",
|
||||
"Show message bubbles depending on the width either on both sides or only on one side": "Sprechblasen abhänging von der Breite auf beiden Seiten oder nur einer Seite anzeigen",
|
||||
"%(brand)s can't securely cache encrypted messages locally while running in a web browser. Use <desktopLink>%(brand)s Desktop</desktopLink> for encrypted messages to appear in search results.": "%(brand)s kann verschlüsselte Nachrichten nicht sicher während der Ausführung im Browser durchsuchen. Benutze <desktopLink>%(brand)s Desktop</desktopLink>, um verschlüsselte Nachrichten in den Suchergebnissen angezeigt zu bekommen.",
|
||||
"Use default": "Standardeinstellungen benutzen",
|
||||
"Your firewall or anti-virus is blocking the request.": "Deine Firewall oder dein Antivirenprogramm blockiert die Anfrage.",
|
||||
"Block anyone not part of %(serverName)s from ever joining this room.": "Betreten nur für Benutzer von %(serverName)s erlauben.",
|
||||
"Start a conversation with someone using their name, username (like <userId/>) or email address. This won't invite them to %(communityName)s. To invite someone to %(communityName)s, click <a>here</a>.": "Starte ein Gespräch mit jemandem unter Verwendung seines/ihres Namens, Benutzernamens (wie <userId/>) oder E-Mail-Adresse. Dadurch werden sie nicht zu %(communityName)s eingeladen. Klicke hier <a>hier</a>, um jemanden zu %(communityName)s einzuladen.",
|
||||
"User settings": "Benutzer-Einstellungen",
|
||||
"Community and user menu": "Community- und Benutzer-Menü",
|
||||
"Render LaTeX maths in messages": "LaTeX-Matheformeln in Nachrichten anzeigen",
|
||||
"Use email to optionally be discoverable by existing contacts.": "Nutze optional eine E-Mail-Adresse, um von Benutzern gefunden werden zu können.",
|
||||
"Use email or phone to optionally be discoverable by existing contacts.": "Nutze optional eine E-Mail-Adresse oder Telefonnummer, um von Benutzern gefunden werden zu können.",
|
||||
"Host account on": "Benutzerkonto betreiben auf",
|
||||
"A call can only be transferred to a single user.": "Ein Anruf kann nur auf einen einzelnen Benutzer übertragen werden.",
|
||||
"Change which room, message, or user you're viewing": "Ändere, welchen Raum, welche Nachricht oder welchen Benutzer du siehst",
|
||||
"Unable to look up phone number": "Telefonnummer kann nicht gefunden werden",
|
||||
"The widget will verify your user ID, but won't be able to perform actions for you:": "Das Widget überprüft deine Benutzer-ID, kann jedoch keine Aktionen für dich ausführen:",
|
||||
"Abort": "Abbrechen",
|
||||
"Add existing room": "Existierenden Raum hinzufügen"
|
||||
}
|
7
i18n-overlays/matrix-react-sdk/en_EN.json
Normal file
7
i18n-overlays/matrix-react-sdk/en_EN.json
Normal file
@ -0,0 +1,7 @@
|
||||
{
|
||||
"Enable layout with message bubbles": "Enable layout with message bubbles",
|
||||
"Show message bubbles on one side only": "Show message bubbles on one side only",
|
||||
"Show message bubbles depending on the width either on both sides or only on one side": "Show message bubbles depending on the width either on both sides or only on one side",
|
||||
"Message bubbles": "Message bubbles",
|
||||
"Normal priority": "Normal priority"
|
||||
}
|
25
local-pkgbuild-template/PKGBUILD
Normal file
25
local-pkgbuild-template/PKGBUILD
Normal file
@ -0,0 +1,25 @@
|
||||
# Maintainer: su-ex <codeworks@supercable.onl>
|
||||
# Maintainer: SpiritCroc <aur@spiritcroc.de>
|
||||
# Contributor: David Mehren <david.mehren@udo.edu>
|
||||
|
||||
pkgname=---appName----git
|
||||
_pkgver=---version---
|
||||
pkgver=${_pkgver//-/.}
|
||||
pkgrel=1
|
||||
pkgdesc="SchildiChat is a Matrix client based on Element with a more traditional instant messaging experience."
|
||||
arch=('x86_64')
|
||||
url="https://schildi.chat"
|
||||
license=('Apache')
|
||||
depends=('sqlcipher')
|
||||
provides=('---appName---')
|
||||
conflicts=('---appName---')
|
||||
source=("---debName---"
|
||||
"---appName---.sh")
|
||||
sha256sums=('SKIP'
|
||||
'SKIP')
|
||||
|
||||
package() {
|
||||
msg2 "Extracting the data.tar.xz..."
|
||||
bsdtar -xf data.tar.xz -C "$pkgdir/"
|
||||
install -Dm755 "${srcdir}"/---appName---.sh "${pkgdir}"/usr/bin/---appName---
|
||||
}
|
3
local-pkgbuild-template/schildichat-desktop.sh
Normal file
3
local-pkgbuild-template/schildichat-desktop.sh
Normal file
@ -0,0 +1,3 @@
|
||||
#!/bin/sh
|
||||
|
||||
exec "/opt/---productName---/---appName---" "$@"
|
Submodule matrix-js-sdk updated: 79a5b44eb5...a563025c04
Submodule matrix-react-sdk updated: 2a308ab739...60ac2184de
@ -2,6 +2,10 @@
|
||||
|
||||
SCHILDI_ROOT="$(dirname "$(realpath "$0")")"
|
||||
|
||||
i18n_helper_path="$SCHILDI_ROOT/i18n-helper/index.js"
|
||||
i18n_path="src/i18n/strings"
|
||||
i18n_overlay_path="$SCHILDI_ROOT/i18n-overlays"
|
||||
|
||||
add_upstream() {
|
||||
if git remote | grep -q upstream; then
|
||||
echo "Remote named upstream already exists!"
|
||||
@ -52,3 +56,63 @@ check_branch() {
|
||||
ensure_yes "$repo_name not in branch $1. Continue?"
|
||||
fi
|
||||
}
|
||||
|
||||
check_clean_git() {
|
||||
# Require clean git state
|
||||
uncommitted=`git status --porcelain`
|
||||
if [ ! -z "$uncommitted" ]; then
|
||||
echo "Uncommitted changes are present, please commit first!"
|
||||
exit 1
|
||||
fi
|
||||
}
|
||||
|
||||
revert_i18n_changes() {
|
||||
local i18n_path="$1"
|
||||
local skip_commit="$2"
|
||||
|
||||
git checkout upstream/master -- "$i18n_path"
|
||||
|
||||
if [[ "$skip_commit" != [Yy]* ]]; then
|
||||
git commit -m "Automatic i18n reversion" || true
|
||||
fi
|
||||
}
|
||||
|
||||
apply_i18n_changes() {
|
||||
local i18n_path="$1"
|
||||
|
||||
git add "$i18n_path"
|
||||
git commit -m "Automatic i18n adjustment" || true
|
||||
}
|
||||
|
||||
automatic_i18n_reversion() {
|
||||
local skip_commit="$1"
|
||||
|
||||
pushd "$SCHILDI_ROOT/matrix-react-sdk" > /dev/null
|
||||
revert_i18n_changes "$i18n_path" $skip_commit
|
||||
popd > /dev/null
|
||||
|
||||
pushd "$SCHILDI_ROOT/element-web" > /dev/null
|
||||
revert_i18n_changes "$i18n_path" $skip_commit
|
||||
popd > /dev/null
|
||||
|
||||
pushd "$SCHILDI_ROOT/element-desktop" > /dev/null
|
||||
revert_i18n_changes "$i18n_path" $skip_commit
|
||||
popd > /dev/null
|
||||
}
|
||||
|
||||
automatic_i18n_adjustment() {
|
||||
node "$i18n_helper_path" "$SCHILDI_ROOT/matrix-react-sdk/$i18n_path" "$i18n_overlay_path/matrix-react-sdk"
|
||||
pushd "$SCHILDI_ROOT/matrix-react-sdk" > /dev/null
|
||||
apply_i18n_changes "$i18n_path"
|
||||
popd > /dev/null
|
||||
|
||||
node "$i18n_helper_path" "$SCHILDI_ROOT/element-web/$i18n_path" "$i18n_overlay_path/element-web"
|
||||
pushd "$SCHILDI_ROOT/element-web" > /dev/null
|
||||
apply_i18n_changes "$i18n_path"
|
||||
popd > /dev/null
|
||||
|
||||
node "$i18n_helper_path" "$SCHILDI_ROOT/element-desktop/$i18n_path" "$i18n_overlay_path/element-desktop"
|
||||
pushd "$SCHILDI_ROOT/element-desktop" > /dev/null
|
||||
apply_i18n_changes "$i18n_path"
|
||||
popd > /dev/null
|
||||
}
|
||||
|
@ -9,12 +9,30 @@ pushd "$mydir" > /dev/null
|
||||
|
||||
source ./merge_helpers.sh
|
||||
|
||||
# Check branch
|
||||
check_branch $branch
|
||||
forall_repos check_branch $branch
|
||||
|
||||
# Ensure clean git state
|
||||
forall_repos check_clean_git
|
||||
|
||||
# Automatic i18n reversion
|
||||
automatic_i18n_reversion
|
||||
|
||||
# Merge
|
||||
forall_repos git fetch upstream
|
||||
forall_repos git merge upstream/master
|
||||
|
||||
./setup.sh
|
||||
# Refresh environment
|
||||
make clean
|
||||
make setup
|
||||
|
||||
# Automatic i18n adjustment
|
||||
automatic_i18n_adjustment
|
||||
|
||||
# Automatic theme update
|
||||
pushd "matrix-react-sdk" > /dev/null
|
||||
./theme.sh
|
||||
popd > /dev/null
|
||||
|
||||
popd > /dev/null
|
||||
|
25
regenerate_i18n.sh
Executable file
25
regenerate_i18n.sh
Executable file
@ -0,0 +1,25 @@
|
||||
#!/bin/bash
|
||||
|
||||
set -e
|
||||
|
||||
mydir="$(dirname "$(realpath "$0")")"
|
||||
branch=${BRANCH:-"sc"}
|
||||
|
||||
pushd "$mydir" > /dev/null
|
||||
|
||||
source ./merge_helpers.sh
|
||||
|
||||
# Check branch
|
||||
check_branch $branch
|
||||
forall_repos check_branch $branch
|
||||
|
||||
# Ensure clean git state
|
||||
forall_repos check_clean_git
|
||||
|
||||
# Automatic i18n reversion
|
||||
automatic_i18n_reversion y
|
||||
|
||||
# Automatic i18n adjustment
|
||||
automatic_i18n_adjustment
|
||||
|
||||
popd > /dev/null
|
Binary file not shown.
Before Width: | Height: | Size: 87 KiB After Width: | Height: | Size: 293 KiB |
BIN
screenshots/2.png
Normal file
BIN
screenshots/2.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 266 KiB |
Reference in New Issue
Block a user