PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4
35059 commits 1 branch 0 tags 338 MiB
Commit graph

35059 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
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
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
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
Šimon Brandner
5d0afdb706
Don't show line number in replies 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-15 15:38:07 +02:00
Šimon Brandner
88da0f4dcf
Give audio and video replies an icon 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-15 15:17:41 +02:00
Šimon Brandner
68640a4dbd
Fix icon postion 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-15 15:16:05 +02:00
Šimon Brandner
375e279825
Add speaker icon 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-15 15:15:48 +02:00
David Baker
f1bb223803
Merge pull request #6380 from matrix-org/dbkr/new_changelogs 
Update PR template for new changelog generation
 2021-07-15 14:12:28 +01:00
Šimon Brandner
7f9f2dbbcb
Merge remote-tracking branch 'upstream/develop' into compact-reply-rendering 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-15 14:54:06 +02:00
Michael Telatynski
ea20e041b1
Merge pull request #6382 from matrix-org/t3chguy/console 2021-07-15 13:50:13 +01:00
Michael Telatynski
20e0356eb1 why do my IDE be dumb 2021-07-15 12:25:26 +01:00
Michael Telatynski
7dd4100f41 improve types 2021-07-15 12:18:17 +01:00
Michael Telatynski
7c3c04d340 Fix instances of setState calls after unmount 2021-07-15 12:10:54 +01:00
Michael Telatynski
e9d56d4f13 Fix possible uncaught exception for getUrlPreview which would cause 0 url previews if one url was faulty 2021-07-15 12:10:01 +01:00
Michael Telatynski
1eaf6dd4ed Improve TS in SenderProfile 2021-07-15 11:49:55 +01:00
Michael Telatynski
b8ac40ae55 Fix React missing key error 2021-07-15 11:49:44 +01:00