Commit graph

22936 commits

Author SHA1 Message Date
Damir Jelić
c02e839e9d EventIndex: Use a const instead of a let binding. 2020-03-12 12:15:46 +01:00
Damir Jelić
cd515f1922 EventIndex: Add support to delete events from the index. 2020-03-12 12:01:50 +01:00
David Baker
1a1782fc06
Merge pull request #4201 from matrix-org/dbkr/yarn_upgrade_20200311
yarn upgrade
2020-03-12 09:45:32 +00:00
Travis Ralston
50603063e6
Merge pull request #4203 from matrix-org/travis/typescript-2
Support TypeScript for React components
2020-03-11 18:36:48 -06:00
Travis Ralston
751bcfb1f5 Supply --jsx react to tsc 2020-03-11 18:24:01 -06:00
Travis Ralston
5a5e7171bc Also tsconfig 2020-03-11 18:17:35 -06:00
Travis Ralston
cccd27fe84 Convert TabbedView to TypeScript to prove it works 2020-03-11 18:03:43 -06:00
Travis Ralston
7dd7417f12 Enable support for TypeScript in components
Includes: compilation, translations, IDE support (use .tsx not .ts), typings, and other build tools.

TypeScript component have to import PropTypes and React with `import * as React from 'react';`
2020-03-11 18:03:43 -06:00
RiotRobot
9b6986e862 v2.2.3-rc.1 2020-03-11 17:33:57 +00:00
RiotRobot
5d4651578f Prepare changelog for v2.2.3-rc.1 2020-03-11 17:33:57 +00:00
Travis Ralston
d470f9649d
Merge pull request #4183 from aaronraimist/room-name-change-ev
When room name is changed, show both the old and new name
2020-03-11 11:08:52 -06:00
RiotRobot
57022d9355 Reset matrix-js-sdk back to develop branch 2020-03-11 16:25:15 +00:00
RiotRobot
0e08e4bd0e v2.2.2 2020-03-11 16:23:53 +00:00
RiotRobot
5e3d651731 Prepare changelog for v2.2.2 2020-03-11 16:23:53 +00:00
RiotRobot
15d5190b9b js-sdk rc.1 2020-03-11 16:18:08 +00:00
David Baker
6b4d3cad7c yarn upgrade 2020-03-11 14:54:03 +00:00
Bruno Windels
e373dbd616 use new legacy verif method for a single device 2020-03-11 15:52:48 +01:00
David Baker
53fabf61d6
Merge pull request #4200 from RiotTranslateBot/weblate-riot-web-matrix-react-sdk
Update from Weblate
2020-03-11 14:50:43 +00:00
David Baker
80e7cbf2e1 Translated using Weblate (Russian)
Currently translated at 83.2% (1783 of 2144 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
2020-03-11 14:34:18 +00:00
Weblate
526136cc67 Merge branch 'origin/develop' into Weblate. 2020-03-11 11:30:21 +00:00
Bruno Windels
138e663498
Merge pull request #4198 from matrix-org/bwindels/dontenable4swhenacceptingverifreq
Revert "enable 4s when accepting a verification request"
2020-03-11 11:30:15 +00:00
Bruno Windels
cccf7cd07f specific error for lack of permissions when trying to delete an alias 2020-03-11 12:13:28 +01:00
Bruno Windels
3baaaaab07 use splice correctly after removing a local alias 2020-03-11 12:03:16 +01:00
Weblate
1157e2866d Merge branch 'origin/develop' into Weblate. 2020-03-11 09:21:07 +00:00
Michael Telatynski
f9954a668c
Merge pull request #4197 from matrix-org/t3chguy/dont_remount_main_split
Don't remount main split children on rhs collapse
2020-03-11 09:21:01 +00:00
Bruno Windels
13a4f4190f Revert "also enable 4s when accepting a verification request"
This reverts commit ab2e3a3465.
2020-03-11 10:11:54 +01:00
Weblate
8dab4667f7 Merge branch 'origin/develop' into Weblate. 2020-03-11 09:04:19 +00:00
Bruno Windels
1ae4a1cd5b
Merge pull request #4195 from matrix-org/bwindels/alwayshavealabelforcanonaliasevent
Add fallback label for canonical alias events that dont change anything
2020-03-11 09:04:14 +00:00
Weblate
50d1b58d6b Merge branch 'origin/develop' into Weblate. 2020-03-11 09:03:44 +00:00
catborise
8e647e539f Translated using Weblate (Turkish)
Currently translated at 78.3% (1678 of 2143 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/tr/
2020-03-11 09:03:43 +00:00
Kévin C
58d3ad515f Translated using Weblate (French)
Currently translated at 100.0% (2143 of 2143 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
2020-03-11 09:03:41 +00:00
Jeff Huang
73980422e6 Translated using Weblate (Chinese (Traditional))
Currently translated at 100.0% (2143 of 2143 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
2020-03-11 09:03:40 +00:00
Bruno Windels
27db5d68be
Merge pull request #4196 from matrix-org/bwindels/verifdialogpromise
Immediately switch to verification dialog when clicking [Continue] from new session dialog
2020-03-11 09:03:31 +00:00
Michael Telatynski
5c582037ce Tweak padding to match Figma
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-03-10 23:11:48 +00:00
Michael Telatynski
78ffb3ddf4 Don't remount main split children on rhs collapse
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-03-10 20:09:40 +00:00
Weblate
d219e989ac Merge branch 'origin/develop' into Weblate. 2020-03-10 18:03:09 +00:00
Bruno Windels
f22554e99a
Merge pull request #4194 from matrix-org/bwindels/enable4sonverify
Enable 4S if needed when trying to verify or accepting verification
2020-03-10 18:03:02 +00:00
Bruno Windels
91de7fd7b6 also allow passing a promise to a verif request to the verification dialog 2020-03-10 18:59:45 +01:00
Bruno Windels
5d7f2f96e7 add fallback label for canonical alias events that dont change anything 2020-03-10 18:45:51 +01:00
Bruno Windels
1eb5bdf847 use USK as we'll only have that around when using key sharing 2020-03-10 18:40:24 +01:00
Weblate
e6e253d13c Merge branch 'origin/develop' into Weblate. 2020-03-10 17:29:12 +00:00
Besnik Bleta
84f6bf06dd Translated using Weblate (Albanian)
Currently translated at 99.7% (2133 of 2140 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sq/
2020-03-10 17:29:12 +00:00
Travis Ralston
f33c930c41 Revert "Merge pull request #3892 from krkc/move-read-receipts-to-bottom"
This reverts commit 191abb5b0d.
2020-03-10 11:28:52 -06:00
Weblate
cdb14f38b3 Merge branch 'origin/develop' into Weblate. 2020-03-10 15:59:49 +00:00
Travis Ralston
a808b05026
Merge pull request #4193 from MarcoZehe/FixExtraneousTabStopOnTree
Remove extraneous tab stop from room tree view.
2020-03-10 09:59:44 -06:00
Bruno Windels
e34a37102a move i18n strings around as script desires 2020-03-10 16:56:20 +01:00
Bruno Windels
ab2e3a3465 also enable 4s when accepting a verification request 2020-03-10 16:54:49 +01:00
Bruno Windels
ddbfe4e1fa enable 4S if needed when trying to verify 2020-03-10 16:31:40 +01:00
Weblate
4bb05e8dec Merge branch 'origin/develop' into Weblate. 2020-03-10 15:30:29 +00:00
Travis Ralston
9b62cc964b
Merge pull request #4191 from matrix-org/travis/remove-v1-identity
Remove v1 identity server fallbacks
2020-03-10 09:30:24 -06:00