mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web.git synced 2024-12-01 10:27:06 +03:00
Code Issues Projects Releases Packages Wiki Activity
24338 commits 217 branches 561 tags 443 MiB
Commit graph

24338 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Michael Telatynski
1a713119d8 Add Kosovo as it is understood by google's libphonenumber 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-05-11 22:04:37 +01:00
Michael Telatynski
3bb800bb81 Replace png flags with use of Twemoji 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-05-11 22:04:18 +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
Weblate
e62fe68907 Merge branch 'origin/develop' into Weblate. 2020-05-11 09:11:04 +00:00
Michael Telatynski
67844d9e1d
Merge pull request #4564 from matrix-org/t3chguy/redaction_redesign 
Bring back UnknownBody for UISIs
 2020-05-11 10:10:59 +01:00
Weblate
121abaf283 Merge branch 'origin/develop' into Weblate. 2020-05-11 09:10:38 +00:00
Michael Telatynski
f4b55f056f
Merge pull request #4559 from matrix-org/t3chguy/leave_tag 
clear tag panel selection if the community selected is left
 2020-05-11 10:10:32 +01:00
Weblate
f58b08c950 Merge branch 'origin/develop' into Weblate. 2020-05-11 09:10:30 +00:00
Michael Telatynski
0da8ef6a1e
Merge pull request #4560 from matrix-org/t3chguy/redact_file 
Close ImageView when redacting
 2020-05-11 10:10:25 +01:00
strix aluco
643ed58874 Translated using Weblate (Ukrainian) 
Currently translated at 28.1% (647 of 2303 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/uk/
 2020-05-11 08:56:42 +00:00
Jan van der Weijst
97cadfa957 Translated using Weblate (Spanish) 
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/es/
 2020-05-11 08:56:38 +00:00
Frisk
c3cd7e17c0 Translated using Weblate (Polish) 
Currently translated at 68.4% (1576 of 2303 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/pl/
 2020-05-11 08:56:13 +00:00
call_xz
b72ae00222 Translated using Weblate (Japanese) 
Currently translated at 57.8% (1332 of 2303 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ja/
 2020-05-11 08:56:11 +00:00
random
38ed619e2c Translated using Weblate (Italian) 
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/it/
 2020-05-11 08:56:10 +00:00
@a2sc:matrix.org
c9a208ce35 Translated using Weblate (German) 
Currently translated at 99.9% (2301 of 2303 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
 2020-05-11 08:56:10 +00:00
Michael Albert
bd79086702 Translated using Weblate (German) 
Currently translated at 99.9% (2301 of 2303 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
 2020-05-11 08:56:09 +00:00
Kévin C
4b7aa45445 Translated using Weblate (French) 
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/fr/
 2020-05-11 08:56:08 +00:00
Priit Jõerüüt
64459f18c6 Translated using Weblate (Estonian) 
Currently translated at 41.6% (959 of 2303 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/et/
 2020-05-11 08:56:08 +00:00
Tirifto
943eb57b15 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-11 08:56:06 +00:00
J. A. Durieux
b5e10b4464 Translated using Weblate (Dutch) 
Currently translated at 91.9% (2117 of 2303 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/nl/
 2020-05-11 08:56:05 +00:00
Jeff Huang
8cd04a5f32 Translated using Weblate (Chinese (Traditional)) 
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/zh_Hant/
 2020-05-11 08:56:02 +00:00
Pepper.Cabbit.Snoopy
19e8f16da6 Translated using Weblate (Chinese (Simplified)) 
Currently translated at 60.7% (1399 of 2303 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hans/
 2020-05-11 08:56:02 +00:00
Sejo
662077fe67 Translated using Weblate (Spanish) 
Currently translated at 78.1% (1799 of 2303 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/es/
 2020-05-10 21:31:25 +00:00
Jan van der Weijst
76d054bbf3 Translated using Weblate (Spanish) 
Currently translated at 78.1% (1799 of 2303 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/es/
 2020-05-10 21:31:25 +00:00