David Baker
|
299467c515
|
Merge remote-tracking branch 'origin/develop' into dbkr/attended_transfer
|
2021-03-31 10:14:48 +01:00 |
|
Travis Ralston
|
b68fabb44b
|
Merge pull request #5801 from matrix-org/travis/voice-messages/waveform
Show waveform and timer in voice messages
|
2021-03-30 12:16:19 -06:00 |
|
J. Ryan Stinnett
|
b089f3d2f9
|
Merge pull request #5585 from ndarilek/label-base-avatar
Label unlabeled avatar button in event panel
|
2021-03-30 12:21:17 +01:00 |
|
Travis Ralston
|
54412878a1
|
Merge branch 'develop' into travis/voice-messages/waveform
|
2021-03-29 22:59:51 -06:00 |
|
Travis Ralston
|
9998f18d67
|
Stop React complaining about componentShouldUpdate()
|
2021-03-29 21:59:45 -06:00 |
|
Travis Ralston
|
e523ce6036
|
Fix float operations to make a little more sense.
|
2021-03-29 21:25:06 -06: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
|
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 |
|
David Baker
|
989d69ba16
|
Get tbe transfer target / transferee the right way around
and also switch to the transfer target's room when we call them
|
2021-03-26 14:21:58 +00: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
|
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 |
|
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
|
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
|
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 |
|
Michael Telatynski
|
09601f1071
|
Add display name tooltip to the facepile avatars
|
2021-03-26 00:05:05 +00:00 |
|
Travis Ralston
|
a848febd3d
|
Definitely didn't copy/paste these
|
2021-03-25 17:45:00 -06:00 |
|
Travis Ralston
|
101679f647
|
Adjust some settings
|
2021-03-25 17:30:44 -06: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 |
|
Travis Ralston
|
1419ac6b69
|
Hook up a clock and implement proper design
|
2021-03-25 17:12:26 -06: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 |
|
David Baker
|
82ba546142
|
WIP attended transfer
|
2021-03-25 19:56:21 +00:00 |
|
Panagiotis
|
97c7f3753b
|
fix: save editor state when reply is open
|
2021-03-25 20:58:39 +02: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 |
|
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
|
5e00818d70
|
Fix new space invite button in the room intro
|
2021-03-25 11:38:14 +00:00 |
|
Germain Souquet
|
510f08e9f1
|
Update failed invites copy
|
2021-03-25 10:11:52 +00:00 |
|
Michael Telatynski
|
e31fc91a03
|
Fix space setting public/private join rule switch
|
2021-03-25 09:41:05 +00:00 |
|
Michael Telatynski
|
760b11f214
|
Merge pull request #5789 from matrix-org/t3chguy/spaces4.11
Tweak and fix some space features
|
2021-03-25 09:02:11 +00:00 |
|
Travis Ralston
|
449e028bbd
|
Actually use a waveform instead of the frequency data
|
2021-03-24 23:31:02 -06:00 |
|
Travis Ralston
|
8ddd14e252
|
Early concept for rendering the frequency waveform
|
2021-03-24 22:17:45 -06:00 |
|