Commit Graph

19494 Commits (53edbc743a5e11660a26b6237702db755ddd36da)

Author SHA1 Message Date
Weblate 402e8047c7 Merge branch 'origin/develop' into Weblate. 2019-11-18 17:45:24 +00:00
Travis Ralston ef1c575bff
Merge pull request #3622 from matrix-org/travis/new-widget-prompt
Implement the bulk of the new widget permission prompt design
2019-11-18 10:45:18 -07:00
Weblate bca03c981c Merge branch 'origin/develop' into Weblate. 2019-11-18 17:09:14 +00:00
J. Ryan Stinnett d5d2f7f936
Merge pull request #3588 from matrix-org/jryans/identity-disco-opt
Relax identity server discovery error handling
2019-11-18 17:09:08 +00:00
Weblate e52f554acf Merge branch 'origin/develop' into Weblate. 2019-11-18 16:52:08 +00:00
Walter fd5e239885 Translated using Weblate (Russian)
Currently translated at 97.2% (1855 of 1908 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
2019-11-18 16:52:08 +00:00
random 52e7d35050 Translated using Weblate (Italian)
Currently translated at 99.9% (1906 of 1908 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/it/
2019-11-18 16:52:05 +00:00
J. Ryan Stinnett 31b2d263f2
Merge pull request #3626 from matrix-org/jryans/cross-signing-flag
Add cross-signing feature flag
2019-11-18 16:51:58 +00:00
Michael Telatynski 050761d339
Merge pull request #3624 from matrix-org/t3chguy/remove_bluebird_2
Attempt number two at ripping out Bluebird from rageshake.js
2019-11-18 16:39:23 +00:00
J. Ryan Stinnett b8c0a0fe72 Reload automatically when changing cross-signing flag 2019-11-18 16:06:00 +00:00
J. Ryan Stinnett 50cccd3212 Add cross-signing feature flag
Fixes https://github.com/vector-im/riot-web/issues/11407
2019-11-18 16:06:00 +00:00
Damir Jelić 21f00aaeb1 EventIndex: Fix some spelling errors. 2019-11-18 17:00:30 +01:00
Damir Jelić 4a6623bc00 EventIndex: Rework the crawler cancellation. 2019-11-18 17:00:30 +01:00
Damir Jelić 8d7e7d0cc4 EventIndex: Remove the unused deleteEventIndex method.
We need to support the deletion of the event index even if it's not
currently initialized, therefore the deletion ended up in the
EventIndexPeg class.
2019-11-18 14:40:38 +01:00
Damir Jelić c48ccf9761 EventIndex: Remove some unnecessary checks if event indexing is supported. 2019-11-18 14:40:04 +01:00
Damir Jelić b983eaa3f9 EventIndex: Rename the file to be consistent with the class. 2019-11-18 14:36:08 +01:00
Damir Jelić 45e7aab41e EventIndexing: Rename our EventIndexer class. 2019-11-18 14:30:07 +01:00
Damir Jelić 579cbef7b0 EventIndexPeg: Rewrite the module documentation. 2019-11-18 14:29:03 +01:00
Michael Telatynski e144f1c368 remove Promise.config 2019-11-18 10:37:29 +00:00
Michael Telatynski 5c172a383d Merge branch 't3chguy/remove_bluebird_2' of https://github.com/matrix-org/matrix-react-sdk into t3chguy/remove_bluebird
 Conflicts:
	src/components/views/right_panel/UserInfo.js
2019-11-18 10:36:43 +00:00
David Baker 759b497899
Merge pull request #3625 from RiotTranslateBot/weblate-riot-web-matrix-react-sdk
Update from Weblate
2019-11-18 10:33:51 +00:00
Michael Telatynski 2fe764a3e9 Merge branches 'develop' and 't3chguy/remove_bluebird_2' of https://github.com/matrix-org/matrix-react-sdk into t3chguy/remove_bluebird_2 2019-11-18 10:24:14 +00:00
Michael Telatynski d4d51dc61f Rip out the remainder of Bluebird 2019-11-18 10:03:05 +00:00
Damir Jelić 2bb331cdf0 Searching: Fix a typo. 2019-11-18 10:58:57 +01:00
Damir Jelić 0e3a0008df Searching: Remove the func suffix from our search functions. 2019-11-18 10:58:54 +01:00
Damir Jelić a4ad8151f8 Searching: Use the short form to build the search arguments object. 2019-11-18 10:58:53 +01:00
Damir Jelić b4a6123295 Searching: Move a comment to the correct place. 2019-11-18 10:58:50 +01:00
Damir Jelić 3b06c684d2 EventIndexing: Don't capitalize homeserver. 2019-11-18 10:58:47 +01:00
Damir Jelić 050e52ce46 EventIndexPeg: Treat both cases of unavailable platform support the same. 2019-11-18 10:58:45 +01:00
Damir Jelić ddb536e94a EventIndexPeg: Move a docstring to the correct place. 2019-11-18 10:58:44 +01:00
Damir Jelić 910c3ac08d BaseEventIndexManager: Fix some type annotations. 2019-11-18 10:58:42 +01:00
Damir Jelić 5149164010 MatrixChat: Revert the unnecessary changes in the MatrixChat class. 2019-11-18 10:58:40 +01:00
Damir Jelić 9fa8e8238a BaseEventIndexManager: Fix a typo. 2019-11-18 10:58:38 +01:00
Damir Jelić ab93745460 Fix the copyright headers from New Vector to The Matrix Foundation. 2019-11-18 10:58:36 +01:00
Damir Jelić 30d4dd36a7 BaseEventIndexManager: Remove the flow annotation. 2019-11-18 10:58:31 +01:00
Michael Telatynski 47948812b0 Attempt number two at ripping out Bluebird from rageshake.js 2019-11-18 09:47:37 +00:00
Weblate 32fc1458d1 Merge branch 'origin/develop' into Weblate. 2019-11-18 09:29:24 +00:00
Nobbele 5d3a84db85 Translated using Weblate (Swedish)
Currently translated at 76.4% (1457 of 1908 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sv/
2019-11-18 09:29:23 +00:00
송태섭 20dd731ed0 Translated using Weblate (Korean)
Currently translated at 100.0% (1908 of 1908 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ko/
2019-11-18 09:29:22 +00:00
Szimszon 16a107a163 Translated using Weblate (Hungarian)
Currently translated at 100.0% (1908 of 1908 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
2019-11-18 09:29:18 +00:00
Kévin C 78c36e5936 Translated using Weblate (French)
Currently translated at 100.0% (1908 of 1908 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
2019-11-18 09:29:17 +00:00
Jeff Huang a9ef6bde63 Translated using Weblate (Chinese (Traditional))
Currently translated at 100.0% (1908 of 1908 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
2019-11-18 09:29:15 +00:00
Besnik Bleta d56ae70287 Translated using Weblate (Albanian)
Currently translated at 99.8% (1904 of 1908 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sq/
2019-11-18 09:29:14 +00:00
Michael Telatynski 1ab9b82c25
Merge pull request #3618 from matrix-org/t3chguy/remove_bluebird_2
Remove Bluebird: phase 2.1
2019-11-18 09:29:04 +00:00
Travis Ralston 6b726a8e13 Implement the bulk of the new widget permission prompt design
Part 1 of https://github.com/vector-im/riot-web/issues/11262

This is all the visual changes - the actual wiring of the UI to the right places is for another PR (though this PR still works independently).

The help icon is known to be weird here - it's a bug in the svg we have. The tooltip also goes right instead of up because making the tooltip go up is not easy work for this PR - maybe a future one if we *really* want it to go up.
2019-11-15 14:26:16 -07:00
Weblate e46a8c92d0 Merge branch 'origin/develop' into Weblate. 2019-11-15 17:54:24 +00:00
Travis Ralston d15722d4c9
Merge pull request #3619 from matrix-org/travis/deactivate-2
Add better error handling to Synapse user deactivation
2019-11-15 10:54:17 -07:00
Travis Ralston 61454bcf32 Fix i18n after merge 2019-11-15 10:25:58 -07:00
Travis Ralston 616a5ab55d Merge branch 'develop' into travis/deactivate-2 2019-11-15 10:24:20 -07:00
Weblate e6ffec948e Merge branch 'origin/develop' into Weblate. 2019-11-15 16:38:02 +00:00