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

34322 commits

This branch
This branch
All branches
Author SHA1 Message Date
Michael Telatynski
93010d34fd
Merge branch 'develop' into t3chguy/fix/6606 2021-06-03 19:33:09 +01:00
David Baker
7421efe8f9
Merge pull request #6136 from matrix-org/dbkr/map_phone_number_lookup_to_native 
Map phone number lookup results to their native rooms
 2021-06-03 19:01:46 +01:00
Michael Telatynski
0c97d90fb9 Iterate PR based on feedback 2021-06-03 16:44:28 +01:00
Germain
a36063704d
Merge pull request #6138 from matrix-org/gsouquet/containment-event 
Fix mx_Event containment rules and empty read avatar row
 2021-06-03 16:38:55 +01:00
Germain Souquet
5ef78f43a4 fix containment rule to keep height when resizing vertically 2021-06-03 16:26:20 +01:00
Michael Telatynski
f2643151c6 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17365 
 Conflicts:
	src/components/views/dialogs/InviteDialog.tsx
 2021-06-03 16:22:59 +01:00
David Baker
8ef95a6237 Interface dispatcher payload 
& use constant in test
 2021-06-03 14:38:13 +01:00
Jaiwanth
e7f0df7fcc Small fix 2021-06-03 13:39:14 +05:30
Michael Telatynski
dbaa394d65 i18n 2021-06-03 08:54:30 +01:00
Jaiwanth
4c22d1f2a1 Refactor 2021-06-03 13:21:56 +05:30
Germain
7f83590846
Merge pull request #6079 from matrix-org/gsouquet/switch-rooms 2021-06-03 08:44:01 +01:00
Michael Telatynski
4f50727010 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/6606 
 Conflicts:
	src/components/structures/RoomView.tsx
	src/components/views/right_panel/UserInfo.tsx
 2021-06-03 08:42:05 +01:00
Michael Telatynski
83d223475b delint imports 2021-06-03 08:41:22 +01:00
Germain Souquet
a34f8a29f4 fix mx_Event containment rules and empty read avatar row 2021-06-03 08:41:12 +01:00
Michael Telatynski
4765216280 Merge branch 't3chguy/fix/6606' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/6606 2021-06-03 08:36:04 +01:00
Michael Telatynski
42a3ace82a Iterate PR based on feedback 2021-06-03 08:35:12 +01:00
Michael Telatynski
e334ce8192 First cut of space panel drag-and-drop ordering 2021-06-03 08:32:36 +01:00
Michael Telatynski
3f12b7280d Make AutoHideScrollbar pass through all unknown props 2021-06-03 08:31:06 +01:00
Germain
430cfa9c06
Merge pull request #6127 from matrix-org/gsouquet/css-containment 
Add CSS containment rules for shorter reflow operations
 2021-06-03 08:10:29 +01:00
