Commit graph

24280 commits

Author SHA1 Message Date
Jorik Schellekens
2e325191bc Merge remote-tracking branch 'nv/develop' into joriks/irc-ui 2020-05-19 17:18:36 +01:00
Jorik Schellekens
286828b3bb Disable irc mode in notifiactions panel 2020-05-19 16:15:13 +01:00
Jorik Schellekens
7bb7f30b8f missed one 2020-05-18 22:02:22 +01:00
Jorik Schellekens
bba6b2c441 Appease i18n 2020-05-18 17:06:54 +01:00
Jorik Schellekens
4deeef5fca Remove ability to remove avatars 2020-05-18 16:57:00 +01:00
Jorik Schellekens
5380e76b7b lint 2020-05-18 16:43:47 +01:00
Jorik Schellekens
17f535e5f8 Fix review problems
- removed superfluous position and classes
- fixed compact view
- fixed event list summary avatar and text overlap
- fixed a problem where the mention list refuses to load.
2020-05-18 16:37:10 +01:00
Travis Ralston
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
Jorik Schellekens
5c2abcf1a4 Show username on continuations 2020-05-13 17:05:37 +01:00
David Baker
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
David Baker
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
Jorik Schellekens
312b616d77 fix i18n 2020-05-13 14:11:16 +01:00
Jorik Schellekens
3f04f5163a Implement more nitpicks
- fix avatar inital aligment
- right align names
- set flair height to avatar's
- fix conditions for resizing to be more stable
2020-05-13 14:04:46 +01:00
David Baker
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
David Baker
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
J. Ryan Stinnett
cda691e359 Tweak Yarn docs link post-review 2020-05-13 11:29:11 +01:00
J. Ryan Stinnett
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
Michael Telatynski
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
Michael Telatynski
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
chagai95
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
Michael Telatynski
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
Jorik Schellekens
5029c3f143 Implement IRC draggable display name width 2020-05-13 02:16:43 +01:00
Michael Telatynski
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
David Baker
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
Michael Telatynski
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
David Baker
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
David Baker
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
David Baker
a000be2b01 i18n 2020-05-12 14:03:40 +01:00
David Baker
ae2645b69b Provide separate translatable for case where we have no device 2020-05-12 12:42:16 +01:00
David Baker
3c5c7f56f3 Adjust comment 2020-05-12 11:14:05 +01:00
David Baker
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
Michael Telatynski
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
Michael Telatynski
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
Michael Telatynski
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
Michael Telatynski
99aeb8388d
Update src/phonenumber.ts
Co-authored-by: Travis Ralston <travpc@gmail.com>
2020-05-12 10:29:06 +01:00
Michael Telatynski
3fa13d7de3 Add comment for the regex
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-05-12 10:23:53 +01:00
Michael Telatynski
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
Michael Telatynski
03ad8a606a
Merge branch 'develop' into t3chguy/rageshake_xsign_debug 2020-05-12 09:44:49 +01:00
Michael Telatynski
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
Michael Telatynski
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
Michael Telatynski
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
David Baker
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
Michael Telatynski
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
Michael Telatynski
3bb800bb81 Replace png flags with use of Twemoji
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-05-11 22:04:18 +01:00
Travis Ralston
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
Michael Telatynski
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
Michael Telatynski
c2fea7d4d8
Merge pull request #4565 from matrix-org/matthew/invite-npe
Fix crash for broken invites
2020-05-11 17:12:38 +01:00
Michael Telatynski
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
David Baker
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
Michael Telatynski
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