github/schildichat-desktop
1
0
Fork 1
mirror of https://github.com/SchildiChat/schildichat-desktop.git synced 2025-03-31 21:24:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

Update repo URLs to organization

Browse Source
This commit is contained in:
su-ex 2020-10-30 20:15:02 +01:00
parent 7391966cd7
commit 2c93b960f2
No known key found for this signature in database
GPG Key ID: D743C50C8B61984C
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
.gitmodules vendored
View File

@ -1,12 +1,12 @@
[submodule "matrix-js-sdk"] [submodule "matrix-js-sdk"]
path = matrix-js-sdk path = matrix-js-sdk
url = https://github.com/SpiritCroc/matrix-js-sdk.git url = https://github.com/SchildiChat/matrix-js-sdk.git
[submodule "matrix-react-sdk"] [submodule "matrix-react-sdk"]
path = matrix-react-sdk path = matrix-react-sdk
url = https://github.com/SpiritCroc/matrix-react-sdk.git url = https://github.com/SchildiChat/matrix-react-sdk.git
[submodule "element-web"] [submodule "element-web"]
path = element-web path = element-web
url = https://github.com/SpiritCroc/element-web.git url = https://github.com/SchildiChat/element-web.git
[submodule "element-desktop"] [submodule "element-desktop"]
path = element-desktop path = element-desktop
url = https://github.com/SpiritCroc/element-desktop.git url = https://github.com/SchildiChat/element-desktop.git

6
README.md
View File

@ -14,12 +14,12 @@ 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 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! if anybody wants to help improving it, contributions are welcome!
Downloads for Desktop: https://github.com/SpiritCroc/schildichat-desktop/releases <br/> Downloads for Desktop: https://github.com/SchildiChat/schildichat-desktop/releases <br/>
Hosted web variant: https://schildiweb.spiritcroc.de/ Hosted web variant: https://schildiweb.spiritcroc.de/
Feel free to [join the discussion on matrix](https://matrix.to/#/#schildichat-web:matrix.org). Feel free to [join the discussion on matrix](https://matrix.to/#/#schildichat-web:matrix.org).
<img src="https://raw.githubusercontent.com/SpiritCroc/schildichat-desktop/sc/screenshots/1.png"/> <img src="https://raw.githubusercontent.com/SchildiChat/schildichat-desktop/sc/screenshots/1.png"/>
# Building SchildiChat-Desktop # Building SchildiChat-Desktop
@ -52,7 +52,7 @@ $ source .bashrc
## Initial setup ## Initial setup
``` ```
git clone --recurse-submodules https://github.com/SpiritCroc/schildichat-desktop.git git clone --recurse-submodules https://github.com/SchildiChat/schildichat-desktop.git
cd schildichat-desktop cd schildichat-desktop
./setup.sh ./setup.sh
``` ```

4
merge_helpers.sh
View File

@ -10,10 +10,10 @@ add_upstream() {
local sc_remote="$(git remote -v|grep origin|grep fetch|sed 's|.*\t\(.*\) (fetch)|\1|')" local sc_remote="$(git remote -v|grep origin|grep fetch|sed 's|.*\t\(.*\) (fetch)|\1|')"
if echo "$sc_remote" | grep -q matrix; then if echo "$sc_remote" | grep -q matrix; then
# matrix.org repo # matrix.org repo
local upstream_remote="$(echo "$sc_remote" | sed 's|SpiritCroc|matrix-org|')" local upstream_remote="$(echo "$sc_remote" | sed 's|SchildiChat|matrix-org|')"
elif echo "$sc_remote" | grep -q element; then elif echo "$sc_remote" | grep -q element; then
# vector-im repo # vector-im repo
local upstream_remote="$(echo "$sc_remote" | sed 's|SpiritCroc|vector-im|')" local upstream_remote="$(echo "$sc_remote" | sed 's|SchildiChat|vector-im|')"
else else
echo "Don't know upstream repo for $sc_remote" echo "Don't know upstream repo for $sc_remote"
return 1 return 1