Jaiwanth
183166c460 Unminify CSS and apply suggestions from the design team 2021-06-03 12:40:00 +05:30
c-cal
9f1e1c2420 Translated using Weblate (French) 
Currently translated at 100.0% (2979 of 2979 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/fr/
 2021-06-03 07:09:49 +00:00
Miquel Lionel
b4f8c66f7b Translated using Weblate (French) 
Currently translated at 100.0% (2979 of 2979 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/fr/
 2021-06-03 07:09:48 +00:00
zopieux
c1a763fb4f Translated using Weblate (French) 
Currently translated at 100.0% (2979 of 2979 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/fr/
 2021-06-03 07:09:48 +00:00
Michael Telatynski
53fc475539
Update src/components/views/rooms/PinnedEventTile.tsx 
Co-authored-by: Travis Ralston <travisr@matrix.org>
 2021-06-03 08:03:31 +01:00
David Baker
58652152c1 Strings are now in a different place... 2021-06-02 17:52:26 +01:00
David Baker
0aeddea30f Only do native lookup if it's supported 
Also fix as bug where we were checking the wrong field to check
for native/virtual support: oops.
 2021-06-02 17:47:29 +01:00
David Baker
2c4fa73a45 Map phone number lookup results to their native rooms 
When dialing a phone number, also look to see if there's a corresponding
native user for the resulting user, and if so, go to the native room
for that user.
 2021-06-02 17:39:13 +01:00
Michael Telatynski
079a5c10ad Respect space ordering field in m.tag for top level spaces 2021-06-02 16:43:38 +01:00
Michael Telatynski
4290237bdf
Merge pull request #6135 from matrix-org/t3chguy/fix/17494 
ignore hash/fragment when de-duplicating links for url previews
 2021-06-02 15:08:41 +01:00
Germain
70e309f0de
Merge pull request #5823 from matrix-org/gsouquet-scroll-to-live-reset-hash 2021-06-02 14:10:16 +01:00
Germain Souquet
bc50028f70 Merge branch 'develop' into gsouquet-scroll-to-live-reset-hash 2021-06-02 13:57:33 +01:00
Michael Telatynski
da13ec16f3 Merge branch 't3chguy/fix/17529' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17282 2021-06-02 12:42:55 +01:00
Michael Telatynski
35948374e9 remove unused imports 2021-06-02 11:56:49 +01:00
Michael Telatynski
bc89cf14dd ignore hash/fragment when de-duplicating links for url previews 2021-06-02 11:53:47 +01:00
Germain
9d126c51e4
Merge pull request #6113 from matrix-org/gsouquet/improve-layout-rendering 2021-06-02 11:41:59 +01:00
Germain
96f5d3af05
Merge pull request #6130 from matrix-org/gsouquet/member-list-sort 2021-06-02 11:40:52 +01:00
J. Ryan Stinnett
2d50325836
Merge pull request #6133 from matrix-org/jryans/event-tile-radius 
Tweak event border radius to match action bar
 2021-06-02 11:39:54 +01:00
Michael Telatynski
bc3c759feb Add temporary mechanism for managing communities without dnd 2021-06-02 11:33:25 +01:00
Germain Souquet
f3431feaff Remove unused memoize import 2021-06-02 11:25:32 +01:00
David Baker
bc2f068e1e
Merge pull request #6131 from matrix-org/dbkr/log_when_already_a_call 
Log when we ignore a second call in a room
 2021-06-02 11:13:46 +01:00
Germain Souquet
82fe9a5c7b remove unused import 2021-06-02 10:48:18 +01:00
Germain Souquet
d7a5547d80 use Intl.Collator over String.prototype.localeCompare for better performance 2021-06-02 10:42:17 +01:00
J. Ryan Stinnett
234c65b331 Tweak event border radius to match action bar 
This adjusts the `border-radius` used when hovering on an event to match the
recently changed value for the action bar (changed to `8px` in
https://github.com/matrix-org/matrix-react-sdk/pull/6066).
 2021-06-02 10:25:29 +01:00
Jaiwanth
f84ae4a173 Add await 2021-06-02 13:12:03 +05:30
Jaiwanth
692e499cf2 Handle encrypted stickers and store stickers in a separate folder 2021-06-02 12:06:00 +05:30
Travis Ralston
3dc6cfbf34 Undo olmVersion handling 2021-06-01 22:31:08 -06:00
Travis Ralston
c9883f346c Build pass 1 2021-06-01 22:21:04 -06:00
Travis Ralston
5b2dacd99e Adapt for js-sdk MatrixClient conversion to TS 
For https://github.com/matrix-org/matrix-js-sdk/pull/1718
 2021-06-01 21:36:28 -06:00
Robin Townsend
992861a1cd Fix forward dialog tests 
Signed-off-by: Robin Townsend <robin@robin.town>
 2021-06-01 20:36:28 -04:00
Robin Townsend
59660df0cb Use a QueryMatcher for forward dialog filtering 
This also allows us to filter by room aliases.

Signed-off-by: Robin Townsend <robin@robin.town>
 2021-06-01 20:17:20 -04:00