Commit graph

2390 commits

Author SHA1 Message Date
J. Ryan Stinnett
5d027ffcf4
Merge pull request #5694 from robintown/show-invite-reasons
Show invite reasons
2021-04-06 10:48:54 +01:00
Travis Ralston
4d72af7916
Merge pull request #5744 from panoschal/forgot-password-validation
Require strong password in forgot password form
2021-04-05 00:46:47 -06:00
David Baker
cd39474d26
Merge pull request #5798 from matrix-org/dbkr/attended_transfer
Attended transfer
2021-04-01 17:34:30 +01:00
Panagiotis
901d5a86d0 Merge branch 'develop' into forgot-password-validation 2021-04-01 12:39:25 +03:00
Germain Souquet
a4345811b0 Merge branch 'develop' into gsouquet-seshat-reset 2021-04-01 09:06:35 +01:00
Germain Souquet
85f9e43f01 Update seshat reset dialog copy 2021-04-01 09:03:50 +01:00
Robin Townsend
2477258249 Merge branch 'develop' into show-invite-reasons 2021-03-31 16:13:29 -04:00
Robin Townsend
f0333b5b1c Show invite reasons
Displays the reason for invitation in the invitation dialog, requiring a
click to reveal the message.

Signed-off-by: Robin Townsend <robin@robin.town>
2021-03-31 15:46:09 -04:00
J. Ryan Stinnett
58343c7699 Fix search error typo
This fixes a typo in the recently added search error message.
2021-03-31 11:55:21 +01:00
David Baker
299467c515 Merge remote-tracking branch 'origin/develop' into dbkr/attended_transfer 2021-03-31 10:14:48 +01: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
J. Ryan Stinnett
661202839c
Merge pull request #5696 from robintown/spoiler-command
Add /spoiler command
2021-03-30 11:58:33 +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
Michael Telatynski
83612dd4ad
Merge pull request #5792 from matrix-org/t3chguy/spaces4.12
Fixing spaces papercuts
2021-03-26 15:01:31 +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
Michael Telatynski
9b4af91014 delint 2021-03-26 13:25:06 +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
Germain Souquet
c40f97fa25 Add reset option for corrupted event index store 2021-03-26 09:44:52 +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
8a709b3bf9 Merge branch 'develop' into spoiler-command 2021-03-25 18:20:29 -04:00
David Baker
82ba546142 WIP attended transfer 2021-03-25 19:56:21 +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
3ce9db162e Tweak some spaces copy 2021-03-25 13:24:16 +00:00
Germain Souquet
510f08e9f1 Update failed invites copy 2021-03-25 10:11:52 +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
Michael Telatynski
62172ba43d i18n 2021-03-24 19:43:42 +00:00
Travis Ralston
8587ec888b
Merge pull request #5769 from matrix-org/travis/voice-messages/exp
Labs feature: Early implementation of voice messages
2021-03-24 09:56:34 -06:00
Germain Souquet
5104d7bed8 Improve error reporting when EventIndex fails on a supported environment 2021-03-24 11:51:39 +00:00
Nolan Darilek
e5d5e1cce2 Label unlabeled avatar button in event panel.
Signed-off-by: Nolan Darilek <nolan@thewordnerd.info>
2021-03-23 10:00:34 -05:00
Michael Telatynski
03ab2dc8e0
Merge pull request #5776 from matrix-org/t3chguy/spaces4.10
Improve discovery of rooms in a space
2021-03-22 13:24:23 +00:00
Michael Telatynski
128c7db28e
Merge pull request #5777 from matrix-org/t3chguy/spaces4.9
Spaces improve creation journeys
2021-03-22 13:24:10 +00:00
Michael Telatynski
98df2883d3
Merge pull request #5728 from matrix-org/t3chguy/fix/3657
Collapse redactions into an event list summary
2021-03-19 19:16:20 +00:00
Jaiwanth
70e0b77fc4 Changed invite phrases in context menu and invite dialog 2021-03-19 21:32:52 +05:30
Michael Telatynski
76dffdcb2c Tweak space creation copy and auto focus fields 2021-03-19 13:20:30 +00:00
Michael Telatynski
c6f6d24b32 Iterate space creation and previews 2021-03-19 13:20:30 +00:00
Michael Telatynski
90d87122bc Tweak copy on space creation flows 2021-03-19 13:20:30 +00:00
Michael Telatynski
d04c8b3fb4 Improve discovery of rooms in a space 2021-03-19 11:54:10 +00:00
Travis Ralston
69f90ee97e Label labs flag as in development 2021-03-16 23:55:07 -06:00
Travis Ralston
9aa5348c7f Show a stop button to stop the recording 2021-03-16 23:43:59 -06:00
Travis Ralston
b5d32d92f3 Wire up a simple record button 2021-03-16 22:58:44 -06:00
Travis Ralston
097c2d8be0 Add labs flag for voice messages 2021-03-16 22:58:44 -06:00
Travis Ralston
451a3aaa3f Work around more cases where a rageshake server might not be present
We already do this for a number of other places (slash commands, help section of settings, etc) - these places appear to have been missed, though.
2021-03-16 13:50:43 -06:00
Hubert Chathi
7f141276ff initial work on room history key sharing, take 2 2021-03-15 22:56:56 -04:00
panoschal
104bcdd0b0
Merge branch 'develop' into forgot-password-validation 2021-03-11 19:18:08 +02:00