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

28860 commits

This branch
This branch
All branches
Author SHA1 Message Date
Michael Telatynski
c784039cf6 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/feat/widgets 
 Conflicts:
	src/components/views/right_panel/WidgetCard.tsx
	src/stores/WidgetStore.ts
 2020-10-07 10:04:45 +01:00
Michael Telatynski
0d6edab708 Workaround Jest bug with ArrayBuffers 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-10-07 01:22:29 +01:00
Weblate
3304dff984 Merge branch 'origin/develop' into Weblate. 2020-10-06 23:15:01 +00:00
Michael Telatynski
430bceb91d
Merge pull request #5281 from matrix-org/t3chguy/fix/9836 
Fix editing and redactions not updating the Reply Thread
 2020-10-07 00:14:56 +01:00
Michael Telatynski
a8d88e01fb Write Enzyme tests for SendMessageComposer state/history persistence behaviour 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-10-07 00:10:40 +01:00
Michael Telatynski
965debf442 extend mockClient in testutils 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-10-07 00:09:48 +01:00
Michael Telatynski
ab518a469f Replace MatrixClientPeg with access to context in SendMessageComposer 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-10-07 00:09:09 +01:00
Michael Telatynski
13afb8d4f1 Update Jest and JSDOM 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-10-07 00:08:40 +01:00
Weblate
99d069f7ae Merge branch 'origin/develop' into Weblate. 2020-10-06 21:59:02 +00:00
Michael Telatynski
35c7ccfcbd
Merge pull request #5282 from matrix-org/t3chguy/fix/15380 
Hide Jump to Read Receipt button for users who have not yet sent an RR
 2020-10-06 22:58:56 +01:00
Michael Telatynski
1bd0d9e02b Iterate 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-10-06 22:53:34 +01:00
Michael Telatynski
2e45374cf8
Update src/components/views/right_panel/UserInfo.tsx 
Co-authored-by: Travis Ralston <travpc@gmail.com>
 2020-10-06 22:49:50 +01:00
