Commit graph

22433 commits

Author SHA1 Message Date
David Baker
252972e159 Dismiss SSSS migration toast once migration done 2020-03-20 18:53:31 +00:00
David Baker
ea62a13e59 Merge remote-tracking branch 'origin/develop' into dbkr/symmetric-ssss-migrate 2020-03-19 21:14:27 +00:00
David Baker
c8691c73ff Allow key backup restore to get the key backup passphrase
And pass this in as the new callback to bootstrap to get the old
key backup passphrase.
2020-03-19 20:42:16 +00:00
David Baker
9bfc19f367 Fix bug where cross-signing keys would be unintentionally reset
Don't pass the boostrap function directly as a an event handler
as that gets used as the force argument.
2020-03-19 20:40:08 +00:00
Travis Ralston
20d0e8a888
Merge pull request #4234 from matrix-org/travis/wrapped-jitsi
Use a local wrapper for Jitsi calls
2020-03-19 11:52:14 -06:00
Travis Ralston
92251316a3 Switch to named object 2020-03-19 11:51:01 -06:00
Travis Ralston
af97ec57d0
Apply suggestions from code review
Co-Authored-By: J. Ryan Stinnett <jryans@gmail.com>
2020-03-19 11:45:17 -06:00
Michael Telatynski
c616107d1c
Merge pull request #4233 from matrix-org/t3chguy/invite_fixes
Invite Dialog fixes
2020-03-19 17:32:30 +00:00
Michael Telatynski
0aedd02ddb
Merge pull request #4239 from matrix-org/t3chguy/break
RoomPreviewBar word-break the sender name too
2020-03-19 17:19:44 +00:00
Zoe
d4486a3eeb
Merge pull request #4229 from matrix-org/foldleft/11574-handle-upload-errors
Report to the user when a key signature upload fails
2020-03-19 16:00:18 +00:00
Hubert Chathi
05072cfef0
Merge pull request #4235 from matrix-org/uhoreg/prepare_to_encrypt
pre-send megolm keys when possible when a user starts typing
2020-03-19 11:25:41 -04:00
Michael Telatynski
f14257926e RoomPreviewBar word-break the sender name too
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-03-19 15:24:28 +00:00
Hubert Chathi
c6ff6f2a79 Merge branch 'develop' into uhoreg/prepare_to_encrypt 2020-03-19 10:57:47 -04:00
Michael Telatynski
58bfc49e2a
Merge pull request #4238 from matrix-org/t3chguy/fix_rls
we don't do mx_fadable anymore so get rid of broken RightPanel disabling
2020-03-19 14:26:03 +00:00
David Baker
32f70dfec1 Merge remote-tracking branch 'origin/develop' into dbkr/symmetric-ssss-migrate 2020-03-19 14:18:55 +00:00
Michael Telatynski
fb46258528 we don't do mx_fadable anymore so get rid of broken RLS disabling
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-03-19 13:57:36 +00:00
Michael Telatynski
15a1772703
Merge pull request #4237 from matrix-org/t3chguy/fix_left_panel_custom_tags
Fix left left panel overflowing vertically
2020-03-19 13:13:03 +00:00
Michael Telatynski
bea6787201 Fix left left panel betterer
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-03-19 11:39:00 +00:00
Michael Telatynski
51471f4eb8
Merge pull request #4236 from matrix-org/t3chguy/fix_left_panel_custom_tags
Fix custom tags causing left panel to over-expand
2020-03-19 11:01:21 +00:00
Michael Telatynski
e946f43ea8
Merge pull request #4231 from matrix-org/t3chguy/kbd
Add Keyboard shortcuts dialog
2020-03-19 10:46:10 +00:00
Michael Telatynski
b675523449 Fix custom tags causing left panel to over-expand
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-03-19 10:45:08 +00:00
Michael Telatynski
fa6a937896 don't block onFinished as there are other ways to close modal
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-03-19 09:58:49 +00:00
Michael Telatynski
1dc30beb95 disable textarea when busy
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-03-19 09:58:04 +00:00
Hubert Chathi
3bb1422f93 pre-send megolm keys when possible when a user starts typing 2020-03-18 19:23:36 -04:00
Travis Ralston
8519a83b61 Appease the linter 2020-03-18 15:58:57 -06:00
Travis Ralston
2a68479f5a Remove unused strings 2020-03-18 15:53:05 -06:00
Travis Ralston
9da57817d1 Use a local wrapper for Jitsi calls
Requires https://github.com/vector-im/riot-web/pull/12780
2020-03-18 15:50:12 -06:00
David Baker
ce90cbe35e
Merge pull request #4232 from matrix-org/dbkr/reactsdk-e2e-artifacts-2
Don't use buildkite agent to upload logs
2020-03-18 21:28:06 +00:00
Michael Telatynski
963c0a7b3f Hide remove target buttons when busy
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-03-18 21:16:41 +00:00
Michael Telatynski
dd9ead0166 Invite dialog: backspace on empty field remove right-most target
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-03-18 21:09:52 +00:00
Michael Telatynski
22c8df9f23 Update DM invite copy
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-03-18 21:08:37 +00:00
Michael Telatynski
7a448c5ba2 Fix Alt being Option on Mac
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-03-18 20:56:28 +00:00
David Baker
544e2c9971 Don't use buildkite agent to upload logs 2020-03-18 20:56:02 +00:00
Michael Telatynski
d593a76f28 Merge branches 'develop' and 't3chguy/kbd' of github.com:matrix-org/matrix-react-sdk into t3chguy/kbd 2020-03-18 20:41:13 +00:00
Michael Telatynski
1d5001544c Improve colouring
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-03-18 17:32:36 +00:00
Michael Telatynski
36cedc58bb Make ts happier
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-03-18 17:03:00 +00:00
Michael Telatynski
9cda84c675 fix kbd background colour
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-03-18 16:54:46 +00:00
Michael Telatynski
cad28c81c0 Add Keyboard shortcuts dialog
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-03-18 16:40:21 +00:00
David Baker
b8e6208cb2 Merge remote-tracking branch 'origin/develop' into uhoreg-uhoreg/symmetric-ssss-migrate 2020-03-18 14:49:25 +00:00
Michael Telatynski
42ee157645
Merge pull request #4217 from matrix-org/t3chguy/gemini
Remove Gemini Scrollbars
2020-03-18 14:03:51 +00:00
Michael Telatynski
ef79492f2c
Merge pull request #4209 from matrix-org/t3chguy/redesign/room_directory
Room Directory Explore Servers redesign
2020-03-18 11:51:42 +00:00
David Baker
fafddc9b50
Merge pull request #4110 from aaronraimist/mac-redo
Fix redo keyboard shortcut on macOS
2020-03-18 11:33:13 +00:00
Bruno Windels
dcefcaf175
Merge pull request #4230 from matrix-org/bwindels/fixremovelocalaliaswithlag
Fix: ensure local state for aliases doesn't get garbled up
2020-03-18 10:36:57 +00:00
Bruno Windels
f8c6097c39 remove logging 2020-03-18 11:18:48 +01:00
Bruno Windels
7b1b4cda14 ensure local state for aliases doesn't get garbled up
when removing another alias before the response of the first comes back
2020-03-17 20:37:44 +01:00
Travis Ralston
1453120c66
Merge pull request #4208 from matrix-org/matthew/jump-to-bottom-ublock
Rename 'jump to bottom' to avoid ublock block
2020-03-17 13:06:41 -06:00
Aaron Raimist
038888f2d4 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into mac-redo 2020-03-17 13:52:43 -05:00
Aaron Raimist
84a8ca6982
Fix typo
Signed-off-by: Aaron Raimist <aaron@raim.ist>
2020-03-17 13:18:27 -05:00
Matthew Hodgson
af023a2d7c rename 'jump to bottom' to avoid ublock block 2020-03-17 11:15:57 -06:00
J. Ryan Stinnett
fac4561ac8
Merge pull request #4225 from matrix-org/jryans/comp-sec-restore-slow
Restore key backup in background after complete security
2020-03-17 16:47:18 +00:00