sorb/ThreadNet-Web
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 4 Wiki Activity
33,994 Commits 4 Branches 19 Tags
1bf9e592e951b0959a6f978fbe9f63773356689d
Commit Graph
33994 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Robin Townsend bbd5fab7b5 Fix type check 
As TypeScript points out, you can only set an id on HTML elements, not
arbitrary components.

Signed-off-by: Robin Townsend <robin@robin.town>
 2021-06-05 11:15:06 -04:00
Robin Townsend a06306d560 Merge branch 'develop' into improved-forwarding-ui 2021-06-05 11:04:17 -04:00
Robin Townsend 0f64f4d692 Fix MessagePanel tests 
Signed-off-by: Robin Townsend <robin@robin.town>
 2021-06-05 10:49:44 -04:00
TrendyneandWeblate 442d7f7a02 Translated using Weblate (Icelandic) 
Currently translated at 22.4% (668 of 2979 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/is/
 2021-06-05 14:35:10 +00:00
Thibault MartinandWeblate 0ecc97eb4b 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-05 14:35:09 +00:00
Priit JõerüütandWeblate 0de8e9b201 Translated using Weblate (Estonian) 
Currently translated at 99.8% (2974 of 2979 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/et/
 2021-06-05 14:35:07 +00:00
SzimszonandWeblate 261c91211f Translated using Weblate (Hungarian) 
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/hu/
 2021-06-05 14:35:04 +00:00
waclaw66andWeblate 3bdc84bb5d Translated using Weblate (Czech) 
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/cs/
 2021-06-05 14:35:02 +00:00
Besnik BletaandWeblate af2d902830 Translated using Weblate (Albanian) 
Currently translated at 99.6% (2970 of 2979 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/sq/
 2021-06-05 14:35:00 +00:00
XoseMandWeblate f5b02ecbf5 Translated using Weblate (Galician) 
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/gl/
 2021-06-05 14:34:57 +00:00
Ihor HordiichukandWeblate fe9644baca Translated using Weblate (Ukrainian) 
Currently translated at 49.2% (1467 of 2979 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/uk/
 2021-06-05 14:34:55 +00:00
jelvandWeblate 6243e693d6 Translated using Weblate (Dutch) 
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/nl/
 2021-06-05 14:34:53 +00:00
LinAGKarandWeblate 2533a9f52e Translated using Weblate (Swedish) 
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/sv/
 2021-06-05 14:34:51 +00:00
Jeff HuangandWeblate 7abd8957a5 Translated using Weblate (Chinese (Traditional)) 
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/zh_Hant/
 2021-06-05 14:34:49 +00:00
libexusandWeblate d7de5dfe83 Translated using Weblate (German) 
Currently translated at 99.4% (2962 of 2979 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/de/
 2021-06-05 14:34:46 +00:00
iaizandWeblate a85e251f0a Translated using Weblate (Spanish) 
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/es/
 2021-06-05 14:34:44 +00:00
randomandWeblate f63a92b5cf Translated using Weblate (Italian) 
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/it/
 2021-06-05 14:34:41 +00:00
dependabot[bot]andGitHub c24b239478 Bump ws from 6.2.1 to 6.2.2 in /test/end-to-end-tests 
Bumps [ws](https://github.com/websockets/ws) from 6.2.1 to 6.2.2.
- [Release notes](https://github.com/websockets/ws/releases)
- [Commits](https://github.com/websockets/ws/commits)

---
updated-dependencies:
- dependency-name: ws
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-06-05 13:36:25 +00:00
Robin Townsend 3bf8e54d7f Use cached RoomContext settings values throughout rooms 
Signed-off-by: Robin Townsend <robin@robin.town>
 2021-06-05 01:25:43 -04:00
Robin Townsend 13196b8146 Prefer cached settings values in shouldHideEvent 
Signed-off-by: Robin Townsend <robin@robin.town>
 2021-06-05 01:25:01 -04:00
Robin Townsend 48d3e41351 Cache frequently used settings values in RoomContext 
Signed-off-by: Robin Townsend <robin@robin.town>
 2021-06-05 01:23:51 -04:00
Robin Townsend 40d2f8228f Fix watching settings 
An accidental variable shadowing was preventing setting watcher
callbacks from being fired.

Signed-off-by: Robin Townsend <robin@robin.town>
 2021-06-05 01:16:52 -04:00
David Baker 31604c13c0 Lint the typescript tests 
Turns out we hadn't told eslint to lint .ts in tests/

Also fix all the lint errors, including removing a use of assert that
had randomly crept in.
 2021-06-04 16:52:50 +01:00
J. Ryan StinnettandGitHub abfe6d85a0 Merge pull request #6141 from matrix-org/jryans/repair-event-status 
Repair event status position in timeline
 2021-06-04 14:16:59 +01:00
J. Ryan Stinnett ab96d5f8af Repair event status position in timeline 
https://github.com/matrix-org/matrix-react-sdk/pull/6079 caused a regression in
the event status indicator. The `mx_EventTile_msgOption` container was folded
into the avatars code path, but the event status is a special case of this, so
it now needs to also have this container to preserve its positioning.

Fixes https://github.com/vector-im/element-web/issues/17552
 2021-06-04 11:54:58 +01:00
Michael Telatynski 93f41ce0ab Actually finish the empty state for the pinned messages card 2021-06-04 11:35:17 +01:00
Michael Telatynski 48bd6583ed Fix unpinning of pinned messages 2021-06-04 11:34:54 +01:00
Šimon Brandner 48c57610df Merge remote-tracking branch 'upstream/develop' into fix/mute-incoming-call/15591 2021-06-04 08:08:34 +02:00
Aaron Raimist c99c42f341 Merge branch 'develop' into share-room 2021-06-04 01:08:09 -05:00
Travis RalstonandGitHub 12e013508d Merge pull request #6132 from matrix-org/travis/ts-mtxcli 
Adapt for js-sdk MatrixClient conversion to TS
 2021-06-04 00:07:22 -06:00
Šimon Brandner 629201a074 Merge branch 'develop' into fix/mute-incoming-call/15591 2021-06-04 07:59:28 +02:00
Michael TelatynskiandGitHub f22fd7aa3b Merge pull request #6096 from matrix-org/t3chguy/fix/6606 2021-06-04 00:00:31 +01:00
Michael Telatynski 5d0d81e79a not sure how I butchered this merge conflict resolution this much. 2021-06-03 19:37:26 +01:00
Michael TelatynskiandGitHub 93010d34fd Merge branch 'develop' into t3chguy/fix/6606 2021-06-03 19:33:09 +01:00
David BakerandGitHub 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
GermainandGitHub 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
GermainandGitHub 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
GermainandGitHub 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
c-calandWeblate 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 LionelandWeblate 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
zopieuxandWeblate 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