Commit graph

23426 commits

Author SHA1 Message Date
J. Ryan Stinnett
94ace258f3
Merge pull request #4425 from matrix-org/t3chguy/recovery_copy
Iterate cross-signing copy
2020-04-16 15:31:35 +01:00
Michael Telatynski
aea7ede7d0 update PHASE_PASSPHRASE copy
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-16 14:55:43 +01:00
Michael Telatynski
e942a35525 Fixxy
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-16 14:09:41 +01:00
Michael Telatynski
af59c1b5b3 iterate copy some more
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-16 14:02:32 +01:00
Michael Telatynski
8c8509a603 i18n
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-16 13:48:52 +01:00
Michael Telatynski
9ec8fda1ce update Create SSSS Dialog copy
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-16 13:34:18 +01:00
Michael Telatynski
ce78e3b8d8 further tweaks by Matthew
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-16 13:28:12 +01:00
Michael Telatynski
1fb0f39c84 Replace Verify this session and Complete security
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-16 13:23:01 +01:00
Michael Telatynski
f65c31383d Copy tweaks with Nad
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-16 12:52:35 +01:00
Bruno Windels
0b7f7820c2
Merge pull request #4422 from matrix-org/bwindels/loadtwemojiforsas
Fix: ensure twemoji font is loaded when showing SAS emojis
2020-04-16 11:34:01 +00:00
Michael Telatynski
a9a2999ccc Use recovery passphrase and recovery key everywhere
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-16 12:26:12 +01:00
Bruno Windels
3933c4c31c ensure twemoji font is loaded when showing SAS emojis 2020-04-16 11:35:54 +02:00
Bruno Windels
4a2e13c227
Merge pull request #4421 from matrix-org/revert-4419-bwindels/loadtwemojiearlier
Revert "Fix: load Twemoji before login so complete security gets the right emojis during SAS"
2020-04-16 09:26:06 +00:00
Bruno Windels
33391a3110
Revert "Fix: load Twemoji before login so complete security gets the right emojis during SAS" 2020-04-16 09:25:18 +00:00
Bruno Windels
c396950ca4
Merge pull request #4419 from matrix-org/bwindels/loadtwemojiearlier
Fix: load Twemoji before login so complete security gets the right emojis during SAS
2020-04-16 09:15:24 +00:00
Michael Telatynski
135cecbd4f
Merge pull request #4410 from matrix-org/t3chguy/copy
consolidate and fix copy to clipboard
2020-04-16 09:47:24 +01:00
Michael Telatynski
09d4a89561
Merge pull request #4418 from matrix-org/t3chguy/fix_source_url_display
Fix Message Context Menu options not displaying: block
2020-04-16 09:44:56 +01:00
Bruno Windels
15075e4c10 load twemoji in matrixclient rather than loggedinview 2020-04-16 10:40:09 +02:00
Michael Telatynski
bedffdb8e2 Fix Message Context Menu options not displaying: block
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-16 01:46:32 +01:00
Travis Ralston
b4e2daaf46 Convert cross-signing feature flag to setting
This is intended as a temporary measure until we're comfortable with removing the flag entirely.
2020-04-15 13:18:42 -06:00
Michael Telatynski
a37ecbbb34
update console.error 2020-04-15 19:24:33 +01:00
Michael Telatynski
2929bcf998
Merge pull request #4411 from matrix-org/t3chguy/backslash
Fix pills being broken by unescaped characters
2020-04-15 19:23:28 +01:00
J. Ryan Stinnett
4154acc9dd
Merge pull request #4415 from matrix-org/t3chguy/wait4initialsync
null-guard MatrixClientPeg in RoomViewStore
2020-04-15 18:46:23 +01:00
Bruno Windels
09e247b4f8
Merge pull request #4414 from matrix-org/bwindels/fixindexernotifs
Fix: prevent spurious notifications from indexer
2020-04-15 16:50:38 +00:00
Michael Telatynski
49e1e6e59f null-guard MatrixClientPeg in RoomViewStore
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-15 17:31:45 +01:00
Bruno Windels
8c2c777e2b disable reemitting on the client for events mapped from the indexer 2020-04-15 17:37:32 +02:00
Michael Telatynski
f4c4fe7d12
Merge pull request #4413 from matrix-org/t3chguy/wait4initialsync
Login block on initialSync with spinners
2020-04-15 16:17:13 +01:00
Michael Telatynski
81f501e844 disable language dropdown too
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-15 14:19:47 +01:00
Michael Telatynski
7efbae0470
Merge pull request #4408 from matrix-org/t3chguy/fix_network_dropdown_scrolling
Allow network dropdown to be scrollable and fix context menu padding calc
2020-04-15 14:08:34 +01:00
Michael Telatynski
ac26719b69 disable password reset button when spinning
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-15 14:07:37 +01:00
J. Ryan Stinnett
fafe57624c
Merge pull request #4412 from matrix-org/jryans/hide-e2e-info-opt
Remove end-to-end message info option when cross-signing is used
2020-04-15 14:07:22 +01:00
Michael Telatynski
8b25223026 fix onLoggedIn getting called twice
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-15 13:45:12 +01:00
Michael Telatynski
76ce4081cb i18n
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-15 12:31:27 +01:00
Michael Telatynski
346b2e8588 Login block on initialSync with spinners
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-15 12:21:49 +01:00
J. Ryan Stinnett
e9c755e73f Remove end-to-end message info option when cross-signing is used
This end-to-end info dialog repeats info available elsewhere and has not been
updated to make sense for cross-signing, triggers old verification methods, etc.
For now, this hides the option to present a more consistent UI.

