Riot → Element#14581
Merged
jryans merged 30 commits intoelement-hq:developfrom Jul 21, 2020
resynth1943:resynth1943-patch-riot-to-element
Merged
Riot → Element#14581jryans merged 30 commits intoelement-hq:developfrom resynth1943:resynth1943-patch-riot-to-element
jryans merged 30 commits intoelement-hq:developfrom
resynth1943:resynth1943-patch-riot-to-element
Conversation
resynth1943
commented
Jul 17, 2020
resynth1943
commented
Jul 17, 2020
| If Labs is enabled in the [Riot config](config.md), you can enable some of these features by going | ||
| If Labs is enabled in the [Element config](config.md), you can enable some of these features by going | ||
| to `Settings->Labs`. This list is non-exhaustive and subject to change, chat in | ||
| [#riot-web:matrix.org](https://matrix.to/#/#riot-web:matrix.org) for more information. |
Contributor
Author
There was a problem hiding this comment.
Should I change riot-web here?
Collaborator
There was a problem hiding this comment.
Yes, see also my review below.
resynth1943
commented
Jul 17, 2020
resynth1943
commented
Jul 17, 2020
resynth1943
commented
Jul 17, 2020
| 1. Press CTRL+SHIFT+I (I as in eye). | ||
| 2. Click the Memory tab. | ||
| 3. Select "Heap Snapshot" and the riot.im VM instance (not the indexeddb one). | ||
| 3. Select "Heap Snapshot" and the app.element.io VM instance (not the indexeddb one). |
Contributor
Author
There was a problem hiding this comment.
Was I correct to change this to app.element.io?
jryans
requested changes
Jul 17, 2020
Collaborator
jryans
left a comment
There was a problem hiding this comment.
Thanks, overall this looks great, thanks for working on it!
I added a few suggestions that would be good to apply, mainly for spots where the repo name makes more sense to me.
jryans
reviewed
Jul 17, 2020
Collaborator
|
@resynth1943 What are the issues you've tagged as "fixes" in the PR body...? They seem unrelated, maybe the wrong issue numbers? |
Collaborator
|
Looks like there's a conflict, you'll likely need to merge the develop branch into your PR branch and fix up the conflicts. |
Contributor
Author
|
I fixed that "fixes" thing just now. 😉 Thanks! |
Collaborator
|
I think the issues are still unrelated these docs updates, so I'll edit them out. |
Collaborator
|
Once you've got the one conflict resolved, please add a comment here, and I'll take another look. |
Co-authored-by: J. Ryan Stinnett <jryans@gmail.com>
Co-authored-by: J. Ryan Stinnett <jryans@gmail.com>
Co-authored-by: J. Ryan Stinnett <jryans@gmail.com>
Co-authored-by: J. Ryan Stinnett <jryans@gmail.com>
Co-authored-by: J. Ryan Stinnett <jryans@gmail.com>
Co-authored-by: J. Ryan Stinnett <jryans@gmail.com>
Co-authored-by: J. Ryan Stinnett <jryans@gmail.com>
Co-authored-by: J. Ryan Stinnett <jryans@gmail.com>
Co-authored-by: J. Ryan Stinnett <jryans@gmail.com>
Co-authored-by: J. Ryan Stinnett <jryans@gmail.com>
Contributor
Author
|
Not sure why it added them again... |
Contributor
Author
|
I seem to have fixed the merge conflict |
jryans
requested changes
Jul 17, 2020
jryans
approved these changes
Jul 21, 2020
Collaborator
jryans
left a comment
There was a problem hiding this comment.
Thanks, this looks ready to merge! 😄
MightyCreak
reviewed
Jul 28, 2020
| `config.json` and customising it: | ||
|
|
||
| For a good example, see https://riot.im/develop/config.json. | ||
| For a good example, see https;//develop.element.io/config.json. |
There was a problem hiding this comment.
There is a typo here: https;// -> https://
Contributor
Author
There was a problem hiding this comment.
Dang, good catch
Merged
refi64
added a commit
to refi64/riot-web-lc
that referenced
this pull request
Jul 28, 2020
[Full Changelog](element-hq/element-web@v1.7.1...v1.7.2) * Upgrade to React SDK 3.0.0 and JS SDK 8.0.0 * Update from Weblate [\element-hq#14778](element-hq#14778) * Capitalize letters [\element-hq#14566](element-hq#14566) * Configure eslint package and fix lint issues [\element-hq#14673](element-hq#14673) * Riot → Element [\element-hq#14581](element-hq#14581) * Remove labs info for the new room list [\element-hq#14603](element-hq#14603) * Convince Webpack to use development on CI [\element-hq#14593](element-hq#14593) * Move dev dep to the right place [\element-hq#14572](element-hq#14572) * Bump lodash from 4.17.15 to 4.17.19 [\element-hq#14552](element-hq#14552) * Update all mobile links to match marketing site [\element-hq#14541](element-hq#14541)
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
I've changed a lot of documentation that uses the name 'Riot', and replaced those references with Element.
These changes are (hopefully) purely documentation, they shouldn't break too much.