Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
 Thore Cimbal
|
f47baa553a | ||
|
Thore Cimbal
|
1d5a136dff | ||
 Thore CimbalandClaude Fable 5
|
580827f7ca | ||
|
Thore CimbalandClaude Fable 5
|
6f33c7277a |
@@ -3,5 +3,7 @@
|
||||
"name": "threadnet-desktop",
|
||||
"productName": "ThreadNet",
|
||||
"description": "ThreadNet — powered by Element",
|
||||
"protocols": ["io.element.desktop", "element"]
|
||||
"protocols": ["io.element.desktop", "element"],
|
||||
"mac.icon": "build/icon.icns",
|
||||
"dmg.badgeIcon": "build/icon.icns"
|
||||
}
|
||||
|
||||
@@ -1,5 +1,9 @@
|
||||
{
|
||||
"brand": "aXion1337.Chat",
|
||||
"branding": {
|
||||
"auth_header_logo_url": "vector-icons/512.png",
|
||||
"logo_link_url": "https://axion1337.chat"
|
||||
},
|
||||
"default_server_config": {
|
||||
"m.homeserver": {
|
||||
"base_url": "https://matrix.axion1337.chat",
|
||||
|
||||
@@ -48,6 +48,8 @@ interface Variant extends Metadata {
|
||||
"appId": string;
|
||||
"linux.executableName"?: string;
|
||||
"linux.deb.name"?: string;
|
||||
"mac.icon"?: string;
|
||||
"dmg.badgeIcon"?: string;
|
||||
"protocols": string[];
|
||||
}
|
||||
|
||||
@@ -202,6 +204,31 @@ if (variant["linux.deb.name"]) {
|
||||
config.deb.fpm.push("--name", variant["linux.deb.name"]);
|
||||
}
|
||||
|
||||
/**
|
||||
* ThreadNet-Fork: Icon-Pfade fuer macOS ueberschreibbar machen.
|
||||
*
|
||||
* Upstream setzt `mac.icon` auf das Icon-Composer-Bundle `build/icon.icon`
|
||||
* (macOS 26). Dessen Verarbeitung ruft `actool` auf, das es nur mit dem vollen
|
||||
* Xcode gibt (~10 GB, App-Store-Login) - mit blossen CommandLineTools scheitert
|
||||
* damit JEDER macOS-Build, nicht nur das DMG:
|
||||
*
|
||||
* ⨯ Failed to check actool version. Is Xcode 26 or higher installed?
|
||||
*
|
||||
* Ueber die Variante laesst sich stattdessen das klassische `.icns` waehlen.
|
||||
* Bewusst hier als Variantenoption statt als Aenderung an den Defaults oben:
|
||||
* So bleibt Upstreams Wert unberuehrt und ein Upstream-Merge erzeugt keinen
|
||||
* Konflikt an dieser Zeile.
|
||||
*
|
||||
* Preis: kein macOS-26-Icon-Rendering. Ohne Xcode gaebe es ohnehin keinen Build.
|
||||
*/
|
||||
if (variant["mac.icon"]) {
|
||||
config.mac.icon = variant["mac.icon"];
|
||||
}
|
||||
|
||||
if (variant["dmg.badgeIcon"]) {
|
||||
config.dmg.badgeIcon = variant["dmg.badgeIcon"];
|
||||
}
|
||||
|
||||
/**
|
||||
* Allow specifying windows signing cert via env vars
|
||||
* @param {string} process.env.ED_SIGNTOOL_SUBJECT_NAME
|
||||
|
||||
@@ -125,7 +125,7 @@
|
||||
"@babel/preset-react": "^7.12.10",
|
||||
"@babel/preset-typescript": "^7.12.7",
|
||||
"@casualbot/jest-sonar-reporter": "2.7.0",
|
||||
"@sorb/threadnet-call-embedded": "0.19.2-threadnet.5",
|
||||
"@sorb/threadnet-call-embedded": "0.19.2-threadnet.7",
|
||||
"@element-hq/element-web-playwright-common": "workspace:*",
|
||||
"@fetch-mock/jest": "^0.2.20",
|
||||
"@jest/globals": "^30.2.0",
|
||||
|
||||
Binary file not shown.
|
After Width: | Height: | Size: 590 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 596 KiB |
@@ -20,7 +20,11 @@ export const DEFAULTS: DeepReadonly<IConfigOptions> = {
|
||||
branding: {
|
||||
logo_link_url: "https://element.io",
|
||||
auth_header_logo_url: "themes/element/img/logos/element-logo.svg",
|
||||
welcome_background_url: "themes/element/img/backgrounds/lake.jpg",
|
||||
// ThreadNet-Fork: eigenes Titelbild statt Elements lake.jpg. Steht hier im
|
||||
// Default und nicht in element-values.yaml, weil die Bilddatei ohnehin nur
|
||||
// ueber einen Build in den Container kommt - eine zusaetzliche Config-Zeile
|
||||
// waere eine zweite Stelle, die mitwandern muesste.
|
||||
welcome_background_url: "themes/element/img/backgrounds/alpenglow.jpg",
|
||||
},
|
||||
help_url: "https://element.io/help",
|
||||
help_encryption_url: "https://element.io/help#encryption",
|
||||
|
||||
@@ -106,34 +106,42 @@ export default class HelpUserSettingsTab extends React.Component<EmptyObject, IS
|
||||
<SettingsSubsection heading={_t("common|credits")}>
|
||||
<SettingsSubsectionText>
|
||||
<ul>
|
||||
{/* ThreadNet-Fork: eigenes Titelbild, deshalb eigene Danksagung.
|
||||
Bewusst OHNE _t(): der Schluessel credits|default_cover_photo
|
||||
steckt in 32 Sprachdateien, 31 davon nennen Elements Fotografen
|
||||
namentlich. Wuerden wir nur en/de anpassen, stuende in 29
|
||||
Sprachen eine falsche Attribution — und die uebrigen 29 koennen
|
||||
wir nicht pflegen, sie kommen aus Elements Uebersetzungsdienst.
|
||||
Ein Fotografenname und eine Lizenzbezeichnung werden ohnehin
|
||||
nicht uebersetzt. Der ungenutzte Schluessel bleibt in den
|
||||
Sprachdateien stehen — ihn aus 32 Dateien zu entfernen waere
|
||||
Laerm im naechsten Upstream-Merge. */}
|
||||
<li>
|
||||
{_t(
|
||||
"credits|default_cover_photo",
|
||||
{},
|
||||
{
|
||||
photo: (sub) => (
|
||||
<ExternalLink
|
||||
href="themes/element/img/backgrounds/lake.jpg"
|
||||
rel="noreferrer noopener"
|
||||
target="_blank"
|
||||
>
|
||||
{sub}
|
||||
</ExternalLink>
|
||||
),
|
||||
author: (sub) => (
|
||||
<ExternalLink href="https://www.flickr.com/golan">{sub}</ExternalLink>
|
||||
),
|
||||
terms: (sub) => (
|
||||
<ExternalLink
|
||||
href="https://creativecommons.org/licenses/by-sa/4.0/"
|
||||
rel="noreferrer noopener"
|
||||
target="_blank"
|
||||
>
|
||||
{sub}
|
||||
</ExternalLink>
|
||||
),
|
||||
},
|
||||
)}
|
||||
The{" "}
|
||||
<ExternalLink
|
||||
href="themes/element/img/backgrounds/alpenglow.jpg"
|
||||
rel="noreferrer noopener"
|
||||
target="_blank"
|
||||
>
|
||||
default cover photo
|
||||
</ExternalLink>{" "}
|
||||
is by <ExternalLink href="https://unsplash.com/@heytowner">John Towner</ExternalLink> on{" "}
|
||||
<ExternalLink
|
||||
href="https://unsplash.com/photos/JgOeRuGD_Y4"
|
||||
rel="noreferrer noopener"
|
||||
target="_blank"
|
||||
>
|
||||
Unsplash
|
||||
</ExternalLink>
|
||||
, used under the{" "}
|
||||
<ExternalLink
|
||||
href="https://unsplash.com/license"
|
||||
rel="noreferrer noopener"
|
||||
target="_blank"
|
||||
>
|
||||
Unsplash License
|
||||
</ExternalLink>
|
||||
.
|
||||
</li>
|
||||
<li>
|
||||
{_t(
|
||||
|
||||
Generated
+5
-5
@@ -617,8 +617,8 @@ importers:
|
||||
specifier: ^5.0.0
|
||||
version: 5.2.1(encoding@0.1.13)(webpack@5.106.2)
|
||||
'@sorb/threadnet-call-embedded':
|
||||
specifier: 0.19.2-threadnet.5
|
||||
version: 0.19.2-threadnet.5
|
||||
specifier: 0.19.2-threadnet.7
|
||||
version: 0.19.2-threadnet.7
|
||||
'@stylistic/eslint-plugin':
|
||||
specifier: ^5.0.0
|
||||
version: 5.10.0(eslint@8.57.1)
|
||||
@@ -5003,8 +5003,8 @@ packages:
|
||||
'@sinonjs/fake-timers@15.1.1':
|
||||
resolution: {integrity: sha512-cO5W33JgAPbOh07tvZjUOJ7oWhtaqGHiZw+11DPbyqh2kHTBc3eF/CjJDeQ4205RLQsX6rxCuYOroFQwl7JDRw==}
|
||||
|
||||
'@sorb/threadnet-call-embedded@0.19.2-threadnet.5':
|
||||
resolution: {integrity: sha512-u2TG7i82ibkpHSH/s6xA4Q6BTJqITdYWyrVieTiRwnm2Z+SCn/GmPK8JZIp/uSnpMrl9619yp/6vDVtpDJsKZg==, tarball: https://rohana.axion1337.de/api/packages/sorb/npm/%40sorb%2Fthreadnet-call-embedded/-/0.19.2-threadnet.5/threadnet-call-embedded-0.19.2-threadnet.5.tgz}
|
||||
'@sorb/threadnet-call-embedded@0.19.2-threadnet.7':
|
||||
resolution: {integrity: sha512-2dBMVdlI7U8nlVCkOdOo/jfkVAZ6CNLUYWCzFnE/NDT+D9W2APeuxqFOGtUVRPwrV4JxST2Jd491QLiV8bZItA==, tarball: https://rohana.axion1337.de/api/packages/sorb/npm/%40sorb%2Fthreadnet-call-embedded/-/0.19.2-threadnet.7/threadnet-call-embedded-0.19.2-threadnet.7.tgz}
|
||||
|
||||
'@standard-schema/spec@1.1.0':
|
||||
resolution: {integrity: sha512-l2aFy5jALhniG5HgqrD6jXLi/rUWrKvqN/qJx6yoJsgKhblVd+iqqU4RCXavm/jPityDo5TCvKMnpjKnOriy0w==}
|
||||
@@ -17632,7 +17632,7 @@ snapshots:
|
||||
dependencies:
|
||||
'@sinonjs/commons': 3.0.1
|
||||
|
||||
'@sorb/threadnet-call-embedded@0.19.2-threadnet.5': {}
|
||||
'@sorb/threadnet-call-embedded@0.19.2-threadnet.7': {}
|
||||
|
||||
'@standard-schema/spec@1.1.0': {}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user