OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity
25,080 Commits
211 Branches
549 Tags
667 MiB
Commit Graph

25080 Commits (260d448db63647b61409b625d70e1eb5ba0b55e8)

Author SHA1 Message Date
Travis Ralston 81cae66732 Merge branch 'develop' into fix-register-auth-with-new-spec 2020-05-27 12:02:46 -06: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
Michael Telatynski 254ed4b1b6 Add debug lined to figure out e2e test failure 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-05-27 11:33:42 +01:00
Michael Telatynski cc68f53fc2 tidy up and delint 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-05-27 10:47:01 +01:00
Michael Telatynski cf50e1a408 i18n 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-05-27 10:31:30 +01:00
Michael Telatynski 2b432b0d82 Remove feature_cross_signing 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-05-27 10:28:25 +01:00
Weblate b603e3ef18 Merge branch 'origin/develop' into Weblate. 2020-05-27 09:24:47 +00:00
yuuki-san a2a950e00e Translated using Weblate (Slovak) 
Currently translated at 66.7% (1537 of 2306 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sk/
 2020-05-27 09:24:47 +00:00
call_xz 3f6774560e Translated using Weblate (Japanese) 
Currently translated at 56.9% (1312 of 2306 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ja/
 2020-05-27 09:24:46 +00:00
XoseM f4651bf898 Translated using Weblate (Galician) 
Currently translated at 46.8% (1080 of 2306 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/gl/
 2020-05-27 09:24:45 +00:00
Kévin C e79d29b6a3 Translated using Weblate (French) 
Currently translated at 100.0% (2306 of 2306 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
 2020-05-27 09:24:43 +00:00
Jeff Huang 005b1fa080 Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (2306 of 2306 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
 2020-05-27 09:24:41 +00:00
David Baker 8bac26c5e3
Merge pull request #4648 from matrix-org/dbkr/remove_keyshare_dialog 
Remove the keyshare dialog
 2020-05-27 10:24:33 +01:00
Michael Telatynski c492ae97fd Merge branches 'develop' and 't3chguy/toasts3_2' of github.com:matrix-org/matrix-react-sdk into t3chguy/toasts3_2 2020-05-27 09:45:38 +01:00
Weblate 69f4e8e68e Merge branch 'origin/develop' into Weblate. 2020-05-27 02:06:23 +00:00
Travis Ralston 515304d32e
Merge pull request #4654 from matrix-org/travis/roomlist/badge-updates 
Update badge counts in new room list as needed
 2020-05-26 20:06:17 -06:00
Travis Ralston 8370fa8bb4 Event.decrypted from the client 2020-05-26 19:56:56 -06:00
Travis Ralston bf8a3d4419 Bind to the room instead of the client 
Also add the other missing deregister handlers
 2020-05-26 16:20:51 -06:00
Travis Ralston a9c54153ee Update badge counts in new room list as needed 2020-05-26 14:16:33 -06:00
Weblate 9b46787dd3 Merge branch 'origin/develop' into Weblate. 2020-05-26 19:49:55 +00:00
Imre Kristoffer Eilertsen bca58bed02 Translated using Weblate (Norwegian Bokmål) 
Currently translated at 56.5% (1304 of 2306 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/nb_NO/
 2020-05-26 19:49:55 +00:00