mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web.git synced 2024-12-16 20:21:46 +03:00
Code Issues Projects Releases Packages Wiki Activity
24027 commits 219 branches 562 tags 474 MiB
Commit graph

24027 commits

This branch
This branch
All branches
Author SHA1 Message Date
Øjvind Fritjof Arnfred
7a8dee7213 Translated using Weblate (Danish) 
Currently translated at 25.1% (575 of 2291 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/da/
 2020-04-19 10:37:57 +00:00
Jeff Huang
6579f25ef1 Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (2291 of 2291 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
 2020-04-19 10:37:56 +00:00
Michael Telatynski
c04a8d326e
Merge pull request #4442 from matrix-org/t3chguy/change_seshat_copy 
Update seshat copy to remove trailing full stop
 2020-04-19 11:37:48 +01:00
Michael Telatynski
7fe8894c51 Update seshat copy to remove trailing full stop 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-04-18 23:16:40 +01:00
Michael Telatynski
b86b42c89f Password Login make sure tab takes user to password field 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-04-18 16:18:01 +01:00
Michael Telatynski
a0f704f419 Network Dropdown fix things not scrolling properly 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-04-18 15:08:15 +01:00
Weblate
9c7ac8bf88 Merge branch 'origin/develop' into Weblate. 2020-04-17 21:24:57 +00:00
Travis Ralston
9e7b843f5d
Merge pull request #4388 from ThobyV/thobyv/make-filepanel-remember-scroll-position 
Fix Filepanel scroll position state lost when room is changed
 2020-04-17 15:24:52 -06:00
Travis Ralston
e0d6fa3f51 Rename ref to timelinePanel 2020-04-17 15:15:51 -06:00
Weblate
6a41012496 Merge branch 'origin/develop' into Weblate. 2020-04-17 21:14:17 +00:00
Travis Ralston
dd444ffa5d
Merge pull request #4436 from matrix-org/travis/e2e-e2e-tests 
Fix end-to-end tests for end-to-end encryption verification
 2020-04-17 15:14:12 -06:00
Travis Ralston
d910eb4d57 Merge branch 'develop' into thobyv/make-filepanel-remember-scroll-position 2020-04-17 15:10:12 -06:00
Travis Ralston
432dbab8cb Fix start chat button variable name 2020-04-17 15:06:59 -06:00
Weblate
07a45b3879 Merge branch 'origin/develop' into Weblate. 2020-04-17 20:52:16 +00:00
Travis Ralston
a234cb8a44
Merge pull request #4437 from matrix-org/travis/test-logs 
Don't explode if the e2e test directory exists when crashing
 2020-04-17 14:52:12 -06:00
Travis Ralston
88b5c3ca84 Don't explode if the e2e test directory exists when crashing 
This is largely expected in local test environments where the developer probably won't remember to clear out the directory themselves.
 2020-04-17 14:39:45 -06:00
Travis Ralston
77df610653 Appease the linter a bit more 2020-04-17 14:38:05 -06:00
Travis Ralston
5a9898591d Appease the linter 2020-04-17 14:35:02 -06:00
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
RiotRobot
1ee2d6f3a2 v2.5.0-rc.3 2020-04-17 17:51:49 +01:00
RiotRobot
12f2076e34 Prepare changelog for v2.5.0-rc.3 2020-04-17 17:51:49 +01:00
RiotRobot
383915d5cc Upgrade matrix-js-sdk to 5.3.1-rc.3 2020-04-17 17:46:55 +01: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