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

24254 Commits (52dec0cc8d871f271f7433036007d015e59f1eb8)

Author SHA1 Message Date
Jeff Huang 52dec0cc8d Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (2307 of 2307 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
 2020-05-13 08:58:19 +00:00
tleydxdy 73a6fed1e3 Translated using Weblate (Chinese (Simplified)) 
Currently translated at 61.7% (1424 of 2307 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hans/
 2020-05-13 08:58:19 +00:00
Weblate 48f012ef10 Merge branch 'origin/develop' into Weblate. 2020-05-12 16:09:07 +00:00
Michael Telatynski 5783a9359e
Merge pull request #4583 from matrix-org/t3chguy/redactions-electron 
Rename `trash (custom).svg` as electron doesn't like paths with spaces
 2020-05-12 17:09:02 +01:00
Weblate 33dd4ca8f6 Merge branch 'origin/develop' into Weblate. 2020-05-12 15:39:22 +00:00
David Baker ea502b83ff
Merge pull request #4582 from matrix-org/dbkr/fix_room_preview_signin_buttons 
Fix sign in / up links on previewed rooms
 2020-05-12 16:39:18 +01:00
Michael Telatynski 004f75f289 Rename `trash (custom).svg` as electron doesn't like serving files with spaces 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-05-12 16:16:47 +01:00
David Baker 03b10e7226 Fix sign in / up links on previewed rooms 
They errored because the out-of-band data was assumed to be non-null,
but that's only present for 3rd party invites.
 2020-05-12 15:24:12 +01:00
Weblate d49bc541af Merge branch 'origin/develop' into Weblate. 2020-05-12 13:36:59 +00:00
David Baker 8b8eb7d3c0
Merge pull request #4580 from matrix-org/dbkr/dont_npe_if_no_device 
Avoid soft crash if unknown device in verification
 2020-05-12 14:36:54 +01:00
David Baker a000be2b01 i18n 2020-05-12 14:03:40 +01:00
David Baker ae2645b69b Provide separate translatable for case where we have no device 2020-05-12 12:42:16 +01:00
David Baker 3c5c7f56f3 Adjust comment 2020-05-12 11:14:05 +01:00
David Baker 5c0920da42 Avoid soft crash if unknown device in verification 
Rageshakes from the wild indicate that device was null here which
implies that we somehow did not know about the device when verifiying
it? Log and null-check to avoid a soft crash.
 2020-05-12 11:05:30 +01:00
Weblate a565855770 Merge branch 'origin/develop' into Weblate. 2020-05-12 09:33:57 +00:00
Iria_kuro ca30cf7ac9 Translated using Weblate (Korean) 
Currently translated at 76.1% (1752 of 2303 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ko/
 2020-05-12 09:33:57 +00:00
Samu Voutilainen 1f603090be Translated using Weblate (Finnish) 
Currently translated at 90.7% (2088 of 2303 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fi/
 2020-05-12 09:33:56 +00:00
Priit Jõerüüt dba98e17da Translated using Weblate (Estonian) 
Currently translated at 44.5% (1024 of 2303 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/et/
 2020-05-12 09:33:55 +00:00
Tirifto 4937543648 Translated using Weblate (Esperanto) 
Currently translated at 100.0% (2303 of 2303 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eo/
 2020-05-12 09:33:51 +00:00
Stanislav Lukeš 7c9a9b223a Translated using Weblate (Czech) 
Currently translated at 93.5% (2154 of 2303 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/cs/
 2020-05-12 09:33:50 +00:00
Michael Telatynski 5faab32384
Merge pull request #4568 from matrix-org/t3chguy/cmds2 
Add slash commands /query and /msg to match IRC
 2020-05-12 10:33:44 +01:00
Michael Telatynski 3fa13d7de3 Add comment for the regex 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-05-12 10:23:53 +01:00
Weblate 21b3892b6d Merge branch 'origin/develop' into Weblate. 2020-05-12 09:22:19 +00:00
Michael Telatynski 422a22ab90
Merge pull request #4570 from matrix-org/t3chguy/rageshake_xsign_debug 
Send cross-signing debug booleans over rageshake
 2020-05-12 10:22:12 +01:00
Michael Telatynski 03ad8a606a
Merge branch 'develop' into t3chguy/rageshake_xsign_debug 2020-05-12 09:44:49 +01:00
Weblate f2177901b0 Merge branch 'origin/develop' into Weblate. 2020-05-12 08:43:39 +00:00
Michael Telatynski ad2c9df271
Merge pull request #4575 from matrix-org/t3chguy/registration_disabled_prompt_server 
Prompt user to specify an alternate server if theirs has registration off
 2020-05-12 09:43:34 +01:00
Weblate b35e5d902c Merge branch 'origin/develop' into Weblate. 2020-05-12 08:43:28 +00:00
Michael Telatynski b95d533c4a
Merge pull request #4573 from matrix-org/t3chguy/remove_recent_self 
Don't try and redact redactions for "Remove recent messages"
 2020-05-12 09:43:23 +01:00
Weblate df61420f82 Merge branch 'origin/develop' into Weblate. 2020-05-12 08:43:09 +00:00
Michael Telatynski aacc582b52
Merge pull request #4571 from matrix-org/t3chguy/view_source_edits 
View Source should target the replacing event rather than the root one
 2020-05-12 09:43:02 +01:00
Weblate 1ba95851ad Merge branch 'origin/develop' into Weblate. 2020-05-12 08:22:14 +00:00
David Baker 03fce86699
Merge pull request #4569 from matrix-org/dbkr/key_backup_restore_reset_recovery 
Fix passphrase reset in key backup restore dialog
 2020-05-12 09:22:08 +01:00
Weblate 2b4113a92e Merge branch 'origin/develop' into Weblate. 2020-05-11 20:30:17 +00:00
Travis Ralston 58a5b7f154
Merge pull request #4556 from matrix-org/travis/fix-reset 
Ensure key backup gets dealt with correctly during secret storage reset
 2020-05-11 14:30:12 -06:00
Michael Telatynski c2dcb60f0b Prompt user to specify an alternate server if their chosen one has registration disabled 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-05-11 20:10:45 +01:00
Weblate d100b39a83 Merge branch 'origin/develop' into Weblate. 2020-05-11 16:12:43 +00:00
Michael Telatynski c2fea7d4d8
Merge pull request #4565 from matrix-org/matthew/invite-npe 
Fix crash for broken invites
 2020-05-11 17:12:38 +01:00
Michael Telatynski f02ce176dd Merge branches 'develop' and 'matthew/invite-npe' of github.com:matrix-org/matrix-react-sdk into matthew/invite-npe 2020-05-11 17:05:17 +01:00
Weblate 858cb5f6bc Merge branch 'origin/develop' into Weblate. 2020-05-11 15:55:19 +00:00
David Baker b1e266823f
Merge pull request #4572 from matrix-org/dbkr/rageshake_work_if_no_client 
Fix rageshake with no matrix client
 2020-05-11 16:55:14 +01:00
Michael Telatynski c0061e2f2a Don't try and redact redactions for "Remove recent messages" 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-05-11 16:39:14 +01:00
David Baker f487c2b38c Fix rageshake with no matrix client 
We checked for the presence of a matrix client but then went and
called a method on it assuming it existed on the line below, so,
don't do that.

https://github.com/vector-im/riot-web/issues/13624 pointed this out
 2020-05-11 16:21:08 +01:00
Michael Telatynski 0e8bd59d2f View Source should target the replacing event rather than the root one 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-05-11 15:43:34 +01:00
Michael Telatynski 3e934c8081 Send cross-signing debug booleans over rageshake 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-05-11 15:17:25 +01:00
David Baker 6486c74909 Fix passphrase reset in key backup restore dialog 
We prompt to restore the key backup when bootstrapping if it's not
trusted, but the 'set up new recovery options' in this dialog just
sets up a new key backup which just goes back to trying to access
SSSS if cross-signing is enabled. This makes it reset the SSSS
passphase instead.

Fixes https://github.com/vector-im/riot-web/issues/13578
 2020-05-11 14:21:59 +01:00
Michael Telatynski 293bd15ee9 fix variable name shadowing 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-05-11 11:05:03 +01:00
Michael Telatynski 6ea9aebda3 Add slash commands /query and /msg to match IRC 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-05-11 10:55:31 +01:00
Weblate d538bb9210 Merge branch 'origin/develop' into Weblate. 2020-05-11 09:18:30 +00:00
David Baker 159547e6f8
Merge pull request #4567 from RiotTranslateBot/weblate-riot-web-matrix-react-sdk 
Update from Weblate
 2020-05-11 10:18:23 +01:00