Relates to https://github.com/vector-im/riot-web/issues/11752
2020-04-15 10:25:05 +01:00
Michael Telatynski
9c1939b756 match all, not just first instance of tokens to escape
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-15 02:31:30 +01:00
Michael Telatynski
4454db30d6 Escape opening square bracket too
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-15 01:02:08 +01:00
Michael Telatynski
cb10640eaf detslint
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-15 00:53:35 +01:00
Michael Telatynski
f1def8b0de delint
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-15 00:50:28 +01:00
Michael Telatynski
c72139fc3f Convert serialize and deserialize to TypeScript
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-15 00:49:08 +01:00
Michael Telatynski
95eaf94cd8 Fix pills being broken by unescaped characters
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-15 00:40:38 +01:00
Michael Telatynski
276b5b874c Convert ShareDialog to Typescript
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-15 00:22:19 +01:00
Michael Telatynski
89bc3bdd5b consolidate and extract copyPlaintext, copyNode and selectText
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-15 00:16:11 +01:00
Travis Ralston
77bdde4021 Merge branch 'travis/moar-jitsi' into travis/addwidget-improvements 2020-04-14 12:58:16 -06:00
Travis Ralston
4fe16b1b84
Merge branch 'develop' into travis/moar-jitsi 2020-04-14 12:57:28 -06:00
Travis Ralston
36fea4d487
Merge pull request #4378 from matrix-org/travis/expanding-widgets
Minimize widgets by default
2020-04-14 12:56:10 -06:00
Travis Ralston
f0a2f5dd4f
Merge pull request #4380 from matrix-org/travis/widget-complaints
Add comments to highlight where we'll need m.widget support
2020-04-14 12:55:49 -06:00
Michael Telatynski
769cf1c987 Allow network dropdown to be scrollable and fix context menu window padding calc
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-14 17:34:39 +01:00
Bruno Windels
69e680da3c
Merge pull request #4407 from matrix-org/bwindels/checkifxsignisdisabledforlegacyverif
Fix: dont try to enable 4S if cross-signing is disabled
2020-04-14 16:12:16 +00:00
Bruno Windels
aef6687931
Merge pull request #4406 from matrix-org/bwindels/completesecuritywithoutspinner
Fix: don't confuse user with spinner during complete security step
2020-04-14 15:54:44 +00:00