PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3
21857 commits 1 branch 0 tags 338 MiB
Commit graph

21857 commits

This branch
This branch
All branches
Author SHA1 Message Date
Travis Ralston
b32fbcb64f Don't try to collapse zero events with a group 
Fixes https://github.com/vector-im/riot-web/issues/12423

When events are redacted they fail to make it into the Grouper because the `shouldAddEvent` check blocks them from entering. However, the grouper expects that when `getTiles()` is called that there's events to group and dutifully grabs some context from the array. Because JavaScript is the least helpful language, `myArray[-1]` returns `undefined` or `null` and thus you get `cannot read 'sender' of undefined`.

Regressed in https://github.com/matrix-org/matrix-react-sdk/pull/4059
 2020-02-25 15:40:15 -07:00
Travis Ralston
28c5641180
Merge pull request #4130 from matrix-org/travis/fix-tab-complete 
Don't print errors when the tab is used with no autocomplete present
 2020-02-25 13:21:39 -07:00
Travis Ralston
30a0d88074 Don't print errors when the tab is used with no autocomplete present 
Fixes https://github.com/vector-im/riot-web/issues/12461

Not a release blocker because the error is caught, and is at the end of the function. Just log spam.
 2020-02-25 13:13:41 -07:00
J. Ryan Stinnett
1958dae519
Merge pull request #4124 from matrix-org/jryans/show-bootstrap-more 
Show both bootstrap and reset cross-signing where appropriate
 2020-02-25 17:29:31 +00:00
Bruno Windels
17d55abed7
Merge pull request #4126 from matrix-org/bwindels/verifuifeedbackonlag 
Improve UI feedback while waiting for network
 2020-02-25 17:08:06 +00:00
Travis Ralston
6dcbed0320
Merge pull request #4123 from matrix-org/travis/invite-populate 
Ensure DMs tagged outside of account data work in the invite dialog
 2020-02-25 09:45:52 -07:00
Travis Ralston
7091e7a4af
Use the right keyword 2020-02-25 09:19:37 -07:00
Zoe
181e06e06d
Merge pull request #4125 from matrix-org/foldleft/12095-insecure-dialog 
Show a warning dialog when user indicates a new session wasn't them
 2020-02-25 15:49:44 +00:00
Zoe
1d8756b95d text improvements 2020-02-25 15:40:06 +00:00
Bruno Windels
682781aa48 better word smithing 2020-02-25 13:27:59 +01:00
Bruno Windels
bd584ab236 from verification tile, also don't wait to show right panel 2020-02-25 13:27:19 +01:00
Bruno Windels
b0c87b0eaf UI spinner when clicking "they don't match" 2020-02-25 13:18:27 +01:00
Bruno Windels
2127edb7b8 show "Waiting for network" in EncryptionInfo after accepting in toast 2020-02-25 13:13:51 +01:00
Bruno Windels
569d5b6156 show right panel before waiting for .ready event to send 2020-02-25 13:13:31 +01:00
Zoe
9ed83b8648 Show a warning dialog when user indicates a new session wasn't them 2020-02-25 11:37:01 +00:00
J. Ryan Stinnett
12e8ad8f6b Show both bootstrap and reset cross-signing where appropriate 
For cases like having keys on your account but not on the current device, this
ensures we offer both bootstrap and reset as possible paths.
 2020-02-25 11:23:51 +00:00
Travis Ralston
866ed68615 Ensure DMs tagged outside of account data work in the invite dialog 
Fixes https://github.com/vector-im/riot-web/issues/12418

Includes a refactor so we don't need to litter the code with the same magic string for DM tags.
 2020-02-24 19:43:49 -07: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
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
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
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
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
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
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
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
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
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
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
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