Commit graph

3992 commits

Author SHA1 Message Date
Michael Telatynski
4a5c634d82 Iterate PR 2021-05-24 22:02:50 +01:00
Michael Telatynski
a757f589bd post-merge fixup 2021-05-24 21:57:59 +01:00
Michael Telatynski
d8acc0612a Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/12740
 Conflicts:
	src/components/views/rooms/EditMessageComposer.js
	src/components/views/rooms/SendMessageComposer.js
2021-05-24 21:57:38 +01:00
Michael Telatynski
073127aa3c Fix handling of via servers for suggested rooms 2021-05-20 18:47:12 +01:00
Germain Souquet
422740f13b normalize displayName 2021-05-20 11:04:17 +01:00
Michael Telatynski
aa4984019c
Merge pull request #6061 from jaiwanth-v/update-memberlist-invite
Update MemberList to reflect changes for invite permission change
2021-05-19 17:35:58 +01:00
Germain
6170403c10
Depile encrypted events to find the most suitable one for preview (#6056) 2021-05-19 13:25:52 +01:00
Jaiwanth
d73eb0c70f Update MemberList.js 2021-05-19 17:46:10 +05:30
Michael Telatynski
78a8c9e10e Fix issue when a room without a name or alias is marked as suggested 2021-05-19 10:46:11 +01:00
Jaiwanth
e78206301f Modify to avoid forceUpdate 2021-05-19 14:31:04 +05:30
Jaiwanth
0d8a7eabc7 Update MemberList on invite permission change
Signed-off-by: Jaiwanth <jaiwanth2011@gmail.com>
2021-05-19 12:49:55 +05:30
Michael Telatynski
c7c61bf26a
Merge pull request #6030 from matrix-org/t3chguy/fix/17276
Decorate room avatars with publicity in add existing to space flow
2021-05-14 11:23:46 +01:00
Michael Telatynski
6f9c2f05a2 remove unused vars/imports 2021-05-14 10:49:53 +01:00
Travis Ralston
2d2c0d54c0
Merge pull request #6001 from jaiwanth-v/save-edited-state-messages
Save edited state of a message when switching rooms
2021-05-13 20:06:31 -06:00
Michael Telatynski
f6e8d38b87 Remove redundant tag prop 2021-05-13 14:23:10 +01:00
Germain
bd2917aa69
Add a limit option for autocomplete results (#6016) 2021-05-12 12:18:56 +01:00
Jaiwanth
240753a84f Check for a pending edit only once per render and clear any pending events while switching between edits 2021-05-11 18:37:57 +05:30
Jaiwanth
87d95d0cb1 Merge branch 'save-edited-state-messages' of github.com:jaiwanth-v/matrix-react-sdk into save-edited-state-messages 2021-05-11 11:12:32 +05:30
Jaiwanth
4ea3fbc5ba Add comments and newlines back and resolve merge conflicts 2021-05-11 11:07:34 +05:30
Jaiwanth
376befd38e
Update src/components/views/rooms/EditMessageComposer.js
Co-authored-by: Travis Ralston <travpc@gmail.com>
2021-05-11 10:37:53 +05:30
Travis Ralston
12657f0fbc Merge branch 'develop' into edit-slashcommands 2021-05-10 20:09:33 -06:00
Travis Ralston
122565b3ac
Update src/components/views/rooms/EditMessageComposer.js 2021-05-10 20:03:20 -06:00
Jaiwanth
1f77048750 Minor refactor 2021-05-09 16:12:04 +05:30
Jaiwanth
6f98aa06c4 Save edited state when switching rooms
Signed-off-by: Jaiwanth <jaiwanth2011@gmail.com>
2021-05-09 13:42:01 +05:30
Michael Telatynski
9518e4d415 Guard all isSpaceRoom calls behind the labs flag 2021-05-05 23:59:07 +01:00
Travis Ralston
54931cb43e Merge remote-tracking branch 'origin/develop' into travis/voicemessages/timeline 2021-05-04 09:05:04 -06:00
Travis Ralston
704edfc05b
Merge pull request #5959 from matrix-org/travis/voicemessages/permissions
Handle no/blocked microphones in voice messages
2021-05-04 09:03:38 -06:00
Jaiwanth
29aec4abdb Use middlePanelResized instead of noisy 2021-05-04 15:39:46 +05:30
Travis Ralston
87a57ec7e5 Handle no/blocked microphones in voice messages
Fixes https://github.com/vector-im/element-web/issues/17139
2021-05-03 16:41:39 -06:00
Jaiwanth
54e139a6ad Generate previews when the room tile is maximised 2021-05-03 23:17:10 +05:30
Travis Ralston
8abd251ec5 delib 2021-05-03 11:43:46 -06:00
Travis Ralston
d7ed2d3486 Switch to m.audio with extensible events 2021-05-03 10:27:15 -06:00
Jaiwanth
cf9edb1884 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into room-preview-spaces 2021-05-03 21:53:54 +05:30
Michael Telatynski
0008ef7ab1
Merge pull request #5942 from matrix-org/t3chguy/fix/16998
Make the text filter search all spaces instead of just the selected one
2021-04-30 12:53:38 +01:00
Šimon Brandner
5913203dc6
Merge branch 'develop' into fix-indent
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-04-29 20:08:14 +02:00
Šimon Brandner
232b87a3b4
Improve formatting
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-04-29 19:57:02 +02:00
Jaiwanth
d2de115b2f Generate room preview even when minimized
Signed-off-by: Jaiwanth <jaiwanth2011@gmail.com>
2021-04-29 21:37:44 +05:30
Michael Telatynski
62198601d2 Tweak room list filter placeholder and results copy for spaces 2021-04-29 16:40:08 +01:00
Travis Ralston
14f1388522
Merge pull request #5830 from SimonBrandner/fix-trailing-colon
Fix inserting trailing colon after mention/pill
2021-04-28 09:51:50 -06:00
Travis Ralston
c2d37af1cb Move playback to its own set of classes
This all started with a bug where the clock wouldn't update appropriately, and ended with a whole refactoring to support later playback in the timeline.

Playback and recording instances are now independent, and this applies to the <Playback* /> components as well. Instead of those playback components taking a recording, they take a playback instance which has all the information the components need.

The clock was incredibly difficult to do because of the audio context's time tracking and the source's inability to say where it is at in the buffer/in time. This means we have to track when we started playing the clip so we can capture the audio context's current time, which may be a few seconds by the first time the user hits play. We also track stops so we know when to reset that flag.

Waveform calculations have also been moved into the base component, deduplicating the math a bit.
2021-04-27 22:23:57 -06:00
Travis Ralston
5e646f861c Wire up the send button for voice messages
This fixes a bug where we couldn't upload voice messages because the audio buffer was being read, therefore changing the position of the cursor. When this happened, the upload function would claim that the buffer was empty and could not be read.
2021-04-27 18:59:10 -06:00
Travis Ralston
c1bb0bb0b8 Add a delete button 2021-04-27 15:02:15 -06:00
Travis Ralston
30e120284d Add simple play/pause controls 2021-04-27 15:02:15 -06:00
Travis Ralston
32e3ce3dea Handle basic state machine of recordings 2021-04-27 15:02:15 -06:00
Michael Telatynski
28d3a0c09b
Merge pull request #5932 from matrix-org/t3chguy/fix/17080
Fix suggested rooms not showing up regression from room list optimisation
2021-04-27 16:49:52 +01:00
Michael Telatynski
35799c213e Fix suggested rooms not showing up regression from room list optimisation 2021-04-27 16:30:54 +01:00
Šimon Brandner
46bfbbadf9
Enable indent rule and fix indent
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-04-27 17:23:27 +02:00
J. Ryan Stinnett
d1649dd301 Tweak interface syntax 2021-04-26 16:16:43 +01:00
J. Ryan Stinnett
cddcedcce2 Merge remote-tracking branch 'origin/develop' into jryans/convert-flow-to-ts 2021-04-26 15:57:28 +01:00
J. Ryan Stinnett
8659c98c44 Add tile shape string type 2021-04-26 15:55:04 +01:00