Commit graph

16146 commits

Author SHA1 Message Date
Michael Telatynski
9c500e3544 Merge branches 'develop' and 't3chguy/clean_up_TextualBody' of github.com:matrix-org/matrix-react-sdk into t3chguy/clean_up_TextualBody
 Conflicts:
	src/components/views/messages/TextualBody.js
2020-01-06 11:51:35 +00:00
David Baker
6b6d0dd866
Merge pull request #3810 from RiotTranslateBot/weblate-riot-web-matrix-react-sdk
Update from Weblate
2020-01-06 11:34:47 +00:00
Michael Telatynski
6a1f4c41ce
Merge pull request #3788 from matrix-org/t3chguy/user_info_non-historical
User Info fetch latest RoomMember instead of showing historical data
2020-01-06 11:25:54 +00:00
Michael Telatynski
f371034ef8
Merge pull request #3808 from matrix-org/t3chguy/remove_slate
Remove all usages of slate in favour of CIDER
2020-01-06 11:15:24 +00:00
Szimszon
393c610b5a Translated using Weblate (Hungarian)
Currently translated at 100.0% (2014 of 2014 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
2020-01-06 10:26:55 +00:00
Kévin C
d8a88387f3 Translated using Weblate (French)
Currently translated at 100.0% (2014 of 2014 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
2020-01-06 10:26:54 +00:00
Jeff Huang
51a1507f47 Translated using Weblate (Chinese (Traditional))
Currently translated at 100.0% (2014 of 2014 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
2020-01-06 10:26:54 +00:00
Osoitz
3b91b31534 Translated using Weblate (Basque)
Currently translated at 100.0% (2014 of 2014 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eu/
2020-01-06 10:26:53 +00:00
Besnik Bleta
2af4cdf532 Translated using Weblate (Albanian)
Currently translated at 99.1% (1995 of 2014 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sq/
2020-01-06 10:26:51 +00:00
Weblate
2f257c2dc7 Merge branch 'origin/develop' into Weblate. 2020-01-06 05:18:26 +00:00
Aaron Raimist
98ede6437e Use display name when pinned messages are changed
Signed-off-by: Aaron Raimist <aaron@raim.ist>
2020-01-05 23:04:46 -06:00
Michael Telatynski
d31c863563 Remove all usages of slate in favour of CIDER
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-01-06 00:15:48 +00:00
Weblate
0cad813071 Merge branch 'origin/develop' into Weblate. 2020-01-06 00:03:22 +00:00
Travis Ralston
781b69f4e3
Merge pull request #3693 from matrix-org/hs/bridge-info
Bridge info settings tab
2020-01-05 17:03:15 -07:00
Will Hunt
7f0ed05ee1
Update BridgeSettingsTab.js 2020-01-05 23:32:49 +00:00
Weblate
95cc08e5d7 Merge branch 'origin/develop' into Weblate. 2020-01-05 21:46:48 +00:00
catborise
a231419a77 Translated using Weblate (Turkish)
Currently translated at 53.2% (1067 of 2006 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/tr/
2020-01-05 21:46:48 +00:00
Szimszon
8128b97f35 Translated using Weblate (Hungarian)
Currently translated at 100.0% (2006 of 2006 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
2020-01-05 21:46:45 +00:00
Kévin C
d1405233bd Translated using Weblate (French)
Currently translated at 100.0% (2006 of 2006 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
2020-01-05 21:46:45 +00:00
Samu Voutilainen
e6c8016086 Translated using Weblate (Finnish)
Currently translated at 100.0% (2006 of 2006 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fi/
2020-01-05 21:46:44 +00:00
Jeff Huang
b8f1ca679b Translated using Weblate (Chinese (Traditional))
Currently translated at 100.0% (2006 of 2006 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
2020-01-05 21:46:44 +00:00
Besnik Bleta
c2c4426396 Translated using Weblate (Albanian)
Currently translated at 99.1% (1988 of 2006 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sq/
2020-01-05 21:46:43 +00:00
Michael Telatynski
814c0aa4c2 Send enabled_labs over rageshake as comma delimited list
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-01-05 20:52:54 +00:00
Will Hunt
2ccc8caa69
Fix indent 2020-01-05 15:50:06 +00:00
Weblate
6aab061fb9 Merge branch 'origin/develop' into Weblate. 2020-01-03 17:32:30 +00:00
Travis Ralston
65954b1e1b
Merge pull request #3792 from matrix-org/travis/ftue/user-lists/1-initial
Initial implementation of FTUE user lists design
2020-01-03 10:32:24 -07:00
Travis Ralston
752482964a Purify the components 2020-01-03 10:24:07 -07:00
Weblate
b97736f058 Merge branch 'origin/develop' into Weblate. 2020-01-03 16:32:09 +00:00
J. Ryan Stinnett
76f3a08909
Merge pull request #3800 from matrix-org/jryans/key-backup-dialogs-4s
Update key backup creation and recovery paths for SSSS
2020-01-03 16:32:02 +00:00
Weblate
5096696f4b Merge branch 'origin/develop' into Weblate. 2020-01-03 16:04:01 +00:00
Slavi Pantaleev
33d35c83ba Translated using Weblate (Bulgarian)
Currently translated at 100.0% (2000 of 2000 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/bg/
2020-01-03 16:04:01 +00:00
J. Ryan Stinnett
e12ed04da8 Remove unused import 2020-01-03 15:59:14 +00:00
David Baker
2125bcf5a6 Comment remaining non-cross-signing-compliant components
Fixes https://github.com/vector-im/riot-web/issues/11748
2020-01-03 15:38:59 +00:00
J. Ryan Stinnett
b8683462e8 Update backup creation paths for SSSS
This updates the various backup creation entry points to ensure they support
creating with secret storage if the feature flag is enabled.
2020-01-03 15:34:05 +00:00
Weblate
b79e1d47c4 Merge branch 'origin/develop' into Weblate. 2020-01-03 15:24:03 +00:00
Slavi Pantaleev
731279ab2d Translated using Weblate (Bulgarian)
Currently translated at 99.2% (1985 of 2001 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/bg/
2020-01-03 15:24:03 +00:00
David Baker
5faae1d2f2 i18n 2020-01-03 15:05:41 +00:00
David Baker
5897c8ca7f Remove 'unverify' from UserInfoPanel
It's not in the designs and it's not a thing we can do with
cross-signing (at least not at the moment).
2020-01-03 15:00:51 +00:00
Weblate
f25c1683c8 Merge branch 'origin/develop' into Weblate. 2020-01-03 14:52:50 +00:00
Slavi Pantaleev
0b16f862e9 Translated using Weblate (Bulgarian)
Currently translated at 97.8% (1956 of 2001 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/bg/
2020-01-03 14:52:49 +00:00
Half-Shot
50e19ba43d User may not be a bot, therefore do not imply it. 2020-01-03 14:04:59 +00:00
Half-Shot
668479d94a Tweak as per git review 2020-01-03 13:57:59 +00:00
J. Ryan Stinnett
4211ec5063 Fix DOM structure in RoomRecoveryReminder
Buttons (which end up as <div>s) aren't allowed inside <p>s.
2020-01-03 13:51:45 +00:00
J. Ryan Stinnett
d5a82a5fc2 Finish sentence in accessSecretStorage docs 2020-01-03 13:45:57 +00:00
David Baker
43e4f2dcc0 Use deviceTrust when displaying key backup trust status
Requires https://github.com/matrix-org/matrix-js-sdk/pull/1138
2020-01-03 13:34:43 +00:00
J. Ryan Stinnett
99559c5121 Update backup restore paths for SSSS
This updates all the various key backup entry points to ensure they use a flow
that supports backups stored under secret storage.
2020-01-03 13:33:36 +00:00
Weblate
b0e71daa61 Merge branch 'origin/develop' into Weblate. 2020-01-03 13:08:52 +00:00
David Baker
bcece7dc10
Merge pull request #3793 from matrix-org/dbkr/keyreq_dont_crash_if_removed
Don't crash if a keyshare request is removed
2020-01-03 13:08:47 +00:00
Weblate
831ad3ba33 Merge branch 'origin/develop' into Weblate. 2020-01-03 13:08:40 +00:00
catborise
c8f9df691b Translated using Weblate (Turkish)
Currently translated at 50.8% (1017 of 2001 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/tr/
2020-01-03 13:08:40 +00:00