From 48537d7bf8a3edbfac153847b46230b51d346c04 Mon Sep 17 00:00:00 2001 From: hazzuk Date: Tue, 17 Dec 2024 22:13:02 +0000 Subject: [PATCH 1/7] chore(license): add elecord logo license --- LOGO_LICENSE.txt | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 LOGO_LICENSE.txt diff --git a/LOGO_LICENSE.txt b/LOGO_LICENSE.txt new file mode 100644 index 00000000000..5014d82b54b --- /dev/null +++ b/LOGO_LICENSE.txt @@ -0,0 +1,17 @@ +Elecord Logo +Copyright (c) 2024 hazzuk + +The Elecord logos contained in this repository are not part of the AGPL-3.0 or GPL-3.0 license. + +Third parties may use the Elecord logos under these conditions: + +- The Elecord logos can only be used to point to Elecord. When used with a + link on a web page, it should point to the URL https://elecord.app/. +- You will visualize and promote your own branding more prominent than you use + the Elecord logos. The Elecord logos can only be used as a secondary + brand, which means it has to be clear for an average viewer that this is not + an official Elecord website, publication or product. +- The Elecord logos can only be used unaltered, without fancy enhancements, + in original colors, original typography. + +Any and all other unauthorized uses are prohibited. From 1a1d2f5efbe34d3acfce075719c91f56d061c6d9 Mon Sep 17 00:00:00 2001 From: hazzuk Date: Tue, 17 Dec 2024 22:16:07 +0000 Subject: [PATCH 2/7] feat(credits): update settings menu legal text Now includes elecord, element, elecord logo and corrected default cover photo links. --- .../tabs/user/HelpUserSettingsTab.tsx | 104 +++++++++++++++++- src/i18n/strings/en_EN.json | 4 +- 2 files changed, 102 insertions(+), 6 deletions(-) diff --git a/src/components/views/settings/tabs/user/HelpUserSettingsTab.tsx b/src/components/views/settings/tabs/user/HelpUserSettingsTab.tsx index 7866131a01e..d160c8cd456 100644 --- a/src/components/views/settings/tabs/user/HelpUserSettingsTab.tsx +++ b/src/components/views/settings/tabs/user/HelpUserSettingsTab.tsx @@ -114,12 +114,74 @@ export default class HelpUserSettingsTab extends React.Component
  • {_t( - "credits|default_cover_photo", + "credits|elecord_web", {}, { - photo: (sub) => ( + elecord: (sub) => ( + + {sub} + + ), + author1: (sub) => ( + + {sub} + + ), + element: (sub) => ( + + {sub} + + ), + author2: (sub) => ( + + {sub} + + ), + terms1: (sub) => ( + + {sub} + + ), + terms2: (sub) => ( + {sub} + + ), + }, + )} +
    • +
  • + {_t( + "credits|elecord_logo", + {}, + { + logo: (sub) => ( + @@ -127,11 +189,43 @@ export default class HelpUserSettingsTab extends React.Component ), author: (sub) => ( - {sub} + + {sub} + ), terms: (sub) => ( + {sub} + + ), + }, + )} +
    • +
  • + {_t( + "credits|default_cover_photo", + {}, + { + author: (sub) => ( + + {sub} + + ), + unsplash: (sub) => ( + diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json index 49f82a62ec1..2f6c5385e30 100644 --- a/src/i18n/strings/en_EN.json +++ b/src/i18n/strings/en_EN.json @@ -726,7 +726,9 @@ "subspace_join_rule_restricted_description": "Anyone in will be able to find and join." }, "credits": { - "default_cover_photo": "The default cover photo is © Jesús Roncero used under the terms of CC-BY-SA 4.0.", + "elecord_web": "The elecord-web app is © hazzuk provided under the terms of the underlying element-web source code by Element, licensed AGPLv3 or GPLv3.", + "elecord_logo": "The elecord logo is © hazzuk used under the terms of the elecord logo license.", + "default_cover_photo": "The default cover photo by Felix Mittermeier on Unsplash.", "twemoji": "The Twemoji emoji art is © Twitter, Inc and other contributors used under the terms of CC-BY 4.0.", "twemoji_colr": "The twemoji-colr font is © Mozilla Foundation used under the terms of Apache 2.0." }, From c6ad58fdd1221e98403ddd7bf282060a3678ee32 Mon Sep 17 00:00:00 2001 From: hazzuk Date: Tue, 17 Dec 2024 22:44:19 +0000 Subject: [PATCH 3/7] fix(credits): adjust wording of legal text --- .../views/settings/tabs/user/HelpUserSettingsTab.tsx | 2 +- src/i18n/strings/en_EN.json | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/components/views/settings/tabs/user/HelpUserSettingsTab.tsx b/src/components/views/settings/tabs/user/HelpUserSettingsTab.tsx index d160c8cd456..ce0497cbabf 100644 --- a/src/components/views/settings/tabs/user/HelpUserSettingsTab.tsx +++ b/src/components/views/settings/tabs/user/HelpUserSettingsTab.tsx @@ -181,7 +181,7 @@ export default class HelpUserSettingsTab extends React.Component { logo: (sub) => ( diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json index 2f6c5385e30..8c5ab0b2e3a 100644 --- a/src/i18n/strings/en_EN.json +++ b/src/i18n/strings/en_EN.json @@ -726,11 +726,11 @@ "subspace_join_rule_restricted_description": "Anyone in will be able to find and join." }, "credits": { - "elecord_web": "The elecord-web app is © hazzuk provided under the terms of the underlying element-web source code by Element, licensed AGPLv3 or GPLv3.", - "elecord_logo": "The elecord logo is © hazzuk used under the terms of the elecord logo license.", - "default_cover_photo": "The default cover photo by Felix Mittermeier on Unsplash.", - "twemoji": "The Twemoji emoji art is © Twitter, Inc and other contributors used under the terms of CC-BY 4.0.", - "twemoji_colr": "The twemoji-colr font is © Mozilla Foundation used under the terms of Apache 2.0." + "elecord_web": "The elecord-web app is © hazzuk and provided under the terms of the underlying element-web project source code by Element. Licensed under AGPLv3 or GPLv3.", + "elecord_logo": "The elecord logo and it's derivatives are © hazzuk used under the terms of the elecord logo license.", + "default_cover_photo": "The default cover photo is by Felix Mittermeier on Unsplash.", + "twemoji": "The Twemoji emoji art is © Twitter, Inc and other contributors used under the terms of the CC-BY 4.0 license.", + "twemoji_colr": "The twemoji-colr font is © Mozilla Foundation used under the terms of the Apache 2.0 license." }, "desktop_default_device_name": "%(brand)s Desktop: %(platformName)s", "devtools": { From bd2be6650ad38268391c46a143a7fdae66b3db57 Mon Sep 17 00:00:00 2001 From: hazzuk Date: Tue, 17 Dec 2024 22:54:33 +0000 Subject: [PATCH 4/7] feat(credits): add elecord mono icon --- .../views/settings/tabs/user/HelpUserSettingsTab.tsx | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/components/views/settings/tabs/user/HelpUserSettingsTab.tsx b/src/components/views/settings/tabs/user/HelpUserSettingsTab.tsx index ce0497cbabf..a1a40525766 100644 --- a/src/components/views/settings/tabs/user/HelpUserSettingsTab.tsx +++ b/src/components/views/settings/tabs/user/HelpUserSettingsTab.tsx @@ -110,6 +110,9 @@ export default class HelpUserSettingsTab extends React.Component // Also,   is ugly but necessary. return ( +
    + +
    • From 084e0884d1df9e1e8ce1c2c2c68f07e85d2a6de5 Mon Sep 17 00:00:00 2001 From: hazzuk Date: Tue, 17 Dec 2024 23:13:22 +0000 Subject: [PATCH 5/7] fix(credits): remove element faq section --- src/components/views/settings/tabs/user/HelpUserSettingsTab.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/views/settings/tabs/user/HelpUserSettingsTab.tsx b/src/components/views/settings/tabs/user/HelpUserSettingsTab.tsx index a1a40525766..b1288137a1e 100644 --- a/src/components/views/settings/tabs/user/HelpUserSettingsTab.tsx +++ b/src/components/views/settings/tabs/user/HelpUserSettingsTab.tsx @@ -355,7 +355,7 @@ export default class HelpUserSettingsTab extends React.Component {bugReportingSection} - + {/* */} From bf55aa018061836c6a7bb7041eb5a96ef2358a9a Mon Sep 17 00:00:00 2001 From: hazzuk Date: Tue, 17 Dec 2024 23:14:01 +0000 Subject: [PATCH 6/7] refactor(credits): move elecord legal text --- .../tabs/user/HelpUserSettingsTab.tsx | 124 +++++++++--------- 1 file changed, 62 insertions(+), 62 deletions(-) diff --git a/src/components/views/settings/tabs/user/HelpUserSettingsTab.tsx b/src/components/views/settings/tabs/user/HelpUserSettingsTab.tsx index b1288137a1e..df34308c910 100644 --- a/src/components/views/settings/tabs/user/HelpUserSettingsTab.tsx +++ b/src/components/views/settings/tabs/user/HelpUserSettingsTab.tsx @@ -114,69 +114,69 @@ export default class HelpUserSettingsTab extends React.Component + + {_t( + "credits|elecord_web", + {}, + { + elecord: (sub) => ( + + {sub} + + ), + author1: (sub) => ( + + {sub} + + ), + element: (sub) => ( + + {sub} + + ), + author2: (sub) => ( + + {sub} + + ), + terms1: (sub) => ( + + {sub} + + ), + terms2: (sub) => ( + + {sub} + + ), + }, + )} +
        -
      • - {_t( - "credits|elecord_web", - {}, - { - elecord: (sub) => ( - - {sub} - - ), - author1: (sub) => ( - - {sub} - - ), - element: (sub) => ( - - {sub} - - ), - author2: (sub) => ( - - {sub} - - ), - terms1: (sub) => ( - - {sub} - - ), - terms2: (sub) => ( - - {sub} - - ), - }, - )} -
      • {_t( "credits|elecord_logo", From 96499214a7cd2902370aa37cc3928953cd197d43 Mon Sep 17 00:00:00 2001 From: hazzuk Date: Wed, 18 Dec 2024 18:17:00 +0000 Subject: [PATCH 7/7] refactor(icons): remove wrapping div --- .github/workflows/build.yml | 8 ++++---- src/components/structures/auth/LoginSplashView.tsx | 4 +--- .../views/settings/tabs/user/HelpUserSettingsTab.tsx | 4 +--- 3 files changed, 6 insertions(+), 10 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 791a6806866..99c178473c6 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -2,10 +2,10 @@ name: Build on: pull_request: {} # temporarily disable non-pr builds - # push: - # branches: [release, master] - # merge_group: - # types: [checks_requested] + push: + branches: [release, master] + merge_group: + types: [checks_requested] # develop pushes and repository_dispatch handled in build_develop.yaml env: # These must be set for fetchdep.sh to get the right branch diff --git a/src/components/structures/auth/LoginSplashView.tsx b/src/components/structures/auth/LoginSplashView.tsx index cdf6d6b8fa8..a097ef56607 100644 --- a/src/components/structures/auth/LoginSplashView.tsx +++ b/src/components/structures/auth/LoginSplashView.tsx @@ -74,9 +74,7 @@ export function LoginSplashView(props: Props): React.JSX.Element {
        {/* elecord mono icon on loading screen */} -
        - -
        + {_t("action|logout")} diff --git a/src/components/views/settings/tabs/user/HelpUserSettingsTab.tsx b/src/components/views/settings/tabs/user/HelpUserSettingsTab.tsx index df34308c910..87c44b23f26 100644 --- a/src/components/views/settings/tabs/user/HelpUserSettingsTab.tsx +++ b/src/components/views/settings/tabs/user/HelpUserSettingsTab.tsx @@ -110,9 +110,7 @@ export default class HelpUserSettingsTab extends React.Component // Also,   is ugly but necessary. return ( -
        - -
        + {_t(