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

36252 commits

This branch
This branch
All branches
Author SHA1 Message Date
Šimon Brandner
8294d324e3
Merge remote-tracking branch 'upstream/develop' into fix/call-view/18221 2021-07-27 16:55:59 +02:00
RiotRobot
78eb8ffc26 Upgrade matrix-js-sdk to 12.2.0-rc.1 2021-07-27 15:51:16 +01:00
Šimon Brandner
371de23b00
Merge remote-tracking branch 'upstream/develop' into feature/muting 2021-07-27 16:40:47 +02:00
David Baker
3e7aee3a87
Merge pull request #5992 from SimonBrandner/fix/12652/screen-share 
Add support for screen sharing in 1:1 calls
 2021-07-27 15:34:27 +01:00
Šimon Brandner
b9e305daae
Delete mistake line 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-27 16:26:46 +02:00
Šimon Brandner
24f0c760ce
Merge remote-tracking branch 'upstream/develop' into fix/12652/screen-share 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-27 16:25:38 +02:00
Germain Souquet
3037be11c4 Restore padding for single person state events 2021-07-27 16:24:05 +02:00
Travis Ralston
93f42182c0
Merge pull request #6479 from matrix-org/travis/voice-messages/fix-placeholder-ui 
Fix timing of voice message recording UI appearing
 2021-07-27 08:05:28 -06:00
Michael Telatynski
62033d0286 Merge branch 't3chguy/fix/18071' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18071 2021-07-27 15:03:20 +01:00
Michael Telatynski
39d9ec3ced Merge branch 'develop' into t3chguy/fix/18071 2021-07-27 15:02:59 +01:00
Michael Telatynski
8dd11cd2a5
Merge branch 'develop' into t3chguy/fix/18071 2021-07-27 14:47:18 +01:00
Michael Telatynski
353c70ad75 i18n 2021-07-27 14:45:36 +01:00
David Baker
5ead53b36a
Merge pull request #6483 from SimonBrandner/fix/dont-anim-resize/18261 
Fix PiP resize issues
 2021-07-27 14:42:04 +01:00
Michael Telatynski
755007cbee Conclude labs flags and write more tests 2021-07-27 14:39:14 +01:00
Šimon Brandner
f532c302b6
Don't animate when resizing and move when the PiP changes size 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-27 15:31:54 +02:00
Šimon Brandner
001490f70d
Fix unused resize listener 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-27 15:30:44 +02:00
David Baker
f7d0419cee
Merge pull request #6482 from RiotTranslateBot/weblate-element-web-matrix-react-sdk 
Translations update from Weblate
 2021-07-27 14:10:50 +01:00
David Baker
148571828b
Merge pull request #6474 from matrix-org/gsouquet/fix-18017 
Make new reply UI clickable
 2021-07-27 13:57:41 +01:00
David Baker
7733ee2578
Merge pull request #6478 from matrix-org/dbkr/scrollpanel_loop_breaker 
Fix infinite pagination loop when offline
 2021-07-27 13:54:30 +01:00
Weblate
543312c0cc Merge branch 'origin/develop' into Weblate. 2021-07-27 12:40:31 +00:00
waclaw66
f2ed147cae Translated using Weblate (Czech) 
Currently translated at 100.0% (3080 of 3080 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/cs/
 2021-07-27 12:40:31 +00:00
jelv
1f7e668bb2 Translated using Weblate (Dutch) 
Currently translated at 100.0% (3080 of 3080 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/nl/
 2021-07-27 12:40:28 +00:00
David Baker
72becb73e1
Merge pull request #6473 from matrix-org/gsouquet/fix-18208 
Fix deleted message left offset in the timeline
 2021-07-27 13:40:20 +01:00
James Salter
474561600e Fix hash == "" 2021-07-27 13:31:56 +01:00
Šimon Brandner
5dd34de5fe
Handle mute state changes 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-27 14:31:42 +02:00
Weblate
e405fcc125 Merge branch 'origin/develop' into Weblate. 2021-07-27 12:19:12 +00:00
jelv
d01a30b06b Translated using Weblate (Dutch) 
Currently translated at 99.6% (3069 of 3080 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/nl/
 2021-07-27 12:19:12 +00:00
Michael Telatynski
59e9704ee8
Merge pull request #6481 from matrix-org/t3chguy/fix/18250 
Fix broken layout of the space hierarchy view
 2021-07-27 13:19:04 +01:00
Weblate
95ccf0cd1d Merge branch 'origin/develop' into Weblate. 2021-07-27 12:15:15 +00:00
random
c111b027a9 Translated using Weblate (Italian) 
Currently translated at 99.9% (3079 of 3080 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/it/
 2021-07-27 12:15:15 +00:00
jelv
9244090de8 Translated using Weblate (Dutch) 
Currently translated at 99.4% (3062 of 3080 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/nl/
 2021-07-27 12:15:12 +00:00
Germain
50aee28bf0
Merge pull request #6480 from matrix-org/gsouquet/fix-18137 
Add data-layout to MELS for better CSS structure
 2021-07-27 13:15:02 +01:00
Michael Telatynski
0c79aec19d Fix broken layout of the space hierarchy view 
Not sure what this min-height was trying to achieve but removing it prevents the grid layout collapsing on itself
 2021-07-27 13:09:43 +01:00
Germain Souquet
8104ba936c Add data-layout to MELS for better CSS structure 2021-07-27 11:30:25 +02:00
Weblate
d19eee3697 Merge branch 'origin/develop' into Weblate. 2021-07-27 08:48:24 +00:00
Germain
80bf7d1675
Merge pull request #6468 from SimonBrandner/fix/quotes/18199 2021-07-27 09:48:19 +01:00
David Baker
e5d538412b
Typo 
Co-authored-by: Germain <germain@souquet.com>
 2021-07-27 09:29:32 +01:00
Weblate
1d87af8670 Merge branch 'origin/develop' into Weblate. 2021-07-27 08:21:28 +00:00
Dariusz Niemczyk
e65c1c2ae6
Merge pull request #6476 from matrix-org/fix/update-eslint-config 
Update ESLint Config
 2021-07-27 10:21:23 +02:00
Dariusz Niemczyk
7c9ff40863
Update ESLint Config 2021-07-27 09:52:37 +02:00
Weblate
154c72e00a Merge branch 'origin/develop' into Weblate. 2021-07-27 07:17:51 +00:00
waclaw66
702a8dbff2 Translated using Weblate (Czech) 
Currently translated at 100.0% (3080 of 3080 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/cs/
 2021-07-27 07:17:51 +00:00
Germain
788abac74d
Merge pull request #6471 from SimonBrandner/fix/voip-event-tiles/18216 
Fix VoIP event tile issues
 2021-07-27 08:17:31 +01:00
Travis Ralston
7f01e31040 Fix timing of voice message recording UI appearing 
Fixes https://github.com/vector-im/element-web/issues/18223

We delay the composer's state until a recording is truly ready here, preventing buttons from disappearing while we're still figuring things out.
 2021-07-26 23:33:21 -06:00
David Baker
f20da6d3de Fix infinite pagination loop when offline 
I'm not really sure how this is meant to work - and I'm not sure
how it was working before, but this is causing fairly bad infinite
loops if I start element with no homeserver connection. This is
a fairly crude fix, only thing I can think that would be better is
some awareness of when network requests were failing and intentionally
backing off.

Fixes https://github.com/vector-im/element-web/issues/18242
 2021-07-26 22:05:35 +01:00
Šimon Brandner
29b0d03fe4
Update copy 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-26 21:27:22 +02:00
Germain Souquet
e2688cd5e0 Left align unbubbled events 2021-07-26 16:53:37 +02:00
Germain Souquet
486d576b23 Merge branch 'develop' into gsouquet/fix-18132 2021-07-26 15:49:55 +02:00
Germain Souquet
88bd22ded3 Make new reply UI clickable 2021-07-26 13:50:04 +02:00
Michael Telatynski
737aa1c55d delint 2021-07-26 12:41:52 +01:00