33dd4ca8f6
Merge branch 'origin/develop' into Weblate.
2020-05-12 15:39:22 +00:00
ea502b83ff
Merge pull request #4582 from matrix-org/dbkr/fix_room_preview_signin_buttons
...
Fix sign in / up links on previewed rooms
2020-05-12 16:39:18 +01:00
004f75f289
Rename `trash (custom).svg` as electron doesn't like serving files with spaces
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-05-12 16:16:47 +01:00
03b10e7226
Fix sign in / up links on previewed rooms
...
They errored because the out-of-band data was assumed to be non-null,
but that's only present for 3rd party invites.
2020-05-12 15:24:12 +01:00
d49bc541af
Merge branch 'origin/develop' into Weblate.
2020-05-12 13:36:59 +00:00
8b8eb7d3c0
Merge pull request #4580 from matrix-org/dbkr/dont_npe_if_no_device
...
Avoid soft crash if unknown device in verification
2020-05-12 14:36:54 +01:00
a000be2b01
i18n
2020-05-12 14:03:40 +01:00
b3c641184b
remove obsolete strings
2020-05-12 14:54:49 +02:00
8a1b381635
remove UI for upgrading 4S to sym enc
2020-05-12 14:29:11 +02:00
ae2645b69b
Provide separate translatable for case where we have no device
2020-05-12 12:42:16 +01:00
3c5c7f56f3
Adjust comment
2020-05-12 11:14:05 +01:00
5c0920da42
Avoid soft crash if unknown device in verification
...
Rageshakes from the wild indicate that device was null here which
implies that we somehow did not know about the device when verifiying
it? Log and null-check to avoid a soft crash.
2020-05-12 11:05:30 +01:00
7fe40a0470
Default to public room when creating room from room directory
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-05-12 10:55:46 +01:00
3e3d537fec
Fix topic dialog not supporting escape as it didn't have a "Close"
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-05-12 10:51:27 +01:00
a565855770
Merge branch 'origin/develop' into Weblate.
2020-05-12 09:33:57 +00:00
ca30cf7ac9
Translated using Weblate (Korean)
...
Currently translated at 76.1% (1752 of 2303 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ko/
2020-05-12 09:33:57 +00:00
1f603090be
Translated using Weblate (Finnish)
...
Currently translated at 90.7% (2088 of 2303 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fi/
2020-05-12 09:33:56 +00:00
dba98e17da
Translated using Weblate (Estonian)
...
Currently translated at 44.5% (1024 of 2303 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/et/
2020-05-12 09:33:55 +00:00
4937543648
Translated using Weblate (Esperanto)
...
Currently translated at 100.0% (2303 of 2303 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eo/
2020-05-12 09:33:51 +00:00
7c9a9b223a
Translated using Weblate (Czech)
...
Currently translated at 93.5% (2154 of 2303 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/cs/
2020-05-12 09:33:50 +00:00
5faab32384
Merge pull request #4568 from matrix-org/t3chguy/cmds2
...
Add slash commands /query and /msg to match IRC
2020-05-12 10:33:44 +01:00
99aeb8388d
Update src/phonenumber.ts
...
Co-authored-by: Travis Ralston <travpc@gmail.com>
2020-05-12 10:29:06 +01:00
3fa13d7de3
Add comment for the regex
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-05-12 10:23:53 +01:00
21b3892b6d
Merge branch 'origin/develop' into Weblate.
2020-05-12 09:22:19 +00:00
422a22ab90
Merge pull request #4570 from matrix-org/t3chguy/rageshake_xsign_debug
...
Send cross-signing debug booleans over rageshake
2020-05-12 10:22:12 +01:00
03ad8a606a
Merge branch 'develop' into t3chguy/rageshake_xsign_debug
2020-05-12 09:44:49 +01:00
f2177901b0
Merge branch 'origin/develop' into Weblate.
2020-05-12 08:43:39 +00:00
ad2c9df271
Merge pull request #4575 from matrix-org/t3chguy/registration_disabled_prompt_server
...
Prompt user to specify an alternate server if theirs has registration off
2020-05-12 09:43:34 +01:00
b35e5d902c
Merge branch 'origin/develop' into Weblate.
2020-05-12 08:43:28 +00:00
b95d533c4a
Merge pull request #4573 from matrix-org/t3chguy/remove_recent_self
...
Don't try and redact redactions for "Remove recent messages"
2020-05-12 09:43:23 +01:00
df61420f82
Merge branch 'origin/develop' into Weblate.
2020-05-12 08:43:09 +00:00
aacc582b52
Merge pull request #4571 from matrix-org/t3chguy/view_source_edits
...
View Source should target the replacing event rather than the root one
2020-05-12 09:43:02 +01:00
1ba95851ad
Merge branch 'origin/develop' into Weblate.
2020-05-12 08:22:14 +00:00
03fce86699
Merge pull request #4569 from matrix-org/dbkr/key_backup_restore_reset_recovery
...
Fix passphrase reset in key backup restore dialog
2020-05-12 09:22:08 +01:00
1a713119d8
Add Kosovo as it is understood by google's libphonenumber
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-05-11 22:04:37 +01:00
3bb800bb81
Replace png flags with use of Twemoji
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-05-11 22:04:18 +01:00
2b4113a92e
Merge branch 'origin/develop' into Weblate.
2020-05-11 20:30:17 +00:00
58a5b7f154
Merge pull request #4556 from matrix-org/travis/fix-reset
...
Ensure key backup gets dealt with correctly during secret storage reset
2020-05-11 14:30:12 -06:00
c2dcb60f0b
Prompt user to specify an alternate server if their chosen one has registration disabled
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-05-11 20:10:45 +01:00
d100b39a83
Merge branch 'origin/develop' into Weblate.
2020-05-11 16:12:43 +00:00
c2fea7d4d8
Merge pull request #4565 from matrix-org/matthew/invite-npe
...
Fix crash for broken invites
2020-05-11 17:12:38 +01:00
f02ce176dd
Merge branches 'develop' and 'matthew/invite-npe' of github.com:matrix-org/matrix-react-sdk into matthew/invite-npe
2020-05-11 17:05:17 +01:00
858cb5f6bc
Merge branch 'origin/develop' into Weblate.
2020-05-11 15:55:19 +00:00
b1e266823f
Merge pull request #4572 from matrix-org/dbkr/rageshake_work_if_no_client
...
Fix rageshake with no matrix client
2020-05-11 16:55:14 +01:00
c0061e2f2a
Don't try and redact redactions for "Remove recent messages"
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-05-11 16:39:14 +01:00
f487c2b38c
Fix rageshake with no matrix client
...
We checked for the presence of a matrix client but then went and
called a method on it assuming it existed on the line below, so,
don't do that.
https://github.com/vector-im/riot-web/issues/13624 pointed this out
2020-05-11 16:21:08 +01:00
0e8bd59d2f
View Source should target the replacing event rather than the root one
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-05-11 15:43:34 +01:00
3e934c8081
Send cross-signing debug booleans over rageshake
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-05-11 15:17:25 +01:00
6486c74909
Fix passphrase reset in key backup restore dialog
...
We prompt to restore the key backup when bootstrapping if it's not
trusted, but the 'set up new recovery options' in this dialog just
sets up a new key backup which just goes back to trying to access
SSSS if cross-signing is enabled. This makes it reset the SSSS
passphase instead.
Fixes https://github.com/vector-im/riot-web/issues/13578
2020-05-11 14:21:59 +01:00
293bd15ee9
fix variable name shadowing
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-05-11 11:05:03 +01:00
Weblate