Weblate
cc25e98dbf Merge branch 'origin/develop' into Weblate. 2020-10-06 20:36:20 +00:00
@a2sc:matrix.org
a8ec588247 Translated using Weblate (German) 
Currently translated at 99.9% (2371 of 2374 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/element-web/matrix-react-sdk/de/
 2020-10-06 20:36:20 +00:00
Travis Ralston
3fdefa354e
Merge pull request #5279 from Sorunome/soru/fix-img-rendering 
fix img tags not always being rendered correctly
 2020-10-06 14:36:14 -06:00
Weblate
e4e5137071 Merge branch 'origin/develop' into Weblate. 2020-10-06 19:37:22 +00:00
David Baker
3d7358d03a
Merge pull request #5293 from matrix-org/dbkr/fix_rightpanel_crash 
Hopefully fix righhtpanel crash
 2020-10-06 20:37:17 +01:00
David Baker
0c6be6cf5e Update copyright 
As per https://github.com/matrix-org/synapse/issues/7565#issuecomment-639171606
 2020-10-06 19:32:21 +01:00
David Baker
9dc0837619 Hopefully fix righhtpanel crash 
The right panel wearns many hats, and only one of those hats comes
with a room prop, so make sure it's there.
 2020-10-06 18:11:28 +01:00
Weblate
0dc35967aa Merge branch 'origin/develop' into Weblate. 2020-10-06 13:57:52 +00:00
Nikita Epifanov
6994247aa5 Translated using Weblate (Russian) 
Currently translated at 99.9% (2371 of 2374 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/element-web/matrix-react-sdk/ru/
 2020-10-06 13:57:52 +00:00
Priit Jõerüüt
e53d314828 Translated using Weblate (Estonian) 
Currently translated at 100.0% (2374 of 2374 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/element-web/matrix-react-sdk/et/
 2020-10-06 13:57:51 +00:00
Michael Telatynski
6f5f66e255
Merge pull request #5283 from matrix-org/t3chguy/fix/w1 
Fix naive pinning limit and app tile widgetMessaging NPE
 2020-10-06 14:57:46 +01:00
Michael Telatynski
120f269190 Track replyToEvent along with CIDER state & history 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-10-06 14:47:53 +01:00
Michael Telatynski
45fa647655 Convert SendHistoryManager to TS 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-10-06 13:55:39 +01:00
Weblate
316fe0ad03 Merge branch 'origin/develop' into Weblate. 2020-10-06 11:36:02 +00:00
Priit Jõerüüt
a575268ebd Translated using Weblate (Estonian) 
Currently translated at 100.0% (2372 of 2372 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/element-web/matrix-react-sdk/et/
 2020-10-06 11:36:02 +00:00
Besnik Bleta
8507480bdb Translated using Weblate (Albanian) 
Currently translated at 99.8% (2367 of 2372 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/element-web/matrix-react-sdk/sq/
 2020-10-06 11:36:02 +00:00
Michael Telatynski
5f615bd4c9
Merge pull request #5272 from matrix-org/t3chguy/fix/15255 
Show server errors from saving profile settings
 2020-10-06 12:35:56 +01:00
Michael Telatynski
55a18b8c2d Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/15255 
 Conflicts:
	src/components/views/settings/ProfileSettings.js
 2020-10-06 10:51:30 +01:00
Michael Telatynski
17a04f2915 Fix naive pinning limit and app tile widgetMessaging NPE 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-10-06 10:48:55 +01:00
Weblate
cb090f4743 Merge branch 'origin/develop' into Weblate. 2020-10-06 09:24:30 +00:00
Michael Telatynski
39c49125ce
Merge pull request #5273 from matrix-org/t3chguy/fix/15323 
Update copy for `redact` permission
 2020-10-06 10:24:26 +01:00
Weblate
c4d9edffcc Merge branch 'origin/develop' into Weblate. 2020-10-06 09:23:24 +00:00
Michael Telatynski
ab9b5b0d7b
Merge pull request #5265 from matrix-org/t3chguy/feat/widget-max-width 
Remove width limit on widgets
 2020-10-06 10:23:19 +01:00
Michael Telatynski
0bb26831ae Hide Jump to Read Receipt button for users who have not yet sent an RR 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-10-06 08:28:06 +01:00
Weblate
930deba957 Merge branch 'origin/develop' into Weblate. 2020-10-06 07:25:32 +00:00
Szimszon
9a448e3974 Translated using Weblate (Hungarian) 
Currently translated at 100.0% (2372 of 2372 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/element-web/matrix-react-sdk/hu/
 2020-10-06 07:25:32 +00:00
Priit Jõerüüt
d8443628e4 Translated using Weblate (Estonian) 
Currently translated at 100.0% (2372 of 2372 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/element-web/matrix-react-sdk/et/
 2020-10-06 07:25:32 +00:00
Jeff Huang
6306524805 Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (2372 of 2372 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/element-web/matrix-react-sdk/zh_Hant/
 2020-10-06 07:25:31 +00:00
Michael Telatynski
48da4c2abd
Merge pull request #5280 from michel-zimmer/call-container-avatar-initial-center 
Fix call container avatar initial centering
 2020-10-06 08:25:26 +01:00
Michael Telatynski
fbcea7d2cc Fix editing and redactions not updating the Reply Thread 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-10-06 08:23:48 +01:00
Michel Zimmer
80091f7db2 Fix call container avatar initial centering 
Signed-off-by: Michel Zimmer <opensource@michel-zimmer.de>
 2020-10-06 08:59:03 +02:00
Weblate
1042a84248 Merge branch 'origin/develop' into Weblate. 2020-10-05 23:32:10 +00:00
Michael Telatynski
1e34365caa
Merge pull request #5268 from matrix-org/t3chguy/fix/15349 
Fix right panel for peeking rooms
 2020-10-06 00:32:05 +01:00
Weblate
da7c0258c2 Merge branch 'origin/develop' into Weblate. 2020-10-05 21:40:55 +00:00
Hubert Chathi
f5f0686586
Merge pull request #5239 from uhoreg/dehydration 
Add support for dehydrated devices
 2020-10-05 17:40:49 -04:00
Weblate
98212b225e Merge branch 'origin/develop' into Weblate. 2020-10-05 13:46:19 +00:00
random
882648a918 Translated using Weblate (Italian) 
Currently translated at 100.0% (2371 of 2371 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/element-web/matrix-react-sdk/it/
 2020-10-05 13:46:19 +00:00
Michael Telatynski
fdb8cb78f9
Merge pull request #5277 from matrix-org/t3chguy/fix/9551 
Use Own Profile Store for the Profile Settings
 2020-10-05 14:46:12 +01:00