e241da3af0
Fix diff wrong route offsets because of skipping a node insert
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-05-14 15:35:38 +01:00
4a8e642400
Merge pull request #4581 from matrix-org/bwindels/remove-asym-4s
...
Remove UI for upgrading 4S to symmetric encryption
2020-05-14 08:10:39 +00:00
9dd93f14ba
Merge pull request #4555 from matrix-org/travis/sso-xsigning
...
Add copy to SSO prompts during cross-signing setup
2020-05-13 15:33:09 -06:00
8e31040c1a
Merge pull request #4592 from matrix-org/dbkr/fix_persistent_widgets_desktop_2
...
Re-fix OpenID requests from widgets
2020-05-13 17:02:44 +01:00
50107ebe47
Re-fix OpenID requests from widgets
...
https://github.com/matrix-org/matrix-react-sdk/pull/4591 reverted
https://github.com/matrix-org/matrix-react-sdk/pull/4459 . We need
to pass both URLs as we need both the wURL (for the widget's 'identity'
ie. OpenID) and the URL that's actually in the iframe (for the
messaging).
2020-05-13 16:10:40 +01:00
ef2678db93
Merge pull request #4591 from matrix-org/dbkr/fix_persistent_widgets_desktop
...
Fix persistent widgets on desktop / http
2020-05-13 12:47:54 +01:00
92824411e8
Fix persistent widgets on desktop / http
...
WidgetMessaging needs the URL of the widget that gets rendered into
the iframe because that's where the postmessages will be coming from.
Fixes https://github.com/vector-im/riot-web/issues/13369
2020-05-13 12:33:10 +01:00
cda691e359
Tweak Yarn docs link post-review
2020-05-13 11:29:11 +01:00
c652d4f134
Merge pull request #4589 from chagai95/patch-2
...
Updated link and added:Yarn two is not yet used.
2020-05-13 11:26:43 +01:00
998b661796
Merge pull request #4578 from matrix-org/t3chguy/topic_dialog
...
Fix topic dialog not supporting escape as it didn't have a "Close"
2020-05-13 10:51:00 +01:00
77e32977dc
Merge pull request #4579 from matrix-org/t3chguy/create_room_public
...
Default to public room when creating room from room directory
2020-05-13 10:50:38 +01:00
d68b50feb6
Updated link and added:Yarn two is not yet used.
...
the link was broken and there was no mention of the version of yarn being used.
2020-05-13 11:49:26 +02:00
d63008f9c5
Merge pull request #4576 from matrix-org/t3chguy/kosovo2.0
...
Replace png flags and add Kosovo to country code dropdown
2020-05-13 09:58:10 +01:00
5783a9359e
Merge pull request #4583 from matrix-org/t3chguy/redactions-electron
...
Rename `trash (custom).svg` as electron doesn't like paths with spaces
2020-05-12 17:09:02 +01: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
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
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
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
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
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
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
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
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
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
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
6ea9aebda3
Add slash commands /query and /msg to match IRC
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-05-11 10:55:31 +01:00
159547e6f8
Merge pull request #4567 from RiotTranslateBot/weblate-riot-web-matrix-react-sdk
...
Update from Weblate
2020-05-11 10:18:23 +01:00
Michael Telatynski