OpenCloud
/
element-web
mirror of https://github.com/vector-im/element-web
1
0
Fork 0
Code Issues Releases Wiki Activity
26,155 Commits
229 Branches
566 Tags
473 MiB
Commit Graph

26155 Commits (2d09ac9f88655cbcecdeb9891ced9ad1d82a9e3c)

Author SHA1 Message Date
J. Ryan Stinnett 51118863c7 Fix jumping to read marker for events without tiles 
It is possible for your read marker to be set to an event without a tile (like a
reaction). We would still render the read marker at the position of those events
in the timeline, even though there's no matching tile, which breaks a core
assumption of jump to read marker path: it assumes that if the read marker node
is present in the DOM, then there must also be an event tile with a scroll token
matching the event ID.

This fixes the situation by setting a scroll token on the read marker so it can
always be scrolled to, no matter what kind of event it might represent.

Fixes vector-im/riot-web#10975
 2020-06-30 18:40:52 +01:00
Weblate e5a7101f1a Merge branch 'origin/develop' into Weblate. 2020-06-30 17:06:17 +00:00
David Baker 2247400010
Merge pull request #4847 from matrix-org/dbkr/recovery_key_upload_2 
Add file upload button to recovery key input
 2020-06-30 18:06:12 +01:00
David Baker 7caf2d5459 remove rogue blank line 2020-06-30 17:56:50 +01:00
Weblate 4f899f2d34 Merge branch 'origin/develop' into Weblate. 2020-06-30 16:55:09 +00:00
David Baker 21c5c745c1
Merge pull request #4831 from matrix-org/dbkr/recovery_key_passphrase_2 
Implement new design on security setup & login
 2020-06-30 17:55:03 +01:00
Weblate ab1472dc98 Merge branch 'origin/develop' into Weblate. 2020-06-30 16:36:21 +00:00
Michael Telatynski 55e0df3e00
Merge pull request #4856 from matrix-org/t3chguy/fix-join-slashcmd 
Fix /join slash command via servers including room id as a via
 2020-06-30 17:36:15 +01:00
Weblate 8eb3d747b8 Merge branch 'origin/develop' into Weblate. 2020-06-30 16:02:08 +00:00
Michael Telatynski f269aefe18
Merge pull request #4855 from matrix-org/t3chguy/download_toast 
Add Generic Expiring Toast and timing hooks
 2020-06-30 17:02:04 +01:00
Weblate 8aa80015d1 Merge branch 'origin/develop' into Weblate. 2020-06-30 15:57:02 +00:00
Michael Telatynski 446f3e35e9
Merge pull request #4846 from matrix-org/t3chguy/notifications0 
Fix Room Custom Sounds regression and make ProgressBar relevant again
 2020-06-30 16:56:57 +01:00
