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

36395 commits

This branch
This branch
All branches
Author SHA1 Message Date
Michael Telatynski
af851f7f44 fix merge conflict resolution issue 2021-07-29 15:24:42 +01:00
Michael Telatynski
493cd01ed3 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18071 
 Conflicts:
	res/css/views/dialogs/_AddExistingToSpaceDialog.scss
	src/utils/space.tsx
 2021-07-29 15:22:52 +01:00
Michael Telatynski
efd8a2f9b0 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18096 
 Conflicts:
	src/components/structures/SpaceRoomView.tsx
	src/components/views/spaces/SpaceCreateMenu.tsx
	src/i18n/strings/en_EN.json
 2021-07-29 15:16:53 +01:00
Michael Telatynski
f69b4549dd Re-add top border stroke in space create menu 2021-07-29 15:13:02 +01:00
James Salter
cd2bc79b6b Remove comment 2021-07-29 14:43:19 +01:00
James Salter
a1ffd240e1 Use .instance pattern 2021-07-29 14:40:18 +01:00
Weblate
52867de5ee Merge branch 'origin/develop' into Weblate. 2021-07-29 13:33:39 +00:00
Germain
dac3eda9e3
Merge pull request #6499 from matrix-org/gsouquet/fix-18195 
Prevent timeline flickering on hover
 2021-07-29 14:33:34 +01:00
Šimon Brandner
871f1b7a5c
Handle all possible playMedia() in componentDidUpdate() 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-29 15:31:25 +02:00
Šimon Brandner
38a1b922bd
Add missing await 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-29 15:26:04 +02:00
David Baker
a7a84df49c
Merge pull request #6505 from matrix-org/fix/release-grecaptcha-regression 
Fix/release grecaptcha regression
 2021-07-29 14:19:09 +01:00
Šimon Brandner
cb89dd408c
Use mic mute icons 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-29 15:05:26 +02:00
Weblate
56df421485 Merge branch 'origin/develop' into Weblate. 2021-07-29 12:20:25 +00:00
Michael Telatynski
ab56a16907
Merge pull request #6458 from matrix-org/t3chguy/fix/18091 2021-07-29 13:20:19 +01:00
Michael Telatynski
08c883ed07 Update all copy of subspace to space 2021-07-29 13:02:07 +01:00
Weblate
7107fe785e Merge branch 'origin/develop' into Weblate. 2021-07-29 11:21:01 +00:00
Germain
3bd393f16b
Merge pull request #6501 from matrix-org/gsouquet/fix-18249 
Restore pointer cursor for SenderProfile in message bubbles
 2021-07-29 12:20:56 +01:00
Weblate
9539e9dc8e Merge branch 'origin/develop' into Weblate. 2021-07-29 11:20:41 +00:00
Germain
44bab05b47
Merge pull request #6500 from matrix-org/gsouquet/fix-18143 
Align event list summary read receipts when using message bubbles
 2021-07-29 12:20:37 +01:00
Weblate
ed4ba55556 Merge branch 'origin/develop' into Weblate. 2021-07-29 11:05:47 +00:00
Priit Jõerüüt
418ed9dd0b Translated using Weblate (Estonian) 
Currently translated at 98.8% (3047 of 3083 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/et/
 2021-07-29 11:05:47 +00:00
Dariusz Niemczyk
f9f9aebef6
Merge pull request #6503 from matrix-org/fix/grecaptcha-regression 
Fix grecaptcha regression
 2021-07-29 13:05:38 +02:00
Dariusz Niemczyk
7f6cf29766
Fix grecaptcha regression 2021-07-29 12:45:29 +02:00
Dariusz Niemczyk
7baa3284e3
Fix grecaptcha regression 2021-07-29 12:39:32 +02:00
Germain Souquet
6c68f779ec Restore pointer cursor for SenderProfile in message bubbles 2021-07-29 11:58:32 +02:00
Germain Souquet
9c4101fa89 Align event list summary read receipts when using message bubbles 2021-07-29 11:48:22 +02:00
Germain Souquet
78a9117598 Prevent timeline flickering on hover 2021-07-29 11:12:07 +02:00
Weblate
f87918c915 Merge branch 'origin/develop' into Weblate. 2021-07-29 08:51:24 +00:00
Jeff Huang
9a796149c6 Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (3083 of 3083 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/zh_Hant/
 2021-07-29 08:51:24 +00:00
Bog Rol
65d753348b Translated using Weblate (Hungarian) 
Currently translated at 99.9% (3082 of 3083 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/hu/
 2021-07-29 08:51:22 +00:00
Szimszon
fbde00e227 Translated using Weblate (Hungarian) 
Currently translated at 99.9% (3082 of 3083 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/hu/
 2021-07-29 08:51:22 +00:00
Germain
ef8d2e8257
Merge pull request #6477 from matrix-org/gsouquet/fix-18132 2021-07-29 09:51:13 +01:00
Germain Souquet
e140dd6ba1 Merge branch 'develop' into gsouquet/fix-18132 2021-07-29 10:27:00 +02:00
Šimon Brandner
152168ef2d
Add mic mute icons 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-29 10:20:59 +02:00
Germain Souquet
ee7f3c000d Merge branch 'develop' into gsouquet/fix-18144 2021-07-29 10:04:47 +02:00
Šimon Brandner
cf973cdb95
Merge remote-tracking branch 'upstream/develop' into feature/muting 2021-07-29 09:06:24 +02:00
Šimon Brandner
ae64765870
playMedia only if necessary 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-29 08:45:32 +02:00
Šimon Brandner
f16b1d46b7
Fix sizing issue of the screen picker 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-28 20:58:24 +02:00
Michael Telatynski
67b8c0a811 remove unused import 2021-07-28 19:33:54 +01:00
Michael Telatynski
9fb1c8e4cd Iterate PR 2021-07-28 19:33:07 +01:00
Michael Telatynski
ac800ad94d Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18093 2021-07-28 19:24:26 +01:00
Michael Telatynski
40493634ae Iterate PR 2021-07-28 19:23:33 +01:00
Michael Telatynski
ed950875e7 Fix space hierarchy not updating when user mutates it 2021-07-28 19:08:59 +01:00
Michael Telatynski
5d9e421de0 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18091 2021-07-28 17:58:34 +01:00
Michael Telatynski
a5606c72de Update feedback prompt to match designs 2021-07-28 17:56:57 +01:00
James Salter
07eaee25d2 Default properties to {} to avoid passing it superfluously for events with no properties 2021-07-28 17:54:35 +01:00
Michael Telatynski
6123ccb2eb Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18096 2021-07-28 17:45:15 +01:00
Michael Telatynski
67ef263940 Refactor SpaceButton to be more reusable and add context menu to Home button 2021-07-28 17:40:33 +01:00
Michael Telatynski
b3a28bde89 Factor out useEventEmitterState hook 2021-07-28 17:39:56 +01:00
Michael Telatynski
cdf0d98c3f Fix IconizedContextMenuCheckbox layout 2021-07-28 17:39:02 +01:00