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

28393 commits

Author SHA1 Message Date
Šimon Brandner
c2aada6aa7
Clearer avatar sizing 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-21 21:27:07 +02:00
Weblate
ddea1461a7 Merge branch 'origin/develop' into Weblate. 2021-07-21 19:07:28 +00:00
Travis Ralston
36d4eb85e1 Restore 'use default' naming on room notifications 
Fixes https://github.com/vector-im/element-web/issues/18139
Following https://github.com/matrix-org/matrix-react-sdk/pull/6352
 2021-07-21 13:01:19 -06:00
Šimon Brandner
34f3e62f72
Types! 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-21 20:48:50 +02:00
Šimon Brandner
9891eddcbd
Rename to toast 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-21 18:28:44 +02:00
Šimon Brandner
ddd4b4bc12
Show a "Your camera is turned off" toast 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-21 18:22:47 +02:00
Weblate
36c66fe279 Merge branch 'origin/develop' into Weblate. 2021-07-21 16:17:55 +00:00
Germain
0d8309c8fc
Merge pull request #6429 from matrix-org/gsouquet/fix-18146 2021-07-21 17:17:51 +01:00
Šimon Brandner
3fac4adfc7
Fix feed sizing issues 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-21 18:14:21 +02:00
Weblate
20edfc9c25 Merge branch 'origin/develop' into Weblate. 2021-07-21 15:59:28 +00:00
Šimon Brandner
dc7f6d8286
Show sidebar in PiP mode 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-21 17:45:21 +02:00
David Baker
a6c432d66f fix types 
in varyingly hacky ways
 2021-07-21 16:39:41 +01:00
Germain Souquet
26ca41f699 Cache room member count on the messagePanel 2021-07-21 17:26:41 +02:00
Šimon Brandner
0a8067506f
Adjust hiding local feeds 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-21 17:12:27 +02:00
Germain Souquet
43d62aa8c1 Use more performant getMembersCount to decide to hide or show sender 2021-07-21 16:43:57 +02:00
Šimon Brandner
337664a1b4
Update sidebar behaviour 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-21 16:34:21 +02:00
Šimon Brandner
74649f1f92
Correct feed ordering 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-21 16:21:52 +02:00
Šimon Brandner
2014517173
Always show screensharing feed as primary 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-21 16:20:09 +02:00
Weblate
0a064b89e5 Merge branch 'origin/develop' into Weblate. 2021-07-21 14:12:02 +00:00
Germain
80e64601a9
Merge pull request #6427 from matrix-org/gsouquet/fix-18120 
Improve new layout switcher UI
 2021-07-21 15:11:58 +01:00
Germain Souquet
e5bc5a933e Use cached value to read member count 2021-07-21 16:10:18 +02:00
Šimon Brandner
51cf426179
Update the toast 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-21 16:08:18 +02:00
Weblate
0ccde3dfbb Merge branch 'origin/develop' into Weblate. 2021-07-21 13:58:52 +00:00
Travis Ralston
34b8870a95
Merge pull request #6417 from matrix-org/travis/voice-messages/play-1 
Play only one audio file at a time
 2021-07-21 07:58:46 -06:00
