OpenCloud
/
element-web
mirror of https://github.com/vector-im/element-web
1
0
Fork 0
Code Issues Releases Wiki Activity
23,669 Commits
218 Branches
563 Tags
476 MiB
Commit Graph

23669 Commits (4adbfce92db9df8221c9ce142909feeb2d20e2a6)

Author SHA1 Message Date
Travis Ralston e72008d7f1 Fix end-to-end tests for end-to-end encryption verification 
Fixes https://github.com/vector-im/riot-web/issues/13226

This isn't the fastest route, but it is a predictable route for the happy path we probably want to test. For example, Alice will already be staring at the DM and could easily accept the verification there, but we probably want to make sure that the toast is present and does the right thing. Similarly, neither of them need to verify that there's green shields everywhere, they should be implied, however an explicit check follows a real user's gaze.
 2020-04-17 14:31:33 -06:00
Weblate 7b68306e32 Merge branch 'origin/develop' into Weblate. 2020-04-17 18:45:02 +00:00
Travis Ralston 885bb112ae
Merge pull request #4430 from matrix-org/dependabot/npm_and_yarn/test/end-to-end-tests/https-proxy-agent-2.2.4 
Bump https-proxy-agent from 2.2.1 to 2.2.4 in /test/end-to-end-tests
 2020-04-17 12:44:57 -06:00
Weblate d95e5a97c7 Merge branch 'origin/develop' into Weblate. 2020-04-17 15:55:03 +00:00
Travis Ralston e485f7a82c
Merge pull request #4432 from matrix-org/travis/e2e-docs 
Minor updates to e2e test instructions on Windows
 2020-04-17 09:54:58 -06:00
