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

28562 commits

This branch
This branch
All branches
Author SHA1 Message Date
David Baker
e54d4e665f Don't prompt to remove jitsi widget if the user don't have permission 2020-09-11 12:20:32 +01:00
J. Ryan Stinnett
be3a8613ec Fix sticker picker height 
Fixes https://github.com/vector-im/element-web/issues/15152
 2020-09-11 11:46:25 +01:00
Weblate
9549ce5eae Merge branch 'origin/develop' into Weblate. 2020-09-11 10:45:26 +00:00
J. Ryan Stinnett
a56a193c2d
Merge pull request #5197 from matrix-org/jryans/stickerpicker-height 
Fix sticker picker height
 2020-09-11 11:45:21 +01:00
J. Ryan Stinnett
e49a657a90 Fix user info scrolling in new card view 
Fixes https://github.com/vector-im/element-web/issues/15148
 2020-09-11 11:39:58 +01:00
J. Ryan Stinnett
cd3aa81eed Fix sticker picker height 
Fixes https://github.com/vector-im/element-web/issues/15152
 2020-09-11 11:12:56 +01:00
Weblate
ddd12c81a6 Merge branch 'origin/develop' into Weblate. 2020-09-11 09:27:05 +00:00
Nikita Epifanov
19ebc6401f Translated using Weblate (Russian) 
Currently translated at 100.0% (2370 of 2370 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/element-web/matrix-react-sdk/ru/
 2020-09-11 09:27:05 +00:00
David Baker
de8865d844
Merge pull request #5191 from matrix-org/dbkr/jitsi_call_naming 
Call jitsi widgets 'group calls'
 2020-09-11 10:27:00 +01:00
David Baker
2af803c1bb remove unused stuff 2020-09-11 10:17:37 +01:00
David Baker
a93afe8c69 Check jitsi type in proper way 2020-09-11 09:57:13 +01:00
Weblate
b6f91d76b8 Merge branch 'origin/develop' into Weblate. 2020-09-11 08:53:15 +00:00
David Baker
07693b71b1
Merge pull request #5194 from matrix-org/dbkr/dont_unpin_persistent_widgets 
Don't show 'unpin' for persistent widgets
 2020-09-11 09:53:09 +01:00
Weblate
b33f7a698b Merge branch 'origin/develop' into Weblate. 2020-09-11 08:41:46 +00:00
J. Ryan Stinnett
e7e6bc93ec
Merge pull request #5182 from matrix-org/jryans/defer-cross-signing-setup 
Split up cross-signing and secure backup settings
 2020-09-11 09:41:40 +01:00
Weblate
ddcf1e335e Merge branch 'origin/develop' into Weblate. 2020-09-11 06:29:16 +00:00
Michael Telatynski
247e1d431d
Merge pull request #5185 from matrix-org/t3chguy/fix/3543 
Fix onNewScreen to use replace when going from roomId->roomAlias
 2020-09-11 07:29:10 +01:00
Travis Ralston
cd360ba92f Fix for release 2020-09-10 13:59:22 -06:00
Travis Ralston
4cb7381d03 Show verification status in the room summary card 
Fixes https://github.com/vector-im/element-web/issues/15143

Colours are the same for both light and dark theme.
 2020-09-10 13:53:42 -06:00
Travis Ralston
14f6d9e79f [Release] Show verification status in the room summary card 
https://github.com/matrix-org/matrix-react-sdk/pull/5195 to release - see https://github.com/matrix-org/matrix-react-sdk/pull/5195 for details.
 2020-09-10 13:52:50 -06:00
David Baker
b7058a33ad lint 2020-09-10 14:37:44 +01:00
David Baker
eeb4c5696f Don't show 'unpin' for persistent widgets 
This will mostly fix https://github.com/vector-im/element-web/issues/15139
although it could still break in a race condition.
 2020-09-10 14:30:35 +01:00
David Baker
18be4cb202 Use widget type fromString 2020-09-10 14:18:49 +01:00
David Baker
96080f2ccc Prompt to remove the jitsi widget when pressing the call button 
If there's already one in the room.

We threw up an error message anyway telling you there was already
a jitsi widget, so just add a button to end the call.
 2020-09-10 14:06:13 +01:00
Weblate
0c0d014e4f Merge branch 'origin/develop' into Weblate. 2020-09-10 12:58:19 +00:00
LinAGKar
7d3e0ed9ce Translated using Weblate (Swedish) 
Currently translated at 100.0% (2369 of 2369 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/element-web/matrix-react-sdk/sv/
 2020-09-10 12:58:19 +00:00
yuuki-san
8d4a252184 Translated using Weblate (Slovak) 
Currently translated at 69.2% (1640 of 2369 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/element-web/matrix-react-sdk/sk/
 2020-09-10 12:58:18 +00:00
Szimszon
9c749626e4 Translated using Weblate (Hungarian) 
Currently translated at 100.0% (2369 of 2369 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/element-web/matrix-react-sdk/hu/
 2020-09-10 12:58:18 +00:00
XoseM
c5bf61e270 Translated using Weblate (Galician) 
Currently translated at 100.0% (2369 of 2369 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/element-web/matrix-react-sdk/gl/
 2020-09-10 12:58:17 +00:00
Jeff Huang
7f1c5537fb Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (2369 of 2369 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/element-web/matrix-react-sdk/zh_Hant/
 2020-09-10 12:58:16 +00:00
Besnik Bleta
17a6f33b91 Translated using Weblate (Albanian) 
Currently translated at 99.7% (2361 of 2369 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/element-web/matrix-react-sdk/sq/
 2020-09-10 12:58:15 +00:00
Matthew Hodgson
017765df24
Merge pull request #5192 from matrix-org/matthew/badge-counts 
bring back 1.2M style badge counts rather than 99+
 2020-09-10 13:58:07 +01:00
Matthew Hodgson
5ecc3f4398 kill formatMinimalBadgeCount entirely 2020-09-10 13:56:46 +01:00
Matthew Hodgson
89d05ac952 bring back 1.2M style badge counts rather than 99+ 2020-09-10 13:51:34 +01:00
David Baker
2b965a2741 Call jitsi widgets 'group calls' 
So they feel a bit more like first class citizens
 2020-09-10 11:52:01 +01:00
Travis Ralston
f8324c0dc0
Merge pull request #5190 from matrix-org/travis/permalinks-release-fix 
[Release] Account for via in pill matching regex
 2020-09-09 15:20:49 -06:00
Weblate
a9ee1e785e Merge branch 'origin/develop' into Weblate. 2020-09-09 21:08:50 +00:00
Nikita Epifanov
188aee0fcf Translated using Weblate (Russian) 
Currently translated at 100.0% (2369 of 2369 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/element-web/matrix-react-sdk/ru/
 2020-09-09 21:08:50 +00:00
@a2sc:matrix.org
884b54fd02 Translated using Weblate (German) 
Currently translated at 100.0% (2369 of 2369 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/element-web/matrix-react-sdk/de/
 2020-09-09 21:08:49 +00:00
Priit Jõerüüt
9586a981de Translated using Weblate (Estonian) 
Currently translated at 100.0% (2369 of 2369 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/element-web/matrix-react-sdk/et/
 2020-09-09 21:08:48 +00:00
Travis Ralston
a765db8977
Merge pull request #5189 from matrix-org/travis/rageshake-fix 
Run the rageshake command through the bug report dialog
 2020-09-09 15:08:43 -06:00
Travis Ralston
3973efeed3 [Release] Account for via in pill matching regex 
https://github.com/matrix-org/matrix-react-sdk/pull/5188 to the release branch
 2020-09-09 15:01:41 -06:00
Travis Ralston
c61f2a8099
Merge pull request #5188 from matrix-org/travis/permalink-pills 
Account for via in pill matching regex
 2020-09-09 14:55:58 -06:00
Travis Ralston
77f715ba73 Fix i18n and analytics 2020-09-09 14:55:27 -06:00
Travis Ralston
9b5823cccb Run the rageshake command through the bug report dialog 
Ideally we encourage users to give us information like a github issue or options to download their logs.
 2020-09-09 14:53:38 -06:00
Travis Ralston
0a7090dd64 Account for via in pill matching regex 
Fixes https://github.com/vector-im/element-web/issues/15133

Regression first appeared in a80bcaa292

This also affects room IDs.
 2020-09-09 14:36:35 -06:00
Travis Ralston
91282e8071
Merge pull request #5187 from matrix-org/travis/fix-lock 
Remove now-unused create-react-class from lockfile
 2020-09-09 13:15:11 -06:00
Travis Ralston
85b5b8b094 Remove now-unused create-react-class from lockfile 2020-09-09 13:10:27 -06:00
Michael Telatynski
1b38b4cc00
Merge pull request #5163 from nigelrudolf/develop 
Fixed 1px jump upwards
 2020-09-09 17:49:08 +01:00
Michael Telatynski
050319c0cc Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into fix-1px-jump 2020-09-09 17:37:50 +01:00