Commit Graph

62531 Commits

Author SHA1 Message Date
Weblate 51f92b1eb4 Merge branch 'origin/develop' into Weblate. 2019-06-01 18:11:30 +00:00
Szimszon 261bbea934 Translated using Weblate (Hungarian)
Currently translated at 100.0% (21 of 21 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/hu/
2019-06-01 18:11:30 +00:00
Kévin C a4b5c233b7 Translated using Weblate (French)
Currently translated at 100.0% (21 of 21 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/fr/
2019-06-01 18:11:30 +00:00
Travis Ralston 29eeb1eaf3 Merge pull request #9927 from vector-im/travis/default-country-code
Add docs for defaultCountryCode
2019-06-01 12:11:26 -06:00
Weblate 3276945d4d Merge branch 'origin/develop' into Weblate. 2019-06-01 18:11:26 +00:00
Karol Kosek c2fc681769 Translated using Weblate (Polish)
Currently translated at 74.5% (1217 of 1634 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/pl/
2019-06-01 18:11:26 +00:00
Travis Ralston 7a4d69f037 Merge pull request #3049 from matrix-org/travis/default-country-code
Add option to change the default country code
2019-06-01 12:11:21 -06:00
Travis Ralston ecc0552e89 ToUpper the country code 2019-06-01 09:12:09 -06:00
Travis Ralston c12ef8829c Remove debugging 2019-05-31 21:26:22 -06:00
Travis Ralston 3f646f13dd Add option to change the default country code
Fixes https://github.com/vector-im/riot-web/issues/9926
2019-05-31 21:25:13 -06:00
Travis Ralston cafae31827 Add docs for defaultCountryCode 2019-05-31 21:23:58 -06:00
Weblate 79e647f79b Merge branch 'origin/develop' into Weblate. 2019-05-31 17:03:45 +00:00
Weblate a38e5bde3a Merge branch 'origin/develop' into Weblate. 2019-05-31 17:03:43 +00:00
Travis Ralston 1c41629376 Merge pull request #3043 from matrix-org/travis/check-login-for-config
Accept JSX into the GenericErrorPage and expose local session vars
2019-05-31 11:03:41 -06:00
Travis Ralston 1459bfe7be Merge pull request #9892 from vector-im/travis/check-login-for-config
Use the user's pre-existing HS when config validation fails
2019-05-31 11:03:38 -06:00
Travis Ralston 81ec75f81d Change warning message 2019-05-31 10:44:20 -06:00
Weblate 7a26100a2e Merge branch 'origin/develop' into Weblate. 2019-05-31 15:27:49 +00:00
Walter 98ab573b9a Translated using Weblate (Russian)
Currently translated at 97.1% (1586 of 1634 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
2019-05-31 15:27:49 +00:00
Travis Ralston f512f51f54 Merge pull request #3048 from matrix-org/travis/fix-lowbandwidth-logout
Don't try and low encryption info when signing out in low bandwidth mode
2019-05-31 09:27:43 -06:00
Travis Ralston 16a46be00f Cache shouldLoadBackupStatus in state 2019-05-31 09:20:13 -06:00
Travis Ralston 1c84abae44 Fix logout dialog for low bandwidth 2019-05-31 09:14:49 -06:00
Weblate ed397a0542 Merge branch 'origin/develop' into Weblate. 2019-05-31 13:17:43 +00:00
Walter 7d3d6a763c Translated using Weblate (Russian)
Currently translated at 94.7% (1547 of 1634 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
2019-05-31 13:17:43 +00:00
Nathan Follens 061d72e286 Translated using Weblate (German)
Currently translated at 87.9% (1437 of 1634 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2019-05-31 13:17:40 +00:00
Kévin C da459c4f67 Translated using Weblate (French)
Currently translated at 100.0% (1634 of 1634 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
2019-05-31 13:17:40 +00:00
Nathan Follens f68833c9ac Translated using Weblate (Dutch)
Currently translated at 99.9% (1633 of 1634 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/nl/
2019-05-31 13:17:39 +00:00
Bruno Windels 2f98d0edb7 Merge pull request #3047 from matrix-org/bwindels/autocomplete-enter-fix
only capture enter if something was selected in completions
2019-05-31 13:17:35 +00:00
Bruno Windels 716719187d only capture enter if something was selected in completions 2019-05-31 15:05:09 +02:00
Bruno Windels 9e4d8e7dfe document settingDefaults 2019-05-31 15:00:26 +02:00
Bruno Windels f1531d2b12 add settingDefaults to sample config 2019-05-31 14:52:29 +02:00
Weblate 86515e6814 Merge branch 'origin/develop' into Weblate. 2019-05-31 11:02:14 +00:00
RiotRobot ada47d476c Merge branch 'master' into develop 2019-05-31 12:02:00 +01:00
RiotRobot 7446799e4b v1.2.1 v1.2.1 2019-05-31 11:59:31 +01:00
RiotRobot 947e5ab582 Prepare changelog for v1.2.1 2019-05-31 11:59:31 +01:00
RiotRobot 6b93053a80 v1.2.1 2019-05-31 11:53:34 +01:00
RiotRobot 7c03bd128b Upgrade JS SDK to 2.0.0 and React SDK to 1.2.1 2019-05-31 11:52:42 +01:00
Will Hunt 96c20ea536 Add missing keys to notif sound setting 2019-05-31 11:40:23 +01:00
Weblate f1121b57ed Merge branch 'origin/develop' into Weblate. 2019-05-31 10:33:24 +00:00
RiotRobot 512c9b2ac8 Merge branch 'master' into develop 2019-05-31 11:26:49 +01:00
RiotRobot 21c8a64ce1 v1.2.1 2019-05-31 11:26:02 +01:00
RiotRobot 667232ded7 Prepare changelog for v1.2.1 2019-05-31 11:26:02 +01:00
J. Ryan Stinnett cbcdd6bffb Merge pull request #3045 from matrix-org/jryans/emoji-height-release
Native emoji require extra line-height
2019-05-31 11:18:12 +01:00
J. Ryan Stinnett 8e7933138f Native emoji require extra line-height
Increase line-height so that native emoji aren't cut off when we fall back to
them.

Fixes https://github.com/vector-im/riot-web/issues/9898
2019-05-31 11:11:22 +01:00
RiotRobot 2a41471df3 Upgrade to JS SDK 2.0.0 which fixes an error during key backup 2019-05-31 11:06:06 +01:00
Will Hunt 9369e964fa Merge remote-tracking branch 'upstream/develop' into hs/custom-notif-sounds 2019-05-31 10:44:30 +01:00
Weblate 76a8265415 Merge branch 'origin/develop' into Weblate. 2019-05-31 09:21:48 +00:00
Bruno Windels 2d8c523642 Merge pull request #3040 from matrix-org/bwindels/editor-remaining-md
Fix: better HTML > MD conversion for editing, including lists and quotes
2019-05-31 09:21:43 +00:00
Weblate 9de96b381a Merge branch 'origin/develop' into Weblate. 2019-05-31 09:17:31 +00:00
Szimszon b9785ca025 Translated using Weblate (Hungarian)
Currently translated at 100.0% (1634 of 1634 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
2019-05-31 09:17:31 +00:00
J. Ryan Stinnett 5593b499d9 Merge pull request #3044 from matrix-org/jryans/line-height-native-emoji
Native emoji require extra line-height
2019-05-31 10:17:26 +01:00