Weblate bcce88c335 Merge branch 'origin/develop' into Weblate. 2020-04-17 15:47:34 +00:00
Øjvind Fritjof Arnfred 662e697b9d Translated using Weblate (Danish) 
Currently translated at 24.2% (554 of 2291 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/da/
 2020-04-17 15:47:34 +00:00
Michael Telatynski 29028844f9
Merge pull request #4435 from matrix-org/t3chguy/typo1 
Fix typo
 2020-04-17 16:47:27 +01:00
Michael Telatynski 518639e8b1 Fix typo 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-04-17 16:04:38 +01:00
Weblate c4af6ed2a4 Merge branch 'origin/develop' into Weblate. 2020-04-17 13:27:24 +00:00
rkfg a55c4dab6a Translated using Weblate (Russian) 
Currently translated at 89.6% (2052 of 2289 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
 2020-04-17 13:27:24 +00:00
Øjvind Fritjof Arnfred c1b7d81f00 Translated using Weblate (Danish) 
Currently translated at 24.1% (552 of 2289 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/da/
 2020-04-17 13:27:23 +00:00
Zoe fba57b1ff3
Merge pull request #4122 from matrix-org/foldleft/better-errors 
Catch errors sooner so users can recover more easily
 2020-04-17 14:27:17 +01:00
Zoe e3d784816d Merge branch 'develop' into foldleft/better-errors 2020-04-17 14:11:05 +01:00
Weblate 575842fe2a Merge branch 'origin/develop' into Weblate. 2020-04-17 12:14:46 +00:00
Michael Telatynski 66de06c7b9
Merge pull request #4381 from matrix-org/t3chguy/rageshake_incompatible_browser 
Rageshake: remind user of unsupported browser and send modernizr report
 2020-04-17 13:14:40 +01:00
Weblate 4adafa662b Merge branch 'origin/develop' into Weblate. 2020-04-17 12:06:42 +00:00
Karol Kosek 22094f4a78 Translated using Weblate (Polish) 
Currently translated at 65.9% (1508 of 2289 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/pl/
 2020-04-17 12:06:42 +00:00
Michael Telatynski 47508b670d
Merge pull request #4338 from matrix-org/t3chguy/user_online_dot 
Design tweaks for DM Room Tiles
 2020-04-17 13:06:34 +01:00
Michael Telatynski cd65bdc799 Merge branches 'develop' and 't3chguy/user_online_dot' of github.com:matrix-org/matrix-react-sdk into t3chguy/user_online_dot 
 Conflicts:
	src/components/views/rooms/RoomBreadcrumbs.js
	src/components/views/rooms/RoomTile.js
 2020-04-17 12:58:54 +01:00
Weblate 3912da46b9 Merge branch 'origin/develop' into Weblate. 2020-04-17 11:43:23 +00:00
rkfg 249daf3f9a Translated using Weblate (Russian) 
Currently translated at 89.7% (2053 of 2289 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
 2020-04-17 11:43:23 +00:00
Kévin C 304eb18fd6 Translated using Weblate (French) 
Currently translated at 100.0% (2289 of 2289 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
 2020-04-17 11:43:22 +00:00
Michael Telatynski a2898b5cd8
Merge pull request #4434 from matrix-org/t3chguy/pill-breaking 
Don't break spills over multiple lines, ellipsis them at max-1-line
 2020-04-17 12:43:14 +01:00
Michael Telatynski 4d91dc5bba iterate pills in rich text styling 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-04-17 12:30:09 +01:00
Michael Telatynski 81c7660bf5 Iterate copy 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-04-17 12:25:16 +01:00
Michael Telatynski c3ff75d18f Don't break spills over multiple lines, ellipsis them at max-1-line 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-04-17 11:04:52 +01:00
Weblate 986d04ac9e Merge branch 'origin/develop' into Weblate. 2020-04-17 04:38:54 +00:00
@a2sc:matrix.org f2f2f96531 Translated using Weblate (German) 
Currently translated at 77.2% (1767 of 2289 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
 2020-04-17 04:38:54 +00:00
aWeinzierl e176aa15ad Translated using Weblate (German) 
Currently translated at 77.2% (1767 of 2289 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
 2020-04-17 04:38:54 +00:00
Nadia Holmquist Pedersen 15149cf4e1 Translated using Weblate (Danish) 
Currently translated at 23.9% (547 of 2289 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/da/
 2020-04-17 04:38:53 +00:00
Øjvind Fritjof Arnfred df3eef1f70 Translated using Weblate (Danish) 
Currently translated at 23.9% (547 of 2289 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/da/
 2020-04-17 04:38:53 +00:00
Jeff Huang 7a4442c52b Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (2289 of 2289 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
 2020-04-17 04:38:50 +00:00
Travis Ralston 001e4c13bc
Merge pull request #4433 from matrix-org/travis/fix-e2e-tests 
Turn the end-to-end tests back on and fix the lazy-loading tests
 2020-04-16 22:38:41 -06:00
@a2sc:matrix.org 5bcf383767 Translated using Weblate (German) 
Currently translated at 76.9% (1761 of 2289 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
 2020-04-17 00:56:10 +00:00
Tentarial 1f69a86286 Translated using Weblate (German) 
Currently translated at 76.9% (1761 of 2289 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
 2020-04-17 00:56:10 +00:00
aWeinzierl b43947650d Translated using Weblate (German) 
Currently translated at 76.9% (1761 of 2289 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
 2020-04-17 00:56:09 +00:00
@a2sc:matrix.org 83ae60dd32 Translated using Weblate (German) 
Currently translated at 76.8% (1757 of 2289 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
 2020-04-17 00:53:52 +00:00
aWeinzierl 11f5554af5 Translated using Weblate (German) 
Currently translated at 76.8% (1757 of 2289 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
 2020-04-17 00:53:52 +00:00
@a2sc:matrix.org 49d92b873f Translated using Weblate (German) 
Currently translated at 76.4% (1749 of 2289 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
 2020-04-17 00:43:42 +00:00
aWeinzierl e97138fdac Translated using Weblate (German) 
Currently translated at 76.4% (1749 of 2289 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
 2020-04-17 00:43:42 +00:00
Joshua Dietz b56a80caf5 Translated using Weblate (German) 
Currently translated at 76.4% (1748 of 2289 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
 2020-04-17 00:41:04 +00:00
Tentarial 6fd5047784 Translated using Weblate (German) 
Currently translated at 76.4% (1748 of 2289 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
 2020-04-17 00:41:04 +00:00
@a2sc:matrix.org 23b8dbe862 Translated using Weblate (German) 
Currently translated at 76.4% (1748 of 2289 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
 2020-04-17 00:41:03 +00:00
aWeinzierl d68853ae7a Translated using Weblate (German) 
Currently translated at 76.4% (1748 of 2289 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
 2020-04-17 00:41:03 +00:00
@a2sc:matrix.org 0900cf1ebe Translated using Weblate (German) 
Currently translated at 76.0% (1739 of 2289 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
 2020-04-17 00:34:35 +00:00
aWeinzierl 792abac523 Translated using Weblate (German) 
Currently translated at 76.0% (1739 of 2289 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
 2020-04-17 00:34:34 +00:00
@a2sc:matrix.org d880811780 Translated using Weblate (German) 
Currently translated at 75.9% (1738 of 2289 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
 2020-04-17 00:34:06 +00:00
alexsal86 efbac83bc3 Translated using Weblate (German) 
Currently translated at 75.9% (1738 of 2289 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
 2020-04-17 00:34:05 +00:00
aWeinzierl 0489f10cf5 Translated using Weblate (German) 
Currently translated at 75.9% (1738 of 2289 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
 2020-04-17 00:34:05 +00:00