mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web.git synced 2024-12-15 13:01:31 +03:00
Code Issues Projects Releases Packages Wiki Activity
35077 commits 219 branches 562 tags 474 MiB
Commit graph

27827 commits

Author SHA1 Message Date
Germain Souquet
06c9a060b4 Merge branch 'develop' into gsouquet/message-bubbles-4635 2021-07-20 10:16:21 +02:00
Robin Townsend
b36c748940 Fix avatar placeholders not getting capitalized 
Regressed by 096d0a7d12.

Signed-off-by: Robin Townsend <robin@robin.town>
 2021-07-19 12:48:44 -04:00
Travis Ralston
6862d97961 APPEASE THY JSON 2021-07-19 10:18:15 -06:00
Travis Ralston
b31043b5eb Revert order of notification setting radios 
Follow-on from https://github.com/matrix-org/matrix-react-sdk/pull/6352
Fixes https://github.com/vector-im/element-web/issues/18048
 2021-07-19 10:15:42 -06:00
Michael Telatynski
a3e5d76064
Merge pull request #6397 from matrix-org/t3chguy/fix/18040 
Respect compound emojis in default avatar initial generation
 2021-07-19 15:58:40 +01:00
James Salter
f9fbf6f210 Rename Copy Link to Copy Room Link 
Being explicit is clearer when this context menu applies to DM rooms, to make it clear that the link will be to the room and not to the person
 2021-07-19 15:05:04 +01:00
Michael Telatynski
48817499e4
Merge pull request #6399 from matrix-org/t3chguy/fix/18032 
Don't throw exception from setStickyRoom as it split-brains the RoomListStore
 2021-07-19 12:53:34 +01:00
David Baker
863f4d4f9f
Merge pull request #6394 from matrix-org/dbkr/exorcise_homeserver_checkbox 
Fix bug where 'other homeserver' would unfocus
 2021-07-19 10:09:03 +01:00
Michael Telatynski
e54a7f0997 Don't throw exception from setStickyRoom as it split-brains the RoomListStore 2021-07-19 09:36:25 +01:00
Michael Telatynski
4ef4f49e90
Merge pull request #6392 from SimonBrandner/task/cleanup-replies 2021-07-18 13:37:44 +01:00
Šimon Brandner
21eb299eff
Make roomStoreToken readonly 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-18 14:32:24 +02:00
Michael Telatynski
096d0a7d12 Respect grapheme clustering in default avatar initial generation to not break emojis 2021-07-17 23:00:46 +01:00
Šimon Brandner
d7e6856614
More delint 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-17 15:37:52 +02:00
Šimon Brandner
e439d2e911
Delint 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-17 15:29:18 +02:00
Šimon Brandner
7b45efc9e9
Fix EventTile typing 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-17 15:28:02 +02:00
Šimon Brandner
c9a11af26b
Give singletonRoomViewStore a type 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-17 15:25:53 +02:00
Šimon Brandner
2a7787e12d
Convert ReplyPreview to TS 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-17 15:25:42 +02:00
Michael Telatynski
f7767bf09c
Merge pull request #6393 from robintown/match-avatar-colors 2021-07-17 14:12:29 +01:00
Šimon Brandner
03ce480066
Convert ReplyThread to TS 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-17 15:06:21 +02:00
Šimon Brandner
6d4ae6481a
Add alt 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-17 08:21:46 +02:00
Šimon Brandner
bb643010a9
Remove title 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-17 08:10:34 +02:00
Travis Ralston
2089127dad
Merge pull request #6352 from matrix-org/travis/notifications-2 
Notification settings UI refresh
 2021-07-16 23:56:48 -06:00
Travis Ralston
e3e7d945fd Remove useless spread operator 2021-07-16 23:51:44 -06: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
Michael Telatynski
aaa9040634
Merge pull request #6391 from matrix-org/t3chguy/fix/14508.1 2021-07-16 19:58:38 +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
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
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
Travis Ralston
2690bb56f9 Remove code we don't seem to need 2021-07-15 13:39:54 -06: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