Commit graph

19284 commits

Author SHA1 Message Date
Travis Ralston
e6e12df82d Add structural base for handling Mjolnir lists 2019-10-31 13:20:18 -06:00
Travis Ralston
23383419e8 Add settings base for Mjolnir rules 2019-10-31 13:20:18 -06:00
Weblate
cddb6b1687 Merge branch 'origin/develop' into Weblate. 2019-10-31 15:23:20 +00:00
random
3f5b7b3b92 Translated using Weblate (Italian)
Currently translated at 100.0% (1850 of 1850 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/it/
2019-10-31 15:23:20 +00:00
J. Ryan Stinnett
57013f0523
Merge pull request #3583 from matrix-org/jryans/refine-submit-url
Guard against misconfigured homeservers when adding / binding phone numbers
2019-10-31 17:23:14 +02:00
J. Ryan Stinnett
b38c7fc411 Guard against misconfigured homeservers when adding / binding phone numbers
This ensures we only fallback to submitting MSISDN tokens to the identity server
when we expect to do. Unexpected cases will now throw an error.

Fixes https://github.com/vector-im/riot-web/issues/10936
2019-10-31 14:50:21 +00:00
Weblate
64c3c1b85e Merge branch 'origin/develop' into Weblate. 2019-10-31 13:26:49 +00:00
Michael Telatynski
bc263fa4bb
Merge pull request #3580 from matrix-org/t3chguy/better_slash_command_errors_unknown
Fix error message which is shown when unknown slash command attempted
2019-10-31 13:26:43 +00:00
J. Ryan Stinnett
0fc5108817 Add a prompt when interacting with an identity server without terms
This adds a prompt whenever we are about to perform some action on a default identity
server (from homeserver .well-known or Riot app config) without terms. This
allows the user to abort or trust the server (storing it in account data).

Fixes https://github.com/vector-im/riot-web/issues/10557
2019-10-31 13:13:13 +00:00
Weblate
a21b7fcc26 Merge branch 'origin/develop' into Weblate. 2019-10-31 11:40:32 +00:00
Tim Stahel
3a1b065da2 Translated using Weblate (Swedish)
Currently translated at 77.7% (1437 of 1850 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sv/
2019-10-31 11:40:32 +00:00
Szimszon
4ed253b33d Translated using Weblate (Hungarian)
Currently translated at 100.0% (1850 of 1850 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
2019-10-31 11:40:30 +00:00
Kévin C
425ecc2fbb Translated using Weblate (French)
Currently translated at 100.0% (1850 of 1850 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
2019-10-31 11:40:29 +00:00
Michael Telatynski
db0e643f4d
Merge pull request #3581 from matrix-org/t3chguy/pinned_events_soft_crash
Attempt to fix soft crash on some pinned events by null guarding member
2019-10-31 11:40:21 +00:00
Michael Telatynski
ffb6054eac Attempt to fix soft crash on some pinned events by null guarding member 2019-10-31 11:21:58 +00:00
Michael Telatynski
178accae19 Fix error message which is shown when unknown slash command attempted 2019-10-31 10:49:24 +00:00
RiotRobot
60731dabf4 v1.7.1-rc.1 2019-10-30 16:47:27 +00:00
RiotRobot
5797b654db Prepare changelog for v1.7.1-rc.1 2019-10-30 16:47:26 +00:00
RiotRobot
8dfa464202 js-sdk rc.1 2019-10-30 16:44:18 +00:00
Weblate
21f1e34d19 Merge branch 'origin/develop' into Weblate. 2019-10-30 16:31:42 +00:00
Kévin C
35b81c8e73 Translated using Weblate (French)
Currently translated at 100.0% (1850 of 1850 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
2019-10-30 16:31:42 +00:00
Michael Telatynski
41792a23a6
Merge pull request #3573 from matrix-org/t3chguy/hide_tray_icon
Add ability to hide tray icon on non-Mac
2019-10-30 16:31:36 +00:00
Michael Telatynski
fa811f99de Merge hide-to-tray-icon with show-tray-icon 2019-10-30 14:32:27 +00:00
Michael Telatynski
46e7e1e81a Merge branches 'develop' and 't3chguy/hide_tray_icon' of https://github.com/matrix-org/matrix-react-sdk into t3chguy/hide_tray_icon 2019-10-30 14:15:09 +00:00
David Baker
e94a9a50e3
Merge pull request #3579 from RiotTranslateBot/weblate-riot-web-matrix-react-sdk
Update from Weblate
2019-10-30 13:43:14 +00:00
Weblate
e0917012ff Merge branch 'origin/develop' into Weblate. 2019-10-30 10:55:42 +00:00
송태섭
c4c14fa189 Translated using Weblate (Korean)
Currently translated at 100.0% (1850 of 1850 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ko/
2019-10-30 10:55:42 +00:00
random
287d03adc3 Translated using Weblate (Italian)
Currently translated at 100.0% (1850 of 1850 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/it/
2019-10-30 10:55:42 +00:00
Szimszon
96d99c350c Translated using Weblate (Hungarian)
Currently translated at 100.0% (1850 of 1850 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
2019-10-30 10:55:41 +00:00
Jeff Huang
9a2547800d Translated using Weblate (Chinese (Traditional))
Currently translated at 100.0% (1850 of 1850 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
2019-10-30 10:55:41 +00:00
David Baker
ca271dab5f
Merge pull request #3578 from matrix-org/dbkr/fix_call_state_logging
Fix call state logging
2019-10-30 10:55:37 +00:00
David Baker
342e7856cd Fix call state logging
console.log does not work that way
2019-10-30 10:38:34 +00:00
Travis Ralston
9d0d1d3b36 Our code should probably compile... 2019-10-29 14:38:39 -06:00
Travis Ralston
5af6d979c2 Support a setting for allowed widgets
Hooking this setting up is left as a problem for a different issue.
2019-10-29 14:35:35 -06:00
Travis Ralston
28e0988325 Fix naming of integrationProvisioning 2019-10-29 14:26:35 -06:00
Travis Ralston
3b771f682d let -> const 2019-10-29 14:23:59 -06:00
Travis Ralston
dd8f26a3f6 Add integration manager provisioning setting
To be used later by a future implementation
2019-10-29 14:20:53 -06:00
Travis Ralston
8dec435e50 Bring breadcrumbs into new Riot config standard 2019-10-29 14:12:05 -06:00
Weblate
2af478dd93 Merge branch 'origin/develop' into Weblate. 2019-10-29 18:16:52 +00:00
Travis Ralston
b44e14a722
Merge pull request #3576 from matrix-org/travis/widget-tokens
Match widgets up with their integration manager
2019-10-29 12:16:48 -06:00
Travis Ralston
e46976be72 Match widgets up with their integration manager 2019-10-29 11:49:15 -06:00
Weblate
75a4b49628 Merge branch 'origin/develop' into Weblate. 2019-10-29 17:37:38 +00:00
J. Ryan Stinnett
cbd25ab1a8
Merge pull request #3575 from matrix-org/jryans/log-event-wo-id
Add diagnostic log to catch events without an ID
2019-10-29 19:37:33 +02:00
J. Ryan Stinnett
3775dc0943 Add diagnostic log to catch events without an ID
This adds some temporary logging to investigate
https://github.com/vector-im/riot-web/issues/11120.
2019-10-29 17:32:22 +00:00
Weblate
0d0a15ddfd Merge branch 'origin/develop' into Weblate. 2019-10-29 16:43:15 +00:00
Walter
4eacafc6c7 Translated using Weblate (Russian)
Currently translated at 99.8% (1844 of 1847 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
2019-10-29 16:43:14 +00:00
random
8fd2330c68 Translated using Weblate (Italian)
Currently translated at 100.0% (1847 of 1847 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/it/
2019-10-29 16:43:14 +00:00
Szimszon
f8d09874f8 Translated using Weblate (Hungarian)
Currently translated at 100.0% (1847 of 1847 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
2019-10-29 16:43:14 +00:00
Kévin C
20d726fc59 Translated using Weblate (French)
Currently translated at 100.0% (1847 of 1847 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
2019-10-29 16:43:14 +00:00
Jeff Huang
1da3f24e18 Translated using Weblate (Chinese (Traditional))
Currently translated at 100.0% (1847 of 1847 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
2019-10-29 16:43:13 +00:00