Commit Graph

16504 Commits

Author SHA1 Message Date
Šimon Brandner 17fad0e9b2 Merge remote-tracking branch 'upstream/develop' into fix/12652/screen-share 2021-05-19 08:46:33 +02:00
Šimon Brandner 5c2abd291a Do not render the audio element if there is no audio track
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-05-19 08:46:04 +02:00
Germain cf384c2a54 Merge pull request #6052 from matrix-org/gsouquet/decrypt-relations 2021-05-18 17:21:13 +01:00
Michael Telatynski bf01ebae6d Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into travis/blurhash
 Conflicts:
	package.json
	src/components/views/messages/MImageBody.js
	yarn.lock
2021-05-18 13:48:40 +01:00
Michael Telatynski edb2026780 Support any alias not just first 2021-05-18 13:31:53 +01:00
Michael Telatynski 655010844a Switch to using QueryMatcher for add existing to space dialog
This helps it support filtering by alias
2021-05-18 13:27:34 +01:00
Germain Souquet f9f10de0da use renamed decrypt event method 2021-05-18 13:01:38 +01:00
Michael Telatynski e9c258a930 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/a11y/composer-list-autocomplete
 Conflicts:
	src/autocomplete/AutocompleteProvider.tsx
	src/components/views/rooms/Autocomplete.tsx
2021-05-18 12:49:11 +01:00
Michael Telatynski 2732280923 Fix space room hierarchy not updating when removing a room 2021-05-18 11:54:45 +01:00
Germain Souquet 1cfd4b6e1a Use client.decryptEvent to avoid accessing js-sdk private members 2021-05-18 11:41:20 +01:00
Michael Telatynski afd9843722 Fix broken string interpolation in chat effects warning 2021-05-18 10:28:37 +01:00
Germain Souquet 871c48f69b stop assuming that decryption happens ahead of time 2021-05-18 10:02:21 +01:00
Travis Ralston 6ccb0d487a Merge branch 'develop' into travis/msc2873 2021-05-17 16:27:20 -06:00
Robin Townsend d3f1754dfd Fix crash on opening notification panel
The check for pending edits needed a null guard, since the notification
panel uses MessagePanel but is not associated with a specific room.

Signed-off-by: Robin Townsend <robin@robin.town>
2021-05-17 12:24:41 -04:00
Germain Souquet 7e846b8532 remove unused import 2021-05-17 15:05:20 +01:00
Germain Souquet c67f31144f remove custom LoggedInView::shouldComponentUpdate logic 2021-05-17 14:45:41 +01:00
Michael Telatynski 6e5847ea6b Fix right clicking on add reactions prompt button behaviour 2021-05-17 10:01:56 +01:00
Michael Telatynski a22a1918e1 Fix add reactions prompt button showing up even if all reactions have been removed 2021-05-17 10:01:43 +01:00
Robin Townsend e798b36f1d Decorate forward dialog room avatars
Signed-off-by: Robin Townsend <robin@robin.town>
2021-05-16 08:39:22 -04:00
Robin Townsend 64e828d069 Merge branch 'develop' into improved-forwarding-ui 2021-05-16 08:13:59 -04:00
Robin Townsend 555b2e3266 Reuse Spinner styles for InlineSpinner
Signed-off-by: Robin Townsend <robin@robin.town>
2021-05-16 08:00:54 -04:00
Robin Townsend 74cc00b319 Merge branch 'develop' into better-spinners 2021-05-16 07:47:34 -04:00
Michael Telatynski b06514273f Merge pull request #6043 from SimonBrandner/fix/add-ids
Add ids to homeserver and passphrase fields
2021-05-15 15:22:27 +01:00
Šimon Brandner bdf7837044 Add mx to homeserverInput 2021-05-15 16:13:26 +02:00
Šimon Brandner ce4439e118 Add mx to passPhraseInput 2021-05-15 16:13:02 +02:00
Šimon Brandner 37348375a2 Add id for passpharase
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-05-15 15:07:35 +02:00
Šimon Brandner fef081c736 Add id for homeserver field
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-05-15 15:07:15 +02:00
Travis Ralston 89933d779c Merge branch 'develop' into travis/msc2873 2021-05-14 14:22:53 -06:00
Travis Ralston 55eddae096 Merge pull request #6035 from matrix-org/travis/voicemessages/playback-time
Improve progress bar progression for smaller voice messages
2021-05-14 10:17:35 -06:00
Michael Telatynski 49b24408bb Merge pull request #6039 from matrix-org/t3chguy/public-space-no-invite
Fix share space edge case where space is public but not invitable
2021-05-14 16:46:50 +01:00
Travis Ralston 6df079a5bd Merge pull request #6033 from matrix-org/travis/rel-imageview
Add missing 'rel' to image view download button
2021-05-14 08:12:11 -06:00
Michael Telatynski 882000dfcb Merge pull request #6040 from matrix-org/t3chguy/fix/17296
Fix roving tab index intercepting home/end in space create menu
2021-05-14 15:07:34 +01:00
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 d0458332d5 fix roving tab index intercepting home/end in space create menu 2021-05-14 11:22:20 +01:00
Michael Telatynski 4f55ac1fa6 Merge pull request #6025 from matrix-org/t3chguy/fix/16674
Improve Spaces "Just Me" wizard
2021-05-14 10:58:55 +01:00
Michael Telatynski 6f9c2f05a2 remove unused vars/imports 2021-05-14 10:49:53 +01:00
Michael Telatynski 034bd9cb02 Merge pull request #6029 from matrix-org/t3chguy/fix/17275
Show alternative button during space creation wizard if no rooms
2021-05-14 10:48:39 +01:00
Michael Telatynski e1df62472d remove unused imports and run i18n 2021-05-14 10:48:24 +01:00
Michael Telatynski f31f7b243d Fix share space edge case where space is public but not invitable 2021-05-14 10:46:09 +01:00
Travis Ralston ddf9027daa Improve progress bar progression for smaller voice messages
Instead of chunking the thing, we'll improve our precision and clock accuracy. Clock accuracy is improved by flagging the "load time" of the clip in the context, which can be about 500ms (or more) off the context's start line. The precision is just a number in the PlaybackWaveform component.
2021-05-13 22:35:43 -06:00
Jaiwanth 26dd6d5510 Swap rotate left and right buttons
Signed-off-by: Jaiwanth <jaiwanth2011@gmail.com>
2021-05-14 08:26:29 +05:30
Travis Ralston b9f775d969 Add missing 'rel' to image view download button
We're supposed to have this on every link off-site.
2021-05-13 20:55:14 -06:00
Travis Ralston e38d27f64e Merge pull request #5915 from aaronraimist/initialisation
Typo: initilisation -> initialisation
2021-05-13 20:15:08 -06: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
Šimon Brandner adddb0f0d2 Show screensharign button only if connected
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-05-13 18:11:47 +02:00
Michael Telatynski 5feb9e85d7 Merge branch 'develop' into t3chguy/fix/16622 2021-05-13 16:12:42 +01:00
Michael Telatynski 6aa477f0f5 Decorate room avatars with publicity in add existing to space flow 2021-05-13 14:23:28 +01:00
Michael Telatynski f6e8d38b87 Remove redundant tag prop 2021-05-13 14:23:10 +01:00
Michael Telatynski a41d76b588 fix typos 2021-05-13 14:14:01 +01:00
Michael Telatynski 76afc1100a Convert to Typescript and move from ClientPeg to Context 2021-05-13 14:13:00 +01:00