Travis Ralston
e3e7d945fd
Remove useless spread operator
2021-07-16 23:51:44 -06:00
Travis Ralston
d2de9b432c
Apply suggestions from code review
...
Co-authored-by: Michael Telatynski <7t3chguy@gmail.com>
2021-07-16 23:50:06 -06:00
Michael Telatynski
0f15cee583
Merge pull request #6205 from robintown/text-for-event-perf
2021-07-17 00:08:34 +01:00
Robin Townsend
092fdf5e5e
Be consistent about MessagePanel setting lookups
...
Signed-off-by: Robin Townsend <robin@robin.town>
2021-07-16 18:46:29 -04:00
Travis Ralston
60bcdd3bf8
Fix types from js-sdk
2021-07-16 16:29:25 -06:00
Robin Townsend
158e6fa61c
Merge branch 'develop' into text-for-event-perf
2021-07-16 18:24:22 -04:00
Travis Ralston
942cadc8a3
Merge branch 'develop' into travis/notifications-2
2021-07-16 16:20:23 -06:00
Travis Ralston
4d38218e24
Appease the linter
2021-07-16 16:11:27 -06:00
Travis Ralston
31d7de628e
Small tweaks
2021-07-16 16:04:23 -06:00
Travis Ralston
b57fff5739
Update visual style and sandbox properly
2021-07-16 15:55:07 -06:00
David Baker
45fb0e927f
Mention nested labels in comments
2021-07-16 22:35:53 +01:00
David Baker
f9b45677d6
Fix bug where 'other homeserver' would unfocus
...
It turns out the answer to this was not all that complex: we had
two nested <label>s: one for the radio button and one for the Field,
which presumably causes both of them to generate click events and
focus something and what ends up focused is some kind of race condition
depending on, apparently, how fast you click.
Notes: Fix bug where the 'other homeserver' field in the server selection dialog would become briefly focus and then unfocus when clicked.
2021-07-16 22:27:31 +01:00
Travis Ralston
623f2e7613
Only show download link below media if it's not in the timeline
2021-07-16 15:12:36 -06:00
Travis Ralston
7ba0adba77
Appease type system
2021-07-16 15:12:36 -06:00
Travis Ralston
d156a56603
Share body prop types with an interface
2021-07-16 15:12:36 -06:00
Travis Ralston
ea7513fc16
Convert MFileBody to TS and use media helper
2021-07-16 15:12:36 -06:00
Travis Ralston
5fce0ccd9d
Convert images, audio, and voice messages over to the new helper
2021-07-16 15:12:36 -06:00
Travis Ralston
040802e29f
Clean up after POC
2021-07-16 15:12:36 -06:00
Travis Ralston
584ffbd327
Fix refreshing the page not showing a download
2021-07-16 15:12:36 -06:00
Travis Ralston
703cf73759
Convert MessageEvent to TS and hoist MediaEventHelper
2021-07-16 15:12:36 -06:00
Travis Ralston
0a99f76e7f
Simple POC for moving download button to action bar
2021-07-16 15:12:36 -06:00
Robin Townsend
f88d5dd24e
Zip shortcodes in with emoji objects
...
Signed-off-by: Robin Townsend <robin@robin.town>
2021-07-16 16:36:03 -04:00
Šimon Brandner
16ed5c6645
Merge remote-tracking branch 'upstream/develop' into feature/call-event-tile
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-16 21:43:33 +02:00
Robin Townsend
eefadf6a46
Fix tests
...
Signed-off-by: Robin Townsend <robin@robin.town>
2021-07-16 15:30:26 -04:00
Michael Telatynski
aaa9040634
Merge pull request #6391 from matrix-org/t3chguy/fix/14508.1
2021-07-16 19:58:38 +01:00
Michael Telatynski
45e0515b39
Merge pull request #4399 from matrix-org/t3chguy/querystring
2021-07-16 19:57:24 +01:00
Robin Townsend
8efb30eb07
Merge branch 'develop' into emojibase-updates
2021-07-16 14:38:10 -04:00
Robin Townsend
25e6a0e570
Match colors of room and user avatars in DMs
...
Signed-off-by: Robin Townsend <robin@robin.town>
2021-07-16 14:19:36 -04:00
Šimon Brandner
41d5865dd7
Cleanup _ReplyTile.scss
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-16 19:26:04 +02:00
Michael Telatynski
74bd7cad3f
remove unrelated change
2021-07-16 13:40:53 +01:00
Michael Telatynski
3b13eb7b44
Prefer URL constructor over url
dependency
2021-07-16 13:18:12 +01:00
Michael Telatynski
9d45a3760f
Fix types of the various query params dicts, arrays can be included e.g via
2021-07-16 13:11:43 +01:00
Michael Telatynski
5dbd79c729
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/querystring
...
Conflicts:
package.json
src/@types/global.d.ts
src/components/views/elements/AppTile.js
src/utils/HostingLink.js
yarn.lock
2021-07-16 12:47:33 +01:00
Michael Telatynski
e6007874d9
post-merge fixup
2021-07-16 11:43:06 +01:00
Michael Telatynski
7a64adfc44
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/15536
...
Conflicts:
src/components/views/rooms/SendMessageComposer.js
2021-07-16 11:24:46 +01:00
James Salter
b55f69a74c
Merge pull request #6374 from matrix-org/copy-room
...
Add "Copy Link" to room context menu
2021-07-16 11:14:00 +01:00
Michael Telatynski
5f2fab02e7
Merge pull request #6385 from matrix-org/t3chguy/fix/18008
2021-07-16 11:06:57 +01:00
James Salter
767d97065d
Run i18n
2021-07-16 09:36:59 +01:00
James Salter
9cb3c71afe
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into copy-room
2021-07-16 09:34:30 +01:00
James Salter
685b59235d
Make error message consistent with menu title
2021-07-16 09:24:46 +01:00
Michael Telatynski
05028f1997
remove unused import
2021-07-16 09:22:25 +01:00
James Salter
329f1c9d6a
Update src/components/views/rooms/RoomTile.tsx
...
Co-authored-by: Michael Telatynski <7t3chguy@gmail.com>
2021-07-16 09:22:17 +01:00
Michael Telatynski
191591e807
Make the critical sections of the RLS synchronous to avoid needing to mutex everything
2021-07-16 09:15:56 +01:00
James Salter
ff80bbc4a5
Move copy link to be before settings
2021-07-16 09:10:20 +01:00
James Salter
a1c658f187
Set Menu icon to link
2021-07-16 09:07:52 +01:00
James Salter
7464900f95
Change menu label to Copy Link
2021-07-16 09:05:01 +01:00
Michael Telatynski
32cc48ff7a
Fix issue with room duplication caused by filtering and selecting room using keyboard
...
Wrap sticky room updates in lock to prevent setStickyRoom running in middle of setKnownRooms
2021-07-16 08:49:19 +01:00
Aaron Raimist
8f6458a79c
Add matrix: to the list of permitted URL schemes
...
Signed-off-by: Aaron Raimist <aaron@raim.ist>
2021-07-16 01:43:07 -05:00
Michael Telatynski
6809817c77
Merge pull request #6387 from SimonBrandner/fix/irc-replies/18010
...
Fix IRC layout replies
2021-07-16 07:11:53 +01:00
Šimon Brandner
a3792b75e2
Fix IRC layout replies
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-16 07:53:20 +02:00