-
-
Notifications
You must be signed in to change notification settings - Fork 833
Part 2 of 3: Merge develop->experimental minus #2336 #2399
Conversation
Improve upload dialog ux
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
Currently translated at 64.8% (827 of 1276 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sq/
Currently translated at 70.6% (901 of 1276 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sq/
Currently translated at 74.7% (954 of 1276 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sq/
Currently translated at 74.7% (954 of 1276 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sq/
Currently translated at 74.7% (954 of 1276 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sq/
Currently translated at 76.4% (976 of 1276 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sq/
Currently translated at 81.8% (1045 of 1276 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sq/
Currently translated at 84.9% (1084 of 1276 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sq/
Currently translated at 88.7% (1133 of 1276 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sq/
Currently translated at 4.1% (53 of 1276 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hi/
Currently translated at 9.0% (116 of 1280 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hi/
Currently translated at 92.1% (1180 of 1281 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sq/
Currently translated at 100.0% (1281 of 1281 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
Currently translated at 97.9% (1255 of 1281 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sq/
…onse Handle well-known data in the login response
Add some logging for riot-web#7838
Co-Authored-By: turt2live <travpc@gmail.com>
Fetch matching e2e-test branch
If the current device hasn't verified the device that created the account's current key backup version, then the current device is won't use the key backup. This change adjusts an existing in-room reminder to do the right thing for this case by allowing the user to verify the device that created the key backup. Fixes element-hq/element-web#7902.
…ering Consistent flair ordering.
Signed-off-by: Stephen Solka <stephen0q@gmail.com>
Signed-off-by: Stephen Solka <stephen0q@gmail.com>
Signed-off-by: Stephen Solka <stephen0q@gmail.com>
Show in-room reminder when key backup creating device unverified
This reverts commit 96300b4.
(Waiting on conflicts.) |
In your first comment, maybe you mean experimental...travis/develop-for-real? |
Nope, trying to prove that this branch is current develop with only 1 added change. The way to do that is to show what it would look like if the branch were merged into develop instead. |
Okay, I've merged experimental into this branch so that it doesn't conflict. The only questionable merge conflict is how the custom status message stuff interacts with experimental, as it may break the layout. In addition to merging experimental into this branch, I've regenerated the language file so it is consistent going forward. I also didn't want to figure out which strings were no longer used in the merge and just accepted both sides of the conflict, making regeneration a requirement. See 01eacfa |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This looks sane to me, thanks! We agreed in chat that there may be a separate part to fix custom status.
This intentionally backs out #2336 because is not compatible with experimental. The remainder of this branch should be develop as it is today, as shown here: develop...travis/develop-for-real
Requires #2398