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

26743 commits

Author SHA1 Message Date
Aaron Raimist
a5bf17ff65
Revert incorrect change to forShareableRoom 
Signed-off-by: Aaron Raimist <aaron@raim.ist>
 2021-06-07 16:54:41 -05:00
Aaron Raimist
c99c42f341 Merge branch 'develop' into share-room 2021-06-04 01:08:09 -05:00
Michael Telatynski
5d0d81e79a not sure how I butchered this merge conflict resolution this much. 2021-06-03 19:37:26 +01:00
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
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
David Baker
8ef95a6237 Interface dispatcher payload 
& use constant in test
 2021-06-03 14:38:13 +01:00
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
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
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 Souquet
bc50028f70 Merge branch 'develop' into gsouquet-scroll-to-live-reset-hash 2021-06-02 13:57:33 +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
Germain Souquet
f3431feaff Remove unused memoize import 2021-06-02 11:25:32 +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
David Baker
f0f8210790 Log when we ignore a second call in a room 
What's more useful than a comment? A log line.
 2021-06-01 19:04:52 +01:00
c-cal
dfa8d1a8ac Translated using Weblate (French) 
Currently translated at 99.7% (2973 of 2979 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/fr/
 2021-06-01 14:52:14 +00:00
Weblate
390c1d2ffd Merge branch 'origin/develop' into Weblate. 2021-06-01 14:44:36 +00:00
Percy
31163df863 Translated using Weblate (Chinese (Simplified)) 
Currently translated at 100.0% (2974 of 2974 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/zh_Hans/
 2021-06-01 14:44:33 +00:00
random
e69c57ae94 Translated using Weblate (Italian) 
Currently translated at 100.0% (2974 of 2974 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/it/
 2021-06-01 14:43:54 +00:00
Percy
352ca1d270 Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (2974 of 2974 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/zh_Hant/
 2021-06-01 14:43:51 +00:00
iaiz
40619b83e0 Translated using Weblate (Spanish) 
Currently translated at 100.0% (2974 of 2974 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/es/
 2021-06-01 14:43:49 +00:00
Trendyne
be55864c5e Translated using Weblate (Icelandic) 
Currently translated at 22.1% (660 of 2974 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/is/
 2021-06-01 14:43:46 +00:00
Hivaa
92119afbfc Translated using Weblate (Persian) 
Currently translated at 100.0% (2974 of 2974 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/fa/
 2021-06-01 14:43:45 +00:00
Tirifto
20a03de6cc Translated using Weblate (Esperanto) 
Currently translated at 99.9% (2972 of 2974 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/eo/
 2021-06-01 14:43:43 +00:00
libexus
fc18e21ae1 Translated using Weblate (German) 
Currently translated at 99.3% (2956 of 2974 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/de/
 2021-06-01 14:43:33 +00:00
Michael Telatynski
e2e3b4a454
Merge pull request #6122 from matrix-org/t3chguy/fix/rs5414 
Fix all DMs wrongly appearing in room list when `m.direct` is changed
 2021-06-01 15:42:47 +01:00
Michael Telatynski
a1ff060138
Merge pull request #6123 from matrix-org/t3chguy/fix/17517 
Update way of checking for registration disabled
 2021-06-01 15:20:21 +01:00
Michael Telatynski
4e6f1e6294 add comment 2021-06-01 15:00:59 +01:00
Germain Souquet
591314141b Add methods visibility for AutoHideScrollbar 2021-06-01 14:15:42 +01:00
Germain Souquet
73ca6b2ad0 Add passive flag to Tooltip scroll event listener 2021-06-01 14:14:02 +01:00
Germain Souquet
308ac505a8 Migrate AutoHideScrollbar to TypeScript 
Also changed the way the React.RefObject is collected
 2021-06-01 14:13:46 +01:00
Michael Telatynski
c6c1e09cae
Merge pull request #6126 from matrix-org/t3chguy/fix/rs5384 
Fix the ability to remove avatar from a space via settings
 2021-06-01 12:11:10 +01:00
Michael Telatynski
72fab80bb9
Merge pull request #6125 from matrix-org/t3chguy/fix/17521 
Switch to stable endpoint/fields for MSC2858
 2021-06-01 12:07:41 +01:00
J. Ryan Stinnett
173b0e9d78
Merge pull request #6117 from SimonBrandner/fix/down-arrow-edit/17491 
Clear stored editor state when canceling editing using a shortcut
 2021-06-01 12:07:23 +01:00
Michael Telatynski
6e74ab0cf5 Fix the ability to remove avatar from a space via settings 2021-06-01 11:11:04 +01:00
Michael Telatynski
4526998332 Remove brand prefix too 2021-06-01 11:04:45 +01:00
Michael Telatynski
f11a7083ae Switch to stable endpoint/fields for MSC2858 2021-06-01 11:01:09 +01:00
Michael Telatynski
e525d046c7 remove outdated TODO 2021-06-01 10:49:19 +01:00
Michael Telatynski
b2f01b8438 Respect newlines in space topics 2021-06-01 10:48:53 +01:00