From 4d72aa22e30ad48121e97897e826b9a955ad3383 Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Tue, 24 Mar 2026 13:33:49 +0000 Subject: [PATCH] Update links to old repo Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> --- README.md | 2 +- apps/desktop/docs/config.md | 6 +++--- apps/desktop/docs/gdb.md | 2 +- apps/desktop/docs/native-node-modules.md | 4 ++-- apps/desktop/docs/packaging.md | 11 +---------- apps/web/element.io/README | 2 +- .../views/settings/EventIndexPanel.tsx | 2 +- .../__snapshots__/EventIndexPanel-test.tsx.snap | 2 +- docs/config.md | 2 +- docs/feature-flags.md | 16 ++++++++-------- docs/native-node-modules.md | 3 --- docs/release.md | 10 ---------- 12 files changed, 20 insertions(+), 42 deletions(-) delete mode 100644 docs/native-node-modules.md diff --git a/README.md b/README.md index c236b953dc..3a18763b13 100644 --- a/README.md +++ b/README.md @@ -72,7 +72,7 @@ Element can also be run as a desktop app, wrapped in Electron. You can download pre-built version from or, if you prefer, build it yourself. -To build it yourself, follow the instructions at . +To build it yourself, follow the instructions at . Many thanks to @aviraldg for the initial work on the Electron integration. diff --git a/apps/desktop/docs/config.md b/apps/desktop/docs/config.md index 9746ee9722..c8c9387f10 100644 --- a/apps/desktop/docs/config.md +++ b/apps/desktop/docs/config.md @@ -4,12 +4,12 @@ All Element Web options documented [here](https://github.com/vector-im/element-w --- -The app contains a configuration file specified at build time using [these instructions](https://github.com/vector-im/element-desktop/#config). -This config can be overwritten by the end using by creating a `config.json` file at the paths described [here](https://github.com/vector-im/element-desktop/#user-specified-configjson). +The app contains a configuration file specified at build time using [these instructions](https://github.com/element-hq/element-web/blob/develop/apps/desktop/README.md#config). +This config can be overwritten by the end using by creating a `config.json` file at the paths described [here](https://github.com/element-hq/element-web/blob/develop/apps/desktop/README.md#user-specified-configjson). After changing the config, the app will need to be exited fully (including via the task tray) and re-started. --- -1. `update_base_url`: Specifies the URL of the update server, see [document](https://github.com/vector-im/element-desktop/blob/develop/docs/updates.md). +1. `update_base_url`: Specifies the URL of the update server, see [document](https://github.com/element-hq/element-web/blob/develop/apps/desktop/docs/updates.md). 2. `web_base_url`: Specifies the Element Web URL when performing actions such as popout widget. Defaults to `https://app.element.io/`. diff --git a/apps/desktop/docs/gdb.md b/apps/desktop/docs/gdb.md index 0fed3d65a8..94a9c1b545 100644 --- a/apps/desktop/docs/gdb.md +++ b/apps/desktop/docs/gdb.md @@ -13,7 +13,7 @@ you will need debug symbols. 2. Figure out which version of Electron your Element-Desktop is based on. The best way to do this is to figure out the version of Element-Desktop, then look at - [`package.json`](https://github.com/element-hq/element-desktop/blob/develop/package.json) + [`package.json`](https://github.com/element-hq/element-web/blob/develop/apps/desktop/package.json) for the corresponding version. There will be an entry within `dependencies` of `electron`: the value will tell you the version of Electron that was used for that version of Element-Desktop. diff --git a/apps/desktop/docs/native-node-modules.md b/apps/desktop/docs/native-node-modules.md index b029a7bbd9..dac81ede20 100644 --- a/apps/desktop/docs/native-node-modules.md +++ b/apps/desktop/docs/native-node-modules.md @@ -33,13 +33,13 @@ pnpm link docker/node_modules/matrix-seshat ... and build the app with `pnpm build` or run it with `pnpm start`. -(See also https://github.com/element-hq/element-desktop#docker.) +(See also https://github.com/element-hq/element-web/blob/develop/apps/desktop/README.md#docker.) ## Building Install the pre-requisites for your system: -- [Windows pre-requisites](https://github.com/vector-im/element-desktop/blob/develop/docs/windows-requirements.md) +- [Windows pre-requisites](https://github.com/element-hq/element-web/blob/develop/apps/desktop/docs/windows-requirements.md) - Linux: TODO. Using the docker environment as above is recommended. - OS X: TODO diff --git a/apps/desktop/docs/packaging.md b/apps/desktop/docs/packaging.md index eec14f31d9..ba6c42afdc 100644 --- a/apps/desktop/docs/packaging.md +++ b/apps/desktop/docs/packaging.md @@ -13,16 +13,7 @@ Simply go to https://github.com/vector-im/element-desktop/actions/workflows/buil ## Packaging releases -**Don't do this for RCs! We don't build Element Desktop for RCs.** - -For releasing Element Desktop, we assume the following prerequisites: - -- a tag of `element-desktop` repo with the Element Desktop version to be released set in `package.json`. -- an Element Web tarball published to GitHub with a matching version number. - -**Both of these are done automatically when you run the release automation.** - -The packaging is kicked off automagically for you when a Github Release for Element Desktop is published. +The packaging is kicked off automagically for you when a Github Release for Element Web is published. ### More detail on the github actions diff --git a/apps/web/element.io/README b/apps/web/element.io/README index 4d8fad6361..8691cf9dd8 100644 --- a/apps/web/element.io/README +++ b/apps/web/element.io/README @@ -6,7 +6,7 @@ official element.io distribution, but these files may be useful if you want to inspect the configuration used there. Element Desktop uses a separate config (see -https://github.com/element-hq/element-desktop/tree/develop/element.io). +https://github.com/element-hq/element-web/tree/develop/apps/desktop/element.io). Deployment scripts (such as app/deploy.py) are meant to be run on the web server hosting the Element installation. diff --git a/apps/web/src/components/views/settings/EventIndexPanel.tsx b/apps/web/src/components/views/settings/EventIndexPanel.tsx index 98332dbe4f..24acd0f8a6 100644 --- a/apps/web/src/components/views/settings/EventIndexPanel.tsx +++ b/apps/web/src/components/views/settings/EventIndexPanel.tsx @@ -165,7 +165,7 @@ export default class EventIndexPanel extends React.Component when event indexing is supported but not installed Element is missing some components required for securely caching encrypted messages locally. If you'd like to experiment with this feature, build a custom Element Desktop with diff --git a/docs/config.md b/docs/config.md index cc67343a1e..2120ee7d37 100644 --- a/docs/config.md +++ b/docs/config.md @@ -537,7 +537,7 @@ decentralised. ## Desktop app configuration -See https://github.com/element-hq/element-desktop#user-specified-configjson +See https://github.com/element-hq/element-web/blob/develop/apps/desktop/README.md#user-specified-configjson ## UI Features diff --git a/docs/feature-flags.md b/docs/feature-flags.md index 54d54e3b1b..359146674a 100644 --- a/docs/feature-flags.md +++ b/docs/feature-flags.md @@ -64,9 +64,9 @@ The following lists a few common options. ## Enabling by default on develop and nightly Set the feature to `true` in the -[develop](https://github.com/element-hq/element-web/blob/develop/element.io/develop/config.json) +[develop](https://github.com/element-hq/element-web/blob/develop/apps/web/element.io/develop/config.json) and -[nightly](https://github.com/element-hq/element-desktop/blob/develop/element.io/nightly/config.json) +[nightly](https://github.com/element-hq/element-web/blob/develop/apps/desktop/element.io/nightly/config.json) configs: ```json @@ -78,9 +78,9 @@ configs: ## Enabling by default on staging, app, and release Set the feature to `true` in the -[staging / app](https://github.com/element-hq/element-web/blob/develop/element.io/app/config.json) +[staging / app](https://github.com/element-hq/element-web/blob/develop/apps/web/element.io/app/config.json) and -[release](https://github.com/element-hq/element-desktop/blob/develop/element.io/release/config.json) +[release](https://github.com/element-hq/element-web/blob/develop/apps/desktop/element.io/release/config.json) configs. **Note:** The above will only enable the feature for https://app.element.io and official Element @@ -104,10 +104,10 @@ If the feature is meant to be forced on (non-configurable): 2. Remove all `getValue` lines that test for the feature. 3. Remove the feature from the [labs documentation](https://github.com/element-hq/element-web/blob/develop/docs/labs.md) 4. If applicable, remove the feature state from - [develop](https://github.com/element-hq/element-web/blob/develop/element.io/develop/config.json), - [nightly](https://github.com/element-hq/element-desktop/blob/develop/element.io/nightly/config.json), - [staging / app](https://github.com/element-hq/element-web/blob/develop/element.io/app/config.json), + [develop](https://github.com/element-hq/element-web/blob/develop/apps/web/element.io/develop/config.json), + [nightly](https://github.com/element-hq/element-web/blob/develop/apps/desktop/element.io/nightly/config.json), + [staging / app](https://github.com/element-hq/element-web/blob/develop/apps/web/element.io/app/config.json), and - [release](https://github.com/element-hq/element-desktop/blob/develop/element.io/release/config.json) + [release](https://github.com/element-hq/element-web/blob/develop/apps/desktop/element.io/release/config.json) configs 5. Celebrate! 🥳 diff --git a/docs/native-node-modules.md b/docs/native-node-modules.md deleted file mode 100644 index 79311ab173..0000000000 --- a/docs/native-node-modules.md +++ /dev/null @@ -1,3 +0,0 @@ -# Native Node Modules - -This documentation moved to the [`element-desktop`](https://github.com/element-hq/element-desktop/blob/develop/docs/native-node-modules.md) repository. diff --git a/docs/release.md b/docs/release.md index 26b507c737..6d68aea3e5 100644 --- a/docs/release.md +++ b/docs/release.md @@ -84,7 +84,6 @@ This label will automagically convert to `X-Release-Blocker` at the conclusion o This release process revolves around our main repositories: -- [Element Desktop](https://github.com/element-hq/element-desktop/) - [Element Web](https://github.com/element-hq/element-web/) - [Matrix JS SDK](https://github.com/matrix-org/matrix-js-sdk/) @@ -119,7 +118,6 @@ flowchart TD subgraph Releasing R1[[Releasing matrix-js-sdk]] R2[[Releasing element-web]] - R3[[Releasing element-desktop]] R1 --> R2 --> R3 end @@ -204,12 +202,6 @@ switched back to the version of the dependency from the master branch to not lea - [ ] Make any changes to the release notes in the draft release as are necessary - **Do not click publish, only save draft** - [ ] Kick off a release using [the automation](https://github.com/element-hq/element-web/actions/workflows/release.yml) - making sure to select the right type of release. For anything other than an RC: choose final. You should not need to ever switch off either of the Publishing options. -### Element Desktop - -- [ ] Check the draft release which has been generated by [the automation](https://github.com/element-hq/element-desktop/actions/workflows/release-drafter.yml) -- [ ] Make any changes to the release notes in the draft release as are necessary - **Do not click publish, only save draft** -- [ ] Kick off a release using [the automation](https://github.com/element-hq/element-desktop/actions/workflows/release.yml) - making sure to select the right type of release. For anything other than an RC: choose final. You should not need to ever switch off either of the Publishing options. - # Deploying We ship the SDKs to npm, this happens as part of the release process. @@ -255,8 +247,6 @@ For the first RC of a given release cycle do these steps: - [ ] Go to the [element-web Renovate dashboard](https://github.com/element-hq/element-web/issues/22941) and click the checkbox to create/update its PRs. -- [ ] Go to the [element-desktop Renovate dashboard](https://github.com/element-hq/element-desktop/issues/465) and click the checkbox to create/update its PRs. - - [ ] Later, check back and merge the PRs that succeeded to build. The ones that failed will get picked up by the [maintainer](https://docs.google.com/document/d/1V5VINWXATMpz9UBw4IKmVVB8aw3CxM0Jt7igtHnDfSk/edit#). For final releases additionally do these steps: