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

24937 commits

This branch
This branch
All branches
Author SHA1 Message Date
Michael Telatynski
2530ec8419 Try and fix the Notifier race 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-05-28 19:03:42 +01:00
Weblate
8b94f3a66a Merge branch 'origin/develop' into Weblate. 2020-05-28 17:52:09 +00:00
Besnik Bleta
66c7551c2c Translated using Weblate (Albanian) 
Currently translated at 99.0% (2279 of 2301 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sq/
 2020-05-28 17:52:09 +00:00
Hubert Chathi
ec24350801
Merge pull request #4657 from matrix-org/uhoreg/keytar 
set the client's pickle key if the platform can store one
 2020-05-28 13:52:02 -04:00
Weblate
cadf5c30ad Merge branch 'origin/develop' into Weblate. 2020-05-28 17:21:37 +00:00
MamasLT
9c502ea821 Translated using Weblate (Lithuanian) 
Currently translated at 66.5% (1529 of 2299 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/lt/
 2020-05-28 17:21:37 +00:00
Tirifto
ffb829108b Translated using Weblate (Esperanto) 
Currently translated at 100.0% (2299 of 2299 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eo/
 2020-05-28 17:21:36 +00:00
Michael Telatynski
0242b6f3f3
Merge pull request #4624 from matrix-org/t3chguy/toasts3_2 
Migrate Banners to Toasts
 2020-05-28 18:21:28 +01:00
Michael Telatynski
c4d6367a17 Swap priorities of Desktop Notifications and Update toasts 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-05-28 17:30:43 +01:00
Hubert Chathi
dc4a2191c1 really fix types 2020-05-28 12:04:32 -04:00
Hubert Chathi
0859827910 fix types 2020-05-28 11:56:48 -04:00
Michael Telatynski
03058bacbd Dialog wrap title instead of taking same space as the close/cancel button 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-05-28 16:48:50 +01:00
Hubert Chathi
30120dc0c7 Merge remote-tracking branch 'upstream/develop' into keytar 2020-05-28 11:15:36 -04:00
Weblate
540059a5ed Merge branch 'origin/develop' into Weblate. 2020-05-28 13:54:15 +00:00
MamasLT
542d81699a Translated using Weblate (Lithuanian) 
Currently translated at 66.5% (1529 of 2299 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/lt/
 2020-05-28 13:54:14 +00:00
Jorik Schellekens
4bee6532e1
Merge pull request #4658 from JorikSchellekens/joriks/appearance-tab-ts 
Move Appearance tab to ts
 2020-05-28 14:54:05 +01:00
Jorik Schellekens
9034889414 Reorder interfaces 2020-05-28 14:43:01 +01:00
Jorik Schellekens
c9d5ed4d00 i18n 2020-05-28 14:32:20 +01:00
Jorik Schellekens
81922231ed Move Appearance tab to ts 2020-05-28 13:55:07 +01:00
Hubert Chathi
73c35ff80e set the client's pickle key if the platform can store one 2020-05-28 00:05:45 -04:00
Weblate
0188a0eebb Merge branch 'origin/develop' into Weblate. 2020-05-27 16:07:17 +00:00
Michael Telatynski
0fd5714e21
Merge pull request #4606 from matrix-org/t3chguy/peeking-races 
Fix room alias lookup vs peeking race condition
 2020-05-27 17:07:12 +01:00
Weblate
8ffe415f0a Merge branch 'origin/develop' into Weblate. 2020-05-27 16:05:38 +00:00
Jorik Schellekens
46134f5368
Merge pull request #4651 from JorikSchellekens/joriks/fix-encryption-icons-irc 
Fix encryption icon miss-alignment
 2020-05-27 17:05:32 +01:00
Weblate
db96345538 Merge branch 'origin/develop' into Weblate. 2020-05-27 16:04:54 +00:00
Jorik Schellekens
5c3208d942
Merge pull request #4649 from JorikSchellekens/joriks/fix-sublist-sizing-regression 
Fix sublist sizing regression
 2020-05-27 17:04:49 +01:00
Weblate
306645b9f0 Merge branch 'origin/develop' into Weblate. 2020-05-27 16:04:12 +00:00
yuuki-san
4726ebaf9d Translated using Weblate (Slovak) 
Currently translated at 68.7% (1580 of 2299 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sk/
 2020-05-27 16:04:12 +00:00
MamasLT
687cc4e77a Translated using Weblate (Lithuanian) 
Currently translated at 64.6% (1486 of 2299 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/lt/
 2020-05-27 16:04:07 +00:00
random
6c323a1991 Translated using Weblate (Italian) 
Currently translated at 100.0% (2299 of 2299 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/it/
 2020-05-27 16:04:06 +00:00
XoseM
8b23eb1db3 Translated using Weblate (Galician) 
Currently translated at 49.1% (1129 of 2299 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/gl/
 2020-05-27 16:04:04 +00:00
Jorik Schellekens
d534ca0e2b
Merge pull request #4650 from JorikSchellekens/joriks/fix-irc-codeblocks 
Fix lines overflowing room list width
 2020-05-27 17:03:53 +01:00
Michael Telatynski
71108fcf39 delint 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-05-27 17:02:32 +01:00
Michael Telatynski
7486338efa Fix.the.tests. 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-05-27 16:51:04 +01:00
Michael Telatynski
e35c9d5bbf more testing 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-05-27 15:18:43 +01:00
Michael Telatynski
cb07fa53f4 test 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-05-27 15:05:40 +01:00
Michael Telatynski
63ac1cb4ab debug some more 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-05-27 14:56:24 +01:00
Michael Telatynski
f3dfdbe746 debug 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-05-27 14:36:44 +01:00
Michael Telatynski
91811581bc fix assertNoToasts 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-05-27 14:35:59 +01:00
Michael Telatynski
61066b0c4c test it again 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-05-27 14:27:09 +01:00
Michael Telatynski
627b568588 check if it is a race 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-05-27 13:48:20 +01:00
Michael Telatynski
841ce74ac2 Fix assert vs assert.equal 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-05-27 13:39:00 +01:00
Michael Telatynski
faaca43a75 more loggin' 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-05-27 13:35:15 +01:00
Michael Telatynski
37c875b863 improve end to end tests 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-05-27 13:23:49 +01:00
Michael Telatynski
d9552c7f5c e2e test toasts v2 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-05-27 13:10:28 +01:00
Michael Telatynski
7b6d49c416 e2e test toasts 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-05-27 12:57:45 +01:00
Michael Telatynski
b7c688d328 test e2e tests workaround 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-05-27 12:40:38 +01:00
Michael Telatynski
48de174576 remove debug 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-05-27 12:20:20 +01:00
Michael Telatynski
efa47f1a8e Change out debug 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-05-27 12:02:51 +01:00
Michael Telatynski
3dade4e759 tweak 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-05-27 11:48:48 +01:00