nikrozman/element-web
1
0
Fork 0
Code Issues Actions 4 Packages Projects Releases Wiki Activity
31,978 Commits 258 Branches 582 Tags
3a09c22173e7488863efeb01906245ce039a810d
Commit Graph

25423 Commits

Author SHA1 Message Date
J. Ryan Stinnett
3a09c22173 Merge pull request #5812 from matrix-org/jryans/cancel-security-key 
Tweak security key error handling
 2021-03-29 17:58:11 +01:00
Germain
096d4102b8 Merge pull request #5793 from matrix-org/gsouquet-warn-before-exit 
Add user settings for warn before exit
 2021-03-29 12:11:55 +01:00
J. Ryan Stinnett
02548cf743 Tweak security key error handling 
This reworks error handling of "use security key" so we stop the overall
operation when cancelling access (instead of just the immediate prompt). In
addition, flowing the error to outer catch block also handles resetting state to
re-display the initial verification choices.

Fixes https://github.com/vector-im/element-web/issues/15584
 2021-03-26 18:01:03 +00:00
J. Ryan Stinnett
33e8edb3d5 Merge pull request #5720 from czeidler/key-bindings 
Decouple key bindings from event handling
 2021-03-26 15:14:38 +00:00
Michael Telatynski
83612dd4ad Merge pull request #5792 from matrix-org/t3chguy/spaces4.12 
Fixing spaces papercuts
 2021-03-26 15:01:31 +00:00
Michael Telatynski
a64e0d7611 delint 2021-03-26 14:45:10 +00:00
Hubert Chathi
e23583db40 Merge pull request #5763 from uhoreg/room-history-key-sharing2 
Share keys for historical messages when inviting users to encrypted rooms
 2021-03-26 10:41:54 -04:00
Travis Ralston
e48dbef054 Merge pull request #5804 from matrix-org/travis/uploads-fix 
Fix upload bar not populating when starting uploads
 2021-03-26 08:08:21 -06:00
Travis Ralston
22b7081475 Merge pull request #5803 from matrix-org/travis/s-sso-login-crash 
Fix crash on login when using social login
 2021-03-26 08:06:34 -06:00
Michael Telatynski
af18019314 Final spaces tweaks for the demo 2021-03-26 13:46:01 +00:00
Michael Telatynski
9b4af91014 delint 2021-03-26 13:25:06 +00:00
Michael Telatynski
eff0e6fcc3 Add facepile to Space landing page and tweak layout slightly 2021-03-26 13:11:57 +00:00
J. Ryan Stinnett
ce19d07850 Merge pull request #5805 from matrix-org/travis/ts/access-ss-dialog 
Convert AccessSecretStorageDialog to TypeScript
 2021-03-26 12:37:24 +00:00
J. Ryan Stinnett
5f70c625ab Merge pull request #5807 from matrix-org/jryans/tweak-cs-text 
Tweak cross-signing copy
 2021-03-26 12:12:25 +00:00
Michael Telatynski
4341dfb314 Iterate facepiles, fix default avatar alignment and sort explicit avatars first 2021-03-26 11:55:22 +00:00
Michael Telatynski
aff05eff48 Fix suggested room vanishing when you peek it 2021-03-26 11:48:31 +00:00
J. Ryan Stinnett
aed247f44c Move toast detail to a new line 2021-03-26 11:43:41 +00:00
Michael Telatynski
9fb653e522 Fix room space invite button for public spaces 2021-03-26 11:43:01 +00:00
Michael Telatynski
3cee8b2baa fix space creation button busy state 2021-03-26 11:34:41 +00:00
J. Ryan Stinnett
fd59a66523 Tweak cross-signing copy 
This makes some Design-approved copy tweaks to the recent cross-signing flow
changes.
 2021-03-26 11:13:39 +00:00
Michael Telatynski
a8c1b7abab Hide space room management checkboxes if you don't have permission at the root space 2021-03-26 09:59:02 +00:00
Michael Telatynski
8c6d92cc99 Move space room discovery & management into the space room view 2021-03-26 09:54:15 +00:00
Travis Ralston
264e24fc35 Merge pull request #5791 from thermaq/patch-1 
Fix password change popup message
 2021-03-26 00:07:50 -06:00
Travis Ralston
60e05d2e8c Revert back to using sdk.getComponent() 2021-03-25 23:41:35 -06:00
Travis Ralston
550fba49f7 Appease the eternal linter 2021-03-25 23:37:23 -06:00
Travis Ralston
92ee1ad3cc Convert AccessSecretStorageDialog to TypeScript 
This is to make upcoming changes a bit easier to do.
 2021-03-25 23:34:45 -06:00
Travis Ralston
76a05eddfa Fix upload bar not populating when starting uploads 
Fixes https://github.com/vector-im/element-web/issues/16713

See diff for more information
 2021-03-25 22:29:21 -06:00
Travis Ralston
8bc2356fd0 Fix crash on login when using social login 
We weren't passing a matrix client through, and the peg wasn't set at this point. Just need to thread it through to the media endpoints.

Fixes https://github.com/vector-im/element-web/issues/16765
 2021-03-25 22:22:43 -06:00
Travis Ralston
318db15e35 Merge pull request #5790 from panoschal/fix/view-source-bug 
View Source: make Event ID go below Event ID
 2021-03-25 19:11:26 -06:00
Michael Telatynski
09601f1071 Add display name tooltip to the facepile avatars 2021-03-26 00:05:05 +00:00
Hubert Chathi
db2f573410 Merge branch 'develop' into room-history-key-sharing2 2021-03-25 19:28:50 -04:00
Hubert Chathi
46fd549ace update with new suggested design 2021-03-25 19:27:14 -04:00
Robin Townsend
f1a9c5ae93 Fix line numbers when missing trailing newline 
_addLineNumbers expected code blocks to contain a trailing newline, but
this is not always the case.

Signed-off-by: Robin Townsend <robin@robin.town>
 2021-03-25 17:38:34 -04:00
Michael Telatynski
75bfaa58bb Merge pull request #5796 from panoschal/fix/save-editor-state-when-reply-is-open 
Remember reply when switching rooms
 2021-03-25 20:27:57 +00:00
Michael Telatynski
d5ab7801f7 Merge pull request #5797 from matrix-org/t3chguy/redaction-groupere 
Fix edge case with redaction grouper messing up continuations
 2021-03-25 20:01:32 +00:00
Michael Telatynski
5e3a7c48f4 Fix edge case with redaction grouper messing up continuations 2021-03-25 19:37:55 +00:00
Panagiotis
97c7f3753b fix: save editor state when reply is open 2021-03-25 20:58:39 +02:00
Michael Telatynski
1b22cc8f6d delint 2021-03-25 17:41:26 +00:00
Michael Telatynski
a2fe964a31 Fix case where room list did not show DM when user joined space after filtering 2021-03-25 17:37:39 +00:00
Michael Telatynski
5061db259a Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/spaces4.12 2021-03-25 16:37:56 +00:00
Michael Telatynski
ea77ab125e Show a face pile on a space preview 2021-03-25 16:15:34 +00:00
Germain
356e4bc6fc Merge pull request #5785 from matrix-org/gsouquet-failed-invites 2021-03-25 14:54:21 +00:00
Germain
80013a2efa Merge pull request #5787 from matrix-org/gsouquet-event-indexing-settings 
Improve error reporting when EventIndex fails on a supported environment
 2021-03-25 14:53:15 +00:00
Germain Souquet
25a47b463e Add user settings for warn before exit 2021-03-25 14:14:38 +00:00
Michael Telatynski
7316eb052b delint 2021-03-25 14:10:01 +00:00
Michael Telatynski
35ede972db clear filter when switching spaces 2021-03-25 13:29:17 +00:00
Marek Matys
b5bc6251cf fix password change popup message 
Fixed bad error message when providing bad old password during password change.

Signed-off-by: Marek Matys <themarcq@gmail.com>
 2021-03-25 14:26:00 +01:00
Michael Telatynski
3ce9db162e Tweak some spaces copy 2021-03-25 13:24:16 +00:00
Panagiotis
aa1f468235 fix: room id sticked with event id 2021-03-25 14:36:40 +02:00
Michael Telatynski
5e00818d70 Fix new space invite button in the room intro 2021-03-25 11:38:14 +00:00