OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity
21,853 Commits
218 Branches
565 Tags
477 MiB
Commit Graph

21853 Commits (8299ee4128599d6676b2c5de7f891de80f8f8174)

Author SHA1 Message Date
Jeff Huang 8299ee4128 Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (2130 of 2130 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
 2020-02-25 15:49:51 +00:00
Weblate e1cd5afe13 Merge branch 'origin/develop' into Weblate. 2020-02-24 17:02:16 +00:00
Zoe 866fdd6185
Merge pull request #4120 from matrix-org/foldleft/cancel-events 
Show cancel events as hidden events if we wouldn't usually render them
 2020-02-24 17:02:11 +00:00
Weblate 984e464981 Merge branch 'origin/develop' into Weblate. 2020-02-24 16:59:32 +00:00
Travis Ralston 2cb699ae8b
Merge pull request #4033 from TestardR/feature/padLockInviteOnly 
Collapsed room list has unaligned room tiles #4030 version 2
 2020-02-24 09:59:26 -07:00
Weblate f8f6f81a4b Merge branch 'origin/develop' into Weblate. 2020-02-24 16:59:03 +00:00
J. Ryan Stinnett 64dc776e43
Merge pull request #4118 from matrix-org/jryans/hs-xsign-check 
Check for cross-signing homeserver support
 2020-02-24 16:58:57 +00:00
Weblate 5de865d2b3 Merge branch 'origin/develop' into Weblate. 2020-02-24 16:54:21 +00:00
Bruno Windels ec948eb9c9
Merge pull request #4119 from matrix-org/bwindels/dontleakonshowsasinverifpanel 
don't leak if show_sas never comes (or already came)
 2020-02-24 16:54:15 +00:00
Zoe d01c58bd41 added comment 2020-02-24 16:54:10 +00:00
Zoe 91b85cd060 show cancel events as hidden events if we wouldn't usually render them 2020-02-24 16:51:06 +00:00
Travis Ralston d2e7cc7f19 Merge branch 'develop' into feature/padLockInviteOnly 2020-02-24 09:50:06 -07:00
Bruno Windels 818156663a don't leak if show_sas never comes (or already came) 2020-02-24 17:00:55 +01:00
J. Ryan Stinnett a71a234622 Check for cross-signing homeserver support 
This checks the homeserver to ensure it supports cross-signing (via the versions
feature flag) before attempting bootstrapping or offering user verification.

Fixes https://github.com/vector-im/riot-web/issues/11863
 2020-02-24 15:04:34 +00:00
Weblate f5b4f08bf8 Merge branch 'origin/develop' into Weblate. 2020-02-24 14:34:51 +00:00
Zoe 381cbbabb0
Merge pull request #4106 from matrix-org/foldleft/verification-devtool 
Add verification request viewer in devtools
 2020-02-24 14:34:45 +00:00
Zoe f3ac3554a9 include observeOnly 2020-02-24 14:17:34 +00:00
Zoe 0d3d837871 useEventEmitter hook instead of manually using code 2020-02-24 13:44:04 +00:00
Weblate eb590b9ef9 Merge branch 'origin/develop' into Weblate. 2020-02-24 13:39:56 +00:00
Bruno Windels 2b61988d30
Merge pull request #4117 from matrix-org/bwindels/fixinfinispinneronencryptioninfo 
update phase when request prop changes
 2020-02-24 13:39:51 +00:00
Weblate 9520c4970c Merge branch 'origin/develop' into Weblate. 2020-02-24 13:37:22 +00:00
Michael Telatynski 72e5313a5a
Merge pull request #4113 from matrix-org/t3chguy/fix_downloading 
Handle file downloading locally in electron rather than sending to browser
 2020-02-24 13:37:16 +00:00
Weblate 29e985c1c3 Merge branch 'origin/develop' into Weblate. 2020-02-24 13:11:04 +00:00
J. Ryan Stinnett f80582a51d
Merge pull request #4116 from matrix-org/jryans/rm-cider-watcher 
Remove unused CIDER setting watcher
 2020-02-24 13:10:59 +00:00
Bruno Windels 2350d102e3 update phase when request prop changes 2020-02-24 13:39:20 +01:00
J. Ryan Stinnett 8e39bd8885 Remove unused CIDER setting watcher 
This setting watcher for CIDER seems unused and logs a warning at the moment, so
this change removes it.
 2020-02-24 12:36:25 +00:00
Weblate 491d7cc197 Merge branch 'origin/develop' into Weblate. 2020-02-24 12:18:13 +00:00
Bruno Windels dc85346e5c
Merge pull request #4102 from matrix-org/bwindels/aliasautocomplete 
Use alt_aliases for pills and autocomplete
 2020-02-24 12:18:07 +00:00
Weblate d2db935238 Merge branch 'origin/develop' into Weblate. 2020-02-24 12:02:09 +00:00
J. Ryan Stinnett c0c22ba7f9
Merge pull request #4108 from matrix-org/jryans/a11y-editor-keyboard 
Add shortcuts for beginning / end of composer
 2020-02-24 12:02:03 +00:00
Weblate 1fcc277183 Merge branch 'origin/develop' into Weblate. 2020-02-24 11:57:32 +00:00
David Baker 9deb1602da
Merge pull request #4115 from RiotTranslateBot/weblate-riot-web-matrix-react-sdk 
Update from Weblate
 2020-02-24 11:57:25 +00:00
Zoe af514385b2 Avoid shadowing window.setTimeout 2020-02-24 11:53:12 +00:00
Weblate 633bee0f7f Merge branch 'origin/develop' into Weblate. 2020-02-24 11:38:55 +00:00
Bruno Windels bac0ec6e37
Merge pull request #4114 from matrix-org/revert-4008-fix-markdown-escapes 
Revert "Fix escaped markdown passing backslashes through"
 2020-02-24 11:38:50 +00:00
Zoe 71bdc5987b added clarifying comment 2020-02-24 11:33:49 +00:00
Bruno Windels 13b08b5fcc
Revert "Fix escaped markdown passing backslashes through" 2020-02-24 11:27:22 +00:00
Weblate 12b86f4ca3 Merge branch 'origin/develop' into Weblate. 2020-02-24 10:34:39 +00:00
catborise ef1ba0cc87 Translated using Weblate (Turkish) 
Currently translated at 72.2% (1535 of 2126 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/tr/
 2020-02-24 10:34:39 +00:00
lissitz 9a965566e3 Translated using Weblate (Spanish) 
Currently translated at 71.6% (1523 of 2126 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/es/
 2020-02-24 10:34:37 +00:00
Balázs Meskó 20f82e7966 Translated using Weblate (Hungarian) 
Currently translated at 100.0% (2126 of 2126 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
 2020-02-24 10:34:33 +00:00
Michael Telatynski b587fd0883
Merge pull request #4112 from matrix-org/t3chguy/c 
Fix a couple of React warnings/errors
 2020-02-24 10:34:26 +00:00
Zoe 0663ab3b87 lint, and detect new requests 2020-02-24 10:17:33 +00:00
Michael Telatynski d6b39a33b4 get rid of target=_blank for usercontent also 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-02-24 01:36:48 +00:00
Michael Telatynski 0bcdf062a3 reset opener when using window.open 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-02-23 22:22:12 +00:00
Michael Telatynski b2c1242207 delint 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-02-23 22:19:18 +00:00
Michael Telatynski d783ce86c8 Use noreferrer in addition to noopener for edge case browsers 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-02-23 22:14:29 +00:00
Michael Telatynski d89b8b5148 Fix downloading files in electron not being sent into browser 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-02-23 22:10:36 +00:00
Michael Telatynski 3308152439 Fix a couple of React warnings/errors 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-02-23 14:10:41 +00:00
Weblate 09ea3576bb Merge branch 'origin/develop' into Weblate. 2020-02-23 00:46:49 +00:00