Weblate 1e9ad26fb9 Merge branch 'origin/develop' into Weblate. 2020-06-30 15:56:46 +00:00
random 41ac980196 Translated using Weblate (Italian) 
Currently translated at 100.0% (2345 of 2345 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/it/
 2020-06-30 15:56:46 +00:00
Michael Albert bf4305f00c Translated using Weblate (German) 
Currently translated at 99.9% (2343 of 2345 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
 2020-06-30 15:56:45 +00:00
XoseM 08fa7912b3 Translated using Weblate (Galician) 
Currently translated at 100.0% (2345 of 2345 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/gl/
 2020-06-30 15:56:45 +00:00
Kévin C 2d6142d132 Translated using Weblate (French) 
Currently translated at 100.0% (2345 of 2345 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
 2020-06-30 15:56:45 +00:00
Jeff Huang 022cc5ea32 Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (2345 of 2345 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
 2020-06-30 15:56:44 +00:00
Michael Telatynski cd06910713
Merge pull request #4854 from matrix-org/t3chguy/fix-redirect-loop 
Including start_sso and start_cas in redirect loop prevention
 2020-06-30 16:56:38 +01:00
Michael Telatynski 7d7bafb1ea De-duplicate rooms from the room autocomplete provider 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-06-30 16:23:52 +01:00
David Baker 1e457994f9 More padding between header & text in radio button 2020-06-30 11:10:12 +01:00
Michael Telatynski 6b2ba8caed Add svgs 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-06-30 00:27:32 +01:00
Michael Telatynski 54419878fa Add room notifications context menu and non-default indicator to RoomTile2 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-06-30 00:16:51 +01:00
Michael Telatynski adf186f568 Fix RoomTile2 Context Menu to match Figma 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-06-29 23:03:44 +01:00
Weblate 34328eaf8e Merge branch 'origin/develop' into Weblate. 2020-06-29 19:10:59 +00:00
Travis Ralston bb9ae7b55b
Merge pull request #4850 from matrix-org/travis/room-list/todo-cleanup 
Clean up TODO comments for new room list
 2020-06-29 13:10:52 -06:00
Michael Telatynski 9f6893ef2b Fix /join slash command via servers including room id as a via 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-06-29 16:27:59 +01:00
Weblate afeb3b3363 Merge branch 'origin/develop' into Weblate. 2020-06-29 15:12:38 +00:00
RiotRobot 0059d44e15 Merge branch 'master' into develop 2020-06-29 16:10:32 +01:00
RiotRobot e43311c0f4 v2.8.1 2020-06-29 15:59:37 +01:00
RiotRobot 9329be3bb8 Prepare changelog for v2.8.1 2020-06-29 15:59:36 +01:00
Michael Telatynski b2b909aa53 Including start_sso and start_cas in redirect loop prevention 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-06-29 15:40:20 +01:00
J. Ryan Stinnett 7c9b8baf09
Merge pull request #4852 from matrix-org/jryans/no-4s-release 
Support accounts with cross signing but no SSSS
 2020-06-29 14:14:15 +01:00
J. Ryan Stinnett 518db90b69 Support accounts with cross signing but no SSSS 
Port https://github.com/matrix-org/matrix-react-sdk/pull/4717 to release
 2020-06-29 13:55:06 +01:00
Weblate 8799e649df Merge branch 'origin/develop' into Weblate. 2020-06-29 11:27:30 +00:00
random 88c195e443 Translated using Weblate (Italian) 
Currently translated at 100.0% (2344 of 2344 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/it/
 2020-06-29 11:27:30 +00:00
Michael Albert 02274ed6a6 Translated using Weblate (German) 
Currently translated at 99.9% (2342 of 2344 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
 2020-06-29 11:27:26 +00:00
Michael Telatynski 1a1b7e5e70 Add Generic Expiring Toast 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-06-29 11:38:50 +01:00
Michael Telatynski 51b813e250 add timing/interval/expiry hooks 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-06-29 11:35:14 +01:00
Michael Telatynski d477a49160 ToastStore fix type definition 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-06-29 11:34:58 +01:00
J. Ryan Stinnett d1d4bef795
Merge pull request #4622 from aaronraimist/redaction-timestamp 
Show timestamp of redaction on hover
 2020-06-29 11:10:25 +01:00
Travis Ralston 175ade8ac4 Merge branch 'develop' into travis/room-list/todo-cleanup 2020-06-28 20:04:41 -06:00
Weblate 2101f14cd6 Merge branch 'origin/develop' into Weblate. 2020-06-29 02:04:28 +00:00
васян228 57df5e8f6b Translated using Weblate (Russian) 
Currently translated at 85.2% (1996 of 2344 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
 2020-06-29 02:04:28 +00:00
progserega 321d8ef2a1 Translated using Weblate (Russian) 
Currently translated at 85.2% (1996 of 2344 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
 2020-06-29 02:04:27 +00:00
Priit Jõerüüt 80de67eff5 Translated using Weblate (Estonian) 
Currently translated at 75.2% (1762 of 2344 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/et/
 2020-06-29 02:04:27 +00:00
Besnik Bleta badce33730 Translated using Weblate (Albanian) 
Currently translated at 99.7% (2337 of 2344 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sq/
 2020-06-29 02:04:25 +00:00
Travis Ralston a36a03bd05
Merge pull request #4849 from matrix-org/travis/room-list/remove-dm 
Remove the DM button from new room tiles
 2020-06-28 20:04:12 -06:00
Travis Ralston 62467144ba Update i18n 2020-06-28 20:03:55 -06:00
Travis Ralston ee2c216c4d Clean up TODO comments for new room list 
All relevant TODOs should still be present, and reference an issue for easy finding.
 2020-06-28 20:03:04 -06:00