Šimon Brandner
be52eba027
Merge remote-tracking branch 'upstream/develop' into fix/12652/screen-share 2021-07-21 15:56:08 +02:00
Weblate
77e095c10a Merge branch 'origin/develop' into Weblate. 2021-07-21 13:38:56 +00:00
jelv
2c370325b7 Translated using Weblate (Dutch) 
Currently translated at 100.0% (3045 of 3045 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/nl/
 2021-07-21 13:38:55 +00:00
Šimon Brandner
e8760736ba
Merge remote-tracking branch 'upstream/develop' into fix/file-label-behaviour 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-21 15:33:06 +02:00
Germain Souquet
c155382445 Improve new layout switcher UI 2021-07-21 14:55:30 +02:00
Weblate
67f24b55c9 Merge branch 'origin/develop' into Weblate. 2021-07-21 10:56:47 +00:00
libexus
3292374ac0 Translated using Weblate (German) 
Currently translated at 98.9% (3013 of 3045 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/de/
 2021-07-21 10:54:38 +00:00
Germain Souquet
ae51653348 Add null guard for room prop in EventTile 2021-07-21 12:41:02 +02:00
Weblate
99bc204669 Merge branch 'origin/develop' into Weblate. 2021-07-21 10:30:26 +00:00
Besnik Bleta
4c82f161c3 Translated using Weblate (Albanian) 
Currently translated at 99.7% (3038 of 3045 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/sq/
 2021-07-21 10:30:26 +00:00
Michael Telatynski
5a7fe60d0e
Merge pull request #6416 from robintown/non-emoji-reactions 2021-07-21 11:30:15 +01:00
Michael Telatynski
d147aaa984 delint and fix min-height issue 2021-07-21 11:27:36 +01:00
Michael Telatynski
fd64d37305 Add iconography to Create Room Dialog dropdown 
Remove unused old stale feather-customised/globe.svg
 2021-07-21 11:20:41 +01:00
Michael Telatynski
390b05617c Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17686 
 Conflicts:
	src/components/views/dialogs/CreateRoomDialog.tsx
	src/components/views/dialogs/RoomUpgradeDialog.tsx
	src/components/views/dialogs/RoomUpgradeWarningDialog.tsx
	src/components/views/settings/tabs/room/SecurityRoomSettingsTab.tsx
 2021-07-21 10:46:41 +01:00
Michael Telatynski
a58edcb241 tweak copy 2021-07-21 10:43:12 +01:00
Weblate
2706e29579 Merge branch 'origin/develop' into Weblate. 2021-07-21 08:43:20 +00:00
Germain
b31b8f1b41
Remove old container sizing comment 
Co-authored-by: James Salter <jamess@element.io>
 2021-07-21 09:13:12 +01:00
Germain Souquet
a7cd5fc49b Shift thumbnail dislay to use object-fit to preserve aspect-ratio 2021-07-21 10:03:10 +02:00
Germain Souquet
794c49c5db Migrate MStickerBody to TypeScript 2021-07-21 09:52:09 +02:00
Weblate
430df6d083 Merge branch 'origin/develop' into Weblate. 2021-07-21 07:36:13 +00:00
Germain Souquet
54841d63dc Fix wrench-tests by importing EmbeddedPage through sdk.getComponent 2021-07-21 09:29:33 +02:00
Robin Townsend
1d1d93ed14 Apply code review suggestion 
Signed-off-by: Robin Townsend <robin@robin.town>
 2021-07-21 03:17:55 -04:00
Priit Jõerüüt
4c00b807c2 Translated using Weblate (Estonian) 
Currently translated at 99.3% (3025 of 3045 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/et/
 2021-07-21 06:55:16 +00:00
XoseM
e9ee55ceb3 Translated using Weblate (Galician) 
Currently translated at 100.0% (3045 of 3045 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/gl/
 2021-07-21 06:55:13 +00:00
Jeff Huang
5f29fa55bb Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (3045 of 3045 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/zh_Hant/
 2021-07-21 06:55:08 +00:00
libexus
6e6a227b13 Translated using Weblate (German) 
Currently translated at 98.9% (3012 of 3045 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/de/
 2021-07-21 06:55:03 +00:00
Robin Townsend
0497e0864f Fix types 
Signed-off-by: Robin Townsend <robin@robin.town>
 2021-07-21 02:42:30 -04:00
Robin Townsend
3911666c52 Zoom images to where the cursor points 
Signed-off-by: Robin Townsend <robin@robin.town>
 2021-07-21 02:25:34 -04:00
libexus
d80c6b6f25 Translated using Weblate (German) 
Currently translated at 98.6% (3003 of 3045 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/de/
 2021-07-21 06:02:27 +00:00
René-Maximilian Malsky
925d24b5d6 Translated using Weblate (German) 
Currently translated at 98.6% (3003 of 3045 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/de/
 2021-07-21 06:02:27 +00:00
René-Maximilian Malsky
e56cded8b6 Translated using Weblate (German) 
Currently translated at 98.5% (3002 of 3045 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/de/
 2021-07-21 06:00:16 +00:00
Travis Ralston
45f9f3e13e Name functions better 2021-07-20 23:34:27 -06:00
Travis Ralston
a759d61ba0 Play only one audio file at a time 
Fixes https://github.com/vector-im/element-web/issues/17439
 2021-07-20 23:28:07 -06:00
Robin Townsend
aefdac1115 Fix error when hovering over non-emoji reactions 
Signed-off-by: Robin Townsend <robin@robin.town>
 2021-07-20 22:41:49 -04:00
Šimon Brandner
e45b1a1e41
Missing license header 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-20 18:52:02 +02:00
Šimon Brandner
862932cce5
Don't use require 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-20 18:48:18 +02:00
Germain
3372a77248
Remove grecaptcha from globals thanks to #6412 
Co-authored-by: Michael Telatynski <7t3chguy@gmail.com>
 2021-07-20 17:45:47 +01:00
Germain Souquet
efce2d16f1 Merge branch 'develop' into gsouqet/ts-migration-1 2021-07-20 18:43:08 +02:00
Germain
745a8d3860
Explain isSmall proper for CountryDropdown 
Co-authored-by: Michael Telatynski <7t3chguy@gmail.com>
 2021-07-20 17:18:33 +01:00
Weblate
c47ff9189c Merge branch 'origin/develop' into Weblate. 2021-07-20 15:38:24 +00:00
Šimon Brandner
9fb872cade
Sort feeds 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-20 17:34:47 +02:00
Dariusz Niemczyk
44b8bace47
Merge branch 'develop' into fix/15142/fix-grecaptcha-race-condition 
* develop: (141 commits)
  delint
  Doc some values
  Remove useless image reference
  Revert accidental renaming of dispatcherRef
  Fix event highlighthing
  Move some code around for clarity
  Constrain emoji skins type even further
  Delint
  i18n irc and fix lint from merge conflict
  Remove unwanted coma in EventTile
  fix three lints
  lint fix
  not sure how these happened :/
  remove unused prop
  Update eslint-plugin-matrix-org
  Fix placeholder centering
  Make emoji skins type more specific
  Rename some variables since their purpose has changed
  Conform to new react and typescript eslint rules
  Apply code review suggestions
  ...
 2021-07-20 17:33:05 +02:00
Weblate
bf4239b3e6 Merge branch 'origin/develop' into Weblate. 2021-07-20 15:08:57 +00:00
Ihor Hordiichuk
d77842d497 Translated using Weblate (Ukrainian) 
Currently translated at 47.0% (1431 of 3044 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/uk/
 2021-07-20 15:08:57 +00:00
Šimon Brandner
cfaf4b8078
Correct sidebar behaviour when muting local video 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-20 17:08:17 +02:00
Travis Ralston
7892539a9b delint 2021-07-20 09:03:26 -06:00
Šimon Brandner
c7a28491ca
Correct sidebar toggle behaviour 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-20 16:58:44 +02:00
Travis Ralston
5994111e5d Merge remote-tracking branch 'origin/develop' into travis/voice-messages/download 2021-07-20 08:55:53 -06:00
Travis Ralston
44e240e12d Doc some values 2021-07-20 08:55:07 -06:00
Travis Ralston
32d8da2c74 Remove useless image reference 2021-07-20 08:52:55 -06:00
Šimon Brandner
690905d01e
Show sidebar button only when screen-sharing 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-20 16:51:47 +02:00
Šimon Brandner
3751f04cef
Add "You are presenting toast" 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-20 16:17:07 +02:00
Šimon Brandner
0a282b587b
Reorder buttons 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-20 16:07:27 +02:00
Šimon Brandner
fadb13e9fb
Center all buttons 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-20 16:02:02 +02:00
Šimon Brandner
c25feb9b9f
Merge remote-tracking branch 'upstream/develop' into fix/12652/screen-share 2021-07-20 15:48:25 +02:00
Weblate
4a99dad130 Merge branch 'origin/develop' into Weblate. 2021-07-20 13:02:23 +00:00
Michael Telatynski
ad50d23cc2
Revert accidental renaming of dispatcherRef 2021-07-20 13:56:49 +01:00
Weblate
e9d186d3f7 Merge branch 'origin/develop' into Weblate. 2021-07-20 12:32:01 +00:00
jelv
fa7106eca1 Translated using Weblate (Dutch) 
Currently translated at 100.0% (3046 of 3046 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/nl/
 2021-07-20 12:32:01 +00:00
David Baker
c47a05cc48
Merge pull request #6121 from SimonBrandner/feature/call-event-tile 
Add VoIP event tiles
 2021-07-20 13:31:53 +01:00
Weblate
6ab11215fb Merge branch 'origin/develop' into Weblate. 2021-07-20 11:57:13 +00:00
Besnik Bleta
4b47ab31ec Translated using Weblate (Albanian) 
Currently translated at 99.7% (3039 of 3046 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/sq/
 2021-07-20 11:57:13 +00:00
jelv
d812d968e2 Translated using Weblate (Dutch) 
Currently translated at 100.0% (3046 of 3046 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/nl/
 2021-07-20 11:57:09 +00:00
Michael Telatynski
d8c4ab53e0
Merge pull request #6347 from robintown/emojibase-updates 2021-07-20 12:57:00 +01:00
Robin Townsend
cc40dd7998 Move some code around for clarity 
Signed-off-by: Robin Townsend <robin@robin.town>
 2021-07-20 07:47:31 -04:00
Šimon Brandner
6491a00645
Add some types 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-20 13:47:07 +02:00
Robin Townsend
bd80201643 Constrain emoji skins type even further 
Signed-off-by: Robin Townsend <robin@robin.town>
 2021-07-20 07:46:54 -04:00
Šimon Brandner
66a3b0fe5f
Merge remote-tracking branch 'upstream/develop' into fix/12652/screen-share 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-20 13:24:05 +02:00
Šimon Brandner
6cb1c5d918
Delint 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-20 13:20:30 +02:00
Šimon Brandner
dd6379cf4b
Merge remote-tracking branch 'upstream/develop' into feature/call-event-tile 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-20 13:15:04 +02:00
Šimon Brandner
c3399b110d
Fix setTimeout retrun type? 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-20 12:48:38 +02:00
Šimon Brandner
333608c4c4
sdk.getComponent shall die 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-20 12:42:21 +02:00
Šimon Brandner
73187156d4
Disable eslint line 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-20 12:38:14 +02:00
Šimon Brandner
b1f4ba28d7
Merge remote-tracking branch 'upstream/develop' into ts/address-stuff 2021-07-20 12:31:18 +02:00
Šimon Brandner
3cb7a6ab78
Improve more typing 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-20 12:30:41 +02:00
Šimon Brandner
1fc5138cfe
Convert AppPermission to TS 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-20 12:27:20 +02:00
Weblate
f913f0ee19 Merge branch 'origin/develop' into Weblate. 2021-07-20 10:23:41 +00:00
Michael Telatynski
770de8f6b5
Merge pull request #6408 from matrix-org/t3chguy/eslint 2021-07-20 11:23:36 +01:00
Germain Souquet
596fb774e3 Remove sdk.getComponent instructions 2021-07-20 12:22:32 +02:00
Michael Telatynski
b94886a291 i18n irc and fix lint from merge conflict 2021-07-20 11:18:27 +01:00
Weblate
1c6aa25070 Merge branch 'origin/develop' into Weblate. 2021-07-20 10:16:58 +00:00
Šimon Brandner
48949af961
Improve typing 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-20 12:16:33 +02:00
Šimon Brandner
93ab4dc787
UserAddressType -> IUserAddress 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-20 12:16:27 +02:00
Michael Telatynski
d3934ff7da
Merge branch 'develop' into t3chguy/eslint 2021-07-20 11:08:13 +01:00
Germain Souquet
e38682d75c Remove unwanted coma in EventTile 2021-07-20 12:05:18 +02:00
Šimon Brandner
a747bbbae7
Convert AddressPickerDialog to TS 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-20 12:01:08 +02:00
Šimon Brandner
156901ce62
Convert AddressTile to TS 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-20 12:01:08 +02:00
Šimon Brandner
28871ee07d
Convert AddressSelector to TS 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-20 12:01:07 +02:00
Šimon Brandner
8bbd91547d
Convert ActionButton to TS 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-20 12:01:02 +02:00
Michael Telatynski
9fe9534e01 fix three lints 2021-07-20 10:33:52 +01:00
Weblate
e3897fb978 Merge branch 'origin/develop' into Weblate. 2021-07-20 09:22:50 +00:00
René-Maximilian Malsky
96ab4fd022 Translated using Weblate (German) 
Currently translated at 99.0% (3013 of 3041 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/de/
 2021-07-20 09:22:50 +00:00
Germain
53ae7817bc
Merge pull request #6291 from matrix-org/gsouquet/message-bubbles-4635 2021-07-20 10:22:41 +01:00
Germain Souquet
dd65d47fba lint fix 2021-07-20 11:12:17 +02:00
Michael Telatynski
848b83015d not sure how these happened :/ 2021-07-20 09:37:54 +01:00
Michael Telatynski
e6869797d7 remove unused prop 2021-07-20 09:27:32 +01:00
Germain Souquet
06c9a060b4 Merge branch 'develop' into gsouquet/message-bubbles-4635 2021-07-20 10:16:21 +02:00
Weblate
6e0d8c4616 Merge branch 'origin/develop' into Weblate. 2021-07-20 08:11:41 +00:00
XoseM
7033d160f1 Translated using Weblate (Galician) 
Currently translated at 100.0% (3041 of 3041 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/gl/
 2021-07-20 08:11:41 +00:00
Jeff Huang
734b44ebdb Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (3041 of 3041 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/zh_Hant/
 2021-07-20 08:11:39 +00:00
libexus
3f3ffbb616 Translated using Weblate (German) 
Currently translated at 99.1% (3014 of 3041 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/de/
 2021-07-20 08:11:37 +00:00
Michael Telatynski
e11e17eb85
Merge pull request #6411 from SimonBrandner/fix/sticker-placeholder/18014 2021-07-20 09:11:28 +01:00
Germain Souquet
fdd98bbf3f linter fix 2021-07-20 09:55:26 +02:00
Germain Souquet
bb03fd90c8 Merge branch 'develop' into gsouqet/ts-migration-1 2021-07-20 09:02:48 +02:00
Šimon Brandner
5db20d9431
Fix placeholder centering 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-20 08:54:32 +02:00
Robin Townsend
e9963cd22c Make emoji skins type more specific 
Signed-off-by: Robin Townsend <robin@robin.town>
 2021-07-19 21:57:03 -04:00
Robin Townsend
5614ef1675 Rename some variables since their purpose has changed 
Signed-off-by: Robin Townsend <robin@robin.town>
 2021-07-19 21:54:25 -04:00
Michael Telatynski
ce78cdf4ad Conform to new react and typescript eslint rules 2021-07-19 22:43:11 +01:00
Robin Townsend
f8a922eaa1 Apply code review suggestions 
including filling in gaps in emoji shortcode coverage.

Signed-off-by: Robin Townsend <robin@robin.town>
 2021-07-19 15:09:15 -04:00
Weblate
5ff5b9f45e Merge branch 'origin/develop' into Weblate. 2021-07-19 16:56:29 +00: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
Weblate
310c7807a1 Merge branch 'origin/develop' into Weblate. 2021-07-19 16:24:11 +00: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
Šimon Brandner
1b74286cf0
/me has managed to steel something by accident 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-19 18:11:23 +02:00
Šimon Brandner
3250b35151
i18n 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-19 18:10:31 +02:00
Šimon Brandner
5d5b9f6022
Better labeling of images and stickers 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-19 18:04:33 +02:00
Šimon Brandner
28f5827884
Add FileUtils 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-19 18:02:33 +02:00
Michael Telatynski
f2a88599a4 delint 2021-07-19 16:51:43 +01:00
Michael Telatynski
de42a00ca4 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17686 
 Conflicts:
	src/components/views/avatars/RoomAvatar.tsx
	test/stores/SpaceStore-test.ts
	test/test-utils.js
 2021-07-19 16:47:31 +01:00
Weblate
3f75e9f224 Merge branch 'origin/develop' into Weblate. 2021-07-19 14:58:45 +00: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
Dariusz Niemczyk
5acc7fe8d4
Make errorText properly optional instead of null 2021-07-19 16:49:39 +02:00
Dariusz Niemczyk
9e9992078b
Update src/@types/global.d.ts 
Co-authored-by: Michael Telatynski <7t3chguy@gmail.com>
 2021-07-19 16:34:07 +02:00
Dariusz Niemczyk
97d490c1b6
Update src/components/views/auth/CaptchaForm.tsx 
Co-authored-by: Michael Telatynski <7t3chguy@gmail.com>
 2021-07-19 16:28:30 +02:00
Dariusz Niemczyk
c2394b9161
Fix styling comments 2021-07-19 16:27:39 +02:00
Weblate
ea1e8bfdd4 Merge branch 'origin/develop' into Weblate. 2021-07-19 14:17:17 +00:00
XoseM
4d72e05dc6 Translated using Weblate (Galician) 
Currently translated at 100.0% (3041 of 3041 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/gl/
 2021-07-19 14:17:16 +00: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
Dariusz Niemczyk
9de5ebd4de
Fix grecaptcha throwing useless error sometimes 2021-07-19 15:41:44 +02:00
Weblate
b0cc7afe85 Merge branch 'origin/develop' into Weblate. 2021-07-19 11:53:47 +00:00
jelv
ddaa35cb8b Translated using Weblate (Dutch) 
Currently translated at 100.0% (3041 of 3041 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/nl/
 2021-07-19 11:53:47 +00:00
Thibault Martin
c9a26665ef Translated using Weblate (French) 
Currently translated at 99.8% (3036 of 3041 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/fr/
 2021-07-19 11:53:45 +00: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
Weblate
8893e3ab2e Merge branch 'origin/develop' into Weblate. 2021-07-19 09:09:22 +00:00
Priit Jõerüüt
a754a08d3b Translated using Weblate (Estonian) 
Currently translated at 99.6% (3031 of 3041 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/et/
 2021-07-19 09:09:22 +00:00
Jeff Huang
4a93c7cffc Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (3041 of 3041 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/zh_Hant/
 2021-07-19 09:09:17 +00:00
jelv
4b5ccd87fe Translated using Weblate (Dutch) 
Currently translated at 99.9% (3038 of 3041 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/nl/
 2021-07-19 09:09:13 +00: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
Travis Ralston
70e525d672 Fix component export 2021-07-18 17:06:30 -06:00
Robin Townsend
c0123f5dad Merge branch 'develop' into watch-show-timestamps 2021-07-18 11:47:44 -04:00
Weblate
09267addf1 Merge branch 'origin/develop' into Weblate. 2021-07-18 12:38:20 +00:00
Besnik Bleta
092476b3f5 Translated using Weblate (Albanian) 
Currently translated at 99.7% (3033 of 3041 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/sq/
 2021-07-18 12:38:20 +00:00
XoseM
7cfebe198a Translated using Weblate (Galician) 
Currently translated at 99.2% (3017 of 3041 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/gl/
 2021-07-18 12:38:15 +00:00
random
d3ee4d6b30 Translated using Weblate (Italian) 
Currently translated at 99.9% (3039 of 3041 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/it/
 2021-07-18 12:38:00 +00:00
iaiz
c8cef74f70 Translated using Weblate (Spanish) 
Currently translated at 99.5% (3027 of 3041 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/es/
 2021-07-18 12:37:55 +00: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
Weblate
818405b5a2 Merge branch 'origin/develop' into Weblate. 2021-07-17 13:12:33 +00:00
Michael Telatynski
f7767bf09c
Merge pull request #6393 from robintown/match-avatar-colors 2021-07-17 14:12:29 +01:00
Weblate
8e3e513910 Merge branch 'origin/develop' into Weblate. 2021-07-17 13:11:47 +00: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
5c5b79a972
Merge remote-tracking branch 'upstream/develop' into feature/call-event-tile 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-17 08:13:51 +02:00
Šimon Brandner
313964e796
Fix call event tile not behaving 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-17 08:12:53 +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
Weblate
cfdc8cd2eb Merge branch 'origin/develop' into Weblate. 2021-07-17 05:56:52 +00: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
Weblate
5d56dd47b5 Merge branch 'origin/develop' into Weblate. 2021-07-16 23:08:45 +00:00
Besnik Bleta
053112dc4c Translated using Weblate (Albanian) 
Currently translated at 99.5% (3037 of 3051 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/sq/
 2021-07-16 23:08:44 +00:00
Ihor Hordiichuk
e0a438aaa8 Translated using Weblate (Ukrainian) 
Currently translated at 47.8% (1461 of 3051 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/uk/
 2021-07-16 23:08:42 +00: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
Travis Ralston
4d38218e24 Appease the linter 2021-07-16 16:11:27 -06:00
Travis Ralston
31d7de628e Small tweaks 2021-07-16 16:04:23 -06:00
Travis Ralston
b57fff5739 Update visual style and sandbox properly 2021-07-16 15:55:07 -06:00