Commit graph

35338 commits

Author SHA1 Message Date
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
Šimon Brandner
2a2b8adabc
Merge remote-tracking branch 'upstream/develop' into fix/12652/screen-share 2021-07-16 21:38:46 +02:00
Šimon Brandner
18ba7a280d
Give sources a little padding
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-16 21:30:50 +02:00
Robin Townsend
eefadf6a46 Fix tests
Signed-off-by: Robin Townsend <robin@robin.town>
2021-07-16 15:30:26 -04:00
Šimon Brandner
27b02617c2
i18n
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-16 21:16:14 +02:00
Šimon Brandner
31f5d012b8
Improve the look and feel of the picker
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-16 21:16:07 +02: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
Šimon Brandner
77c8425c3c
Rewrite using TabbedView and improve TS
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-16 20:50:29 +02: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
d512a83a6c
Merge remote-tracking branch 'upstream/develop' into fix/12652/screen-share
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-16 19:37:57 +02: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
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
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
Travis Ralston
2690bb56f9 Remove code we don't seem to need 2021-07-15 13:39:54 -06:00
Michael Telatynski
831c482371 Stub out MatrixClient::isUserIgnored for tests 2021-07-15 18:17:07 +01:00
Michael Telatynski
1437188282 Also move effects handling from event to Room.timeline to wake up less 2021-07-15 18:02:02 +01:00
Michael Telatynski
923d68a0fa Fix EventIndex handling events twice
It awaits the decryption in onRoomTimeline as well as subscribing to EVent.decrypted
2021-07-15 17:46:46 +01:00
Michael Telatynski
b0053f36d3 Fix instances of event.sender being read for just the userId - this field may not be set in time 2021-07-15 17:43:24 +01:00
Michael Telatynski
376533e709
Merge pull request #3553 from maunium/compact-reply-rendering 2021-07-15 15:52:10 +01:00
Germain Souquet
54bfe8ec1e Migrate Welcome to TypeScript 2021-07-15 15:49:18 +02:00
Germain Souquet
3b5266071e Migrate LanguageSelector to TypeScript 2021-07-15 15:44:44 +02:00
Germain Souquet
8ef9c3dfeb Migrate CountryDropdown to TypeScript 2021-07-15 15:42:11 +02:00