OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity
22,290 Commits
211 Branches
549 Tags
658 MiB
Commit Graph

22290 Commits (f719cd50f42d5cc11f59d10ddd65d67fa0400c41)

Author SHA1 Message Date
Weblate f719cd50f4 Merge branch 'origin/develop' into Weblate. 2020-03-13 15:25:20 +00:00
Travis Ralston 195edaf061
Merge pull request #4207 from matrix-org/travis/ts-2 
Declare jsx in tsconfig for IDEs
 2020-03-13 09:25:14 -06:00
Weblate 13fd21ed2b Merge branch 'origin/develop' into Weblate. 2020-03-13 09:47:59 +00:00
Jeff Huang 480dbad887 Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (2146 of 2146 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
 2020-03-13 09:47:58 +00:00
Bruno Windels f7fd623383
Merge pull request #4210 from matrix-org/bwindels/viaserversfromroomdir 
Fix: best-effort to join room without canonical alias over federation from room directory
 2020-03-13 09:47:50 +00:00
Bruno Windels 949ac2953e pass current server as via server to join room 2020-03-13 10:21:37 +01:00
Weblate be38c94376 Merge branch 'origin/develop' into Weblate. 2020-03-12 20:15:18 +00:00
Szimszon 35b673ce9b Translated using Weblate (Hungarian) 
Currently translated at 100.0% (2146 of 2146 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
 2020-03-12 20:15:18 +00:00
J. Ryan Stinnett d6d686622c
Merge pull request #4206 from matrix-org/jryans/xsign-robust-login 
Test for cross-signing homeserver support during login, toasts
 2020-03-12 20:15:11 +00:00
Travis Ralston b825be281e Declare jsx in tsconfig for IDEs 2020-03-12 13:36:02 -06:00
J. Ryan Stinnett b5d532b8cd Test for cross-signing homeserver support during login, toasts 
This adds more checking of homeserver support for cross-signing at login and in
toasts.

Fixes https://github.com/vector-im/riot-web/issues/12228
 2020-03-12 18:08:51 +00:00
Weblate 046af5dd22 Merge branch 'origin/develop' into Weblate. 2020-03-12 11:30:27 +00:00
Bruno Windels b8f30f55fa
Merge pull request #4202 from matrix-org/bwindels/devicelegacyverif 
Send verification request to a single device in a way compatible with non-cross-signing
 2020-03-12 11:30:21 +00:00
Weblate c8d7835db8 Merge branch 'origin/develop' into Weblate. 2020-03-12 11:29:43 +00:00
random 255e57963e Translated using Weblate (Italian) 
Currently translated at 100.0% (2145 of 2145 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/it/
 2020-03-12 11:29:43 +00:00
Szimszon 6bcf929fce Translated using Weblate (Hungarian) 
Currently translated at 100.0% (2145 of 2145 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
 2020-03-12 11:29:41 +00:00
Jeff Huang 6a3a93bf55 Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (2145 of 2145 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
 2020-03-12 11:29:39 +00:00
Bruno Windels 6b552e5ce8
Merge pull request #4199 from matrix-org/bwindels/aliasrefinements 
Fixes for removing local alias
 2020-03-12 11:29:33 +00: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
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 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