mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web.git synced 2024-12-16 03:31:31 +03:00
Code Issues Projects Releases Packages Wiki Activity
24793 commits 219 branches 562 tags 474 MiB
Commit graph

4047 commits

Author SHA1 Message Date
Michael Telatynski
c2dcb60f0b Prompt user to specify an alternate server if their chosen one has registration disabled 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-05-11 20:10:45 +01:00
Matthew Hodgson
ad2f704e76 don't NPE on invites from Dendrite 2020-05-10 11:17:21 +01:00
Michael Telatynski
347e3a0dd0
Merge pull request #4484 from matrix-org/t3chguy/redaction_redesign 
Redesign redactions
 2020-05-08 17:40:04 +01:00
Jorik Schellekens
33a5b5142d Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into joriks/font-scaling-slider 2020-05-07 18:01:20 +01:00
Travis Ralston
2aa7a6087c
Merge pull request #4547 from matrix-org/travis/fix-user-panel 
Don't try to reload profile information when closing the user panel
 2020-05-07 10:21:17 -06:00
Jorik Schellekens
bc5fc57dd6 Lint 
This is why we shouldn't rely on regex
 2020-05-07 14:22:15 +01:00
Jorik Schellekens
771ae5e18f Fix encryption badge layouts and replies. 
Begin removing dependence on slider.
Move settings to labs.
Username disambiguation.
 2020-05-07 14:04:56 +01:00
Jorik Schellekens
10c8d253c8 Create irc layout 2020-05-07 14:04:33 +01:00
Jorik Schellekens
e0c89f6180 Add switch between layout classes 2020-05-07 14:04:33 +01:00
Michael Telatynski
7c1ac7aaff fix unrelated tautology 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-05-07 10:02:40 +01:00
Zoe
781cbea744 Fix a crash where a name could unexpectedly be an empty list 2020-05-05 15:39:37 +01:00
Travis Ralston
9a14417a03 Don't try to reload profile information when closing the user panel 
Fixes https://github.com/vector-im/riot-web/issues/13479

This looks to have been caused by something to do with the app load order, though where is a mystery. The view change seems to fire for the same page type despite a dispatch that says to change the view type.

Instead of debugging it too much further, we'll just patch around it.

This commit also makes the settings link use a more safe approach to viewing the user info - not going through the dispatcher means we are at the mercy of browser behaviour when we already have a loop which deals with this.
 2020-05-04 15:41:26 -06:00
Michael Telatynski
c19338b1d3
Merge pull request #4462 from matrix-org/t3chguy/app_load4 
Convert MatrixChat to a TypeScript class
 2020-04-30 17:48:42 +01:00
Michael Telatynski
9c916cc544 Merge branches 'develop' and 't3chguy/app_load4' of github.com:matrix-org/matrix-react-sdk into t3chguy/app_load4 
 Conflicts:
	src/components/structures/MatrixChat.tsx
 2020-04-30 17:41:14 +01:00
Travis Ralston
7b775a8d93
Merge pull request #4271 from aaronraimist/esc-mark-as-read 
Mark room as read when escape is pressed
 2020-04-30 10:40:50 -06:00
J. Ryan Stinnett
e56ce8d885
Merge pull request #4534 from matrix-org/jryans/key-backup-network-fail 
Only show key backup reminder when confirmed by server to be missing
 2020-04-30 17:21:13 +01:00
J. Ryan Stinnett
d3ce4072d4 Only show key backup reminder when confirmed by server to be missing 
The key backup reminder was being shown too eagerly in cases when we hadn't
actually checked with the homeserver on key backup status. This changes to only
show the reminder when we're sure a backup doesn't exist.

Fixes https://github.com/vector-im/riot-web/issues/13404
 2020-04-30 15:41:49 +01:00
Bruno Windels
886b30a265 also recheck 2020-04-29 18:55:25 +02:00
Jorik Schellekens
1b83faaa8d Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into joriks/font-scaling-slider 2020-04-28 15:38:46 +01:00
Jorik Schellekens
fe326b9f08 Enfore function name capitalisation 2020-04-28 14:31:49 +01:00
Jorik Schellekens
93f24f12dc Match filename to class 2020-04-28 14:26:08 +01:00
Jorik Schellekens
cf05beb4b8
Merge pull request #4355 from JorikSchellekens/joriks/font-scaling-fixes 
Fix scaling issues
 2020-04-28 13:47:50 +01:00
Michael Telatynski
2792988ad1 Revert "Make Screens an enum" 
This reverts commit f6492918

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-04-27 23:59:07 +01:00
David Baker
7e956514a2 Lint 2020-04-27 20:35:39 +01:00
David Baker
3bdd24ce83 Make close button work from user info view 
Adds more hacks so that the close button does something vagauely
plausible in all situations.
 2020-04-27 18:34:48 +01:00
Jorik Schellekens
cef6868f02 Resize room list scroll section. 
This fix isn't perfect. Currently the scroll view is
slightly smaller than the list of rooms. I think it has something
to do with the how the heigh is calculate in js, considering it has
some assumptions about the height of each bar and the padding. However
room items are the only things which change with respect to the root
value. Therefore the item list is actually taller than the computed
pixel value of the list converted to rems.

I'll look into it.
 2020-04-27 11:51:55 +01:00
J. Ryan Stinnett
5af3d83cc7 Fix recovery link on login verification flow 
This fixes the recovery link to go to the right place.

Fixes https://github.com/vector-im/riot-web/issues/13346
 2020-04-23 18:14:30 +01:00
Michael Telatynski
531de19fa4 Revert "Discard unused CompatibilityPage.js in react-sdk" 
This reverts commit e3ba9c9b

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-04-23 16:11:58 +01:00
Michael Telatynski
e3ba9c9b38 Discard unused CompatibilityPage.js in react-sdk 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-04-23 16:11:29 +01:00
Jorik Schellekens
f5d6590751 Have max and min font configured in settings 2020-04-23 10:45:48 +01:00
Jorik Schellekens
abd94a65bd Move compoenets/FontSlider to views/Slider 2020-04-23 10:45:47 +01:00
Jorik Schellekens
dd841fcde9 Remove references to font 2020-04-23 10:45:47 +01:00
Jorik Schellekens
db1141b162 Move to typescript 2020-04-23 10:45:47 +01:00
Jorik Schellekens
4d0cac1260 Render should be last method declared 2020-04-23 10:45:47 +01:00
Jorik Schellekens
f1130ecba1 Linting. Finally set up my linter properly 2020-04-23 10:45:47 +01:00
Jorik Schellekens
66fd0f707f Type enforcement and comments 2020-04-23 10:45:47 +01:00
Jorik Schellekens
df73f12320 Make a font slider 2020-04-23 10:45:47 +01:00
Jorik Schellekens
af4dd2770c Respond to font size changes 2020-04-23 10:45:47 +01:00
Jorik Schellekens
38919518da Resize room list scroll section. 
This fix isn't perfect. Currently the scroll view is
slightly smaller than the list of rooms. I think it has something
to do with the how the heigh is calculate in js, considering it has
some assumptions about the height of each bar and the padding. However
room items are the only things which change with respect to the root
value. Therefore the item list is actually taller than the computed
pixel value of the list converted to rems.

I'll look into it.
 2020-04-23 10:45:46 +01:00
Michael Telatynski
f64929187a Make Screens an enum 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-04-23 10:44:35 +01:00
Michael Telatynski
e06b5f8cf3 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/app_load4 2020-04-23 10:12:56 +01:00
Michael Telatynski
4cf234197b iterate PR 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-04-23 10:12:50 +01:00
Michael Telatynski
80b8120bc3 Update login security copy and design to match Figma 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-04-22 22:32:02 +01:00
Michael Telatynski
54e976f5a8 delint 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-04-22 13:22:33 +01:00
Michael Telatynski
01abb61e9a C 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-04-22 13:08:33 +01:00
Michael Telatynski
89345c9e8b Convert MatrixChat to an ES6 Class Component 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-04-22 11:55:03 +01:00
Travis Ralston
972baa881b
Revert "Fix Filepanel scroll position state lost when room is changed" 2020-04-19 19:14:08 -06:00
Travis Ralston
e0d6fa3f51 Rename ref to timelinePanel 2020-04-17 15:15:51 -06:00
Travis Ralston
d910eb4d57 Merge branch 'develop' into thobyv/make-filepanel-remember-scroll-position 2020-04-17 15:10:12 -06:00
Zoe
e3d784816d Merge branch 'develop' into foldleft/better-errors 2020-04-17 14:11:05 +01:00
Travis Ralston
db749519e7 Merge branch 'develop' into travis/cross-sign-setting 2020-04-16 11:06:26 -06:00
Michael Telatynski
ce78e3b8d8 further tweaks by Matthew 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-04-16 13:28:12 +01:00
Michael Telatynski
1fb0f39c84 Replace Verify this session and Complete security 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-04-16 13:23:01 +01:00
Michael Telatynski
a9a2999ccc Use recovery passphrase and recovery key everywhere 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-04-16 12:26:12 +01:00
Travis Ralston
b4e2daaf46 Convert cross-signing feature flag to setting 
This is intended as a temporary measure until we're comfortable with removing the flag entirely.
 2020-04-15 13:18:42 -06:00
Michael Telatynski
f4c4fe7d12
Merge pull request #4413 from matrix-org/t3chguy/wait4initialsync 
Login block on initialSync with spinners
 2020-04-15 16:17:13 +01:00
Michael Telatynski
81f501e844 disable language dropdown too 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-04-15 14:19:47 +01:00
Michael Telatynski
7efbae0470
Merge pull request #4408 from matrix-org/t3chguy/fix_network_dropdown_scrolling 
Allow network dropdown to be scrollable and fix context menu padding calc
 2020-04-15 14:08:34 +01:00
Michael Telatynski
ac26719b69 disable password reset button when spinning 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-04-15 14:07:37 +01:00
Michael Telatynski
8b25223026 fix onLoggedIn getting called twice 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-04-15 13:45:12 +01:00
Michael Telatynski
346b2e8588 Login block on initialSync with spinners 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-04-15 12:21:49 +01:00
Travis Ralston
36fea4d487
Merge pull request #4378 from matrix-org/travis/expanding-widgets 
Minimize widgets by default
 2020-04-14 12:56:10 -06:00
Michael Telatynski
769cf1c987 Allow network dropdown to be scrollable and fix context menu window padding calc 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-04-14 17:34:39 +01:00
Bruno Windels
aef6687931
Merge pull request #4406 from matrix-org/bwindels/completesecuritywithoutspinner 
Fix: don't confuse user with spinner during complete security step
 2020-04-14 15:54:44 +00:00
Bruno Windels
db09cadb66 remove spinner, change copy, add button placeholder 2020-04-14 17:19:15 +02:00
Michael Telatynski
7fa38933cb Merge branches 'develop' and 't3chguy/electron-forward-back' of github.com:matrix-org/matrix-react-sdk into t3chguy/electron-forward-back 
 Conflicts:
	src/components/structures/LoggedInView.tsx
 2020-04-14 15:54:58 +01:00
Michael Telatynski
73e5f133fb Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into esc-mark-as-read 2020-04-14 15:37:18 +01:00
Michael Telatynski
69382ff8e5 Fix handler to use react bubbling rather than a native global onKeyDown 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-04-14 15:24:41 +01:00
Michael Telatynski
26569dea06 Revert "@replaceableComponent" 
This reverts commit 50d6551c

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-04-14 14:59:20 +01:00
Michael Telatynski
50d6551c86 @replaceableComponent 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-04-14 14:50:09 +01:00
Michael Telatynski
384336e8f1 s/alias/address/ in copy 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-04-14 10:06:57 +01:00
Michael Telatynski
46f7fadf3f delint 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-04-13 14:33:45 +01:00
Michael Telatynski
96c067a6c4 prefer protected over private so that the class can be extended 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-04-13 14:30:52 +01:00
Michael Telatynski
368e3f9e85 Convert LoggedInView to TypeScript 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-04-13 14:29:00 +01:00
Michael Telatynski
379aeb667c Convert LoggedInView to a PureComponent class 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-04-13 14:13:27 +01:00
Michael Telatynski
7e996cb91c Add riot-desktop shortcuts for forward/back matching browsers&slack 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-04-11 18:57:59 +01:00
thobyv-kismat
719165c67f fix file panel scroll position lost on room change 2020-04-11 04:03:32 +01:00
thobyv-kismat
8cf6a8c311 refactor RoomScrollStateStore to accomodate scrollmaps for file/notif panel 2020-04-11 02:59:26 +01:00
Travis Ralston
34be024b21 Minimize widgets by default 
Fixes https://github.com/vector-im/riot-web/issues/12921
 2020-04-09 14:47:20 -06:00
David Baker
5dfcfb2147
Merge pull request #4372 from matrix-org/dbkr/search_fail_logging 
Fix logging for failed searches
 2020-04-09 16:27:08 +01:00
David Baker
53b753789a Fix logging for failed searches 
error is an object so appending it to a string is not helpful
 2020-04-09 16:04:14 +01:00
Bruno Windels
c1dcb690b3
Merge pull request #4369 from matrix-org/bwindels/fixresetkeys 
Ensure UI is updated when cross-signing gets disabled
 2020-04-09 13:34:40 +00:00
David Baker
b6ef30af8f Retry the request for the master key from SSSS on login 
If this failed we assumed it didn't exist which would erroneously
prompt people to upgrade encryption.
 2020-04-09 13:40:46 +01:00
Bruno Windels
291fae6493 update room trust when cross-signing gets en/disabled 2020-04-09 13:43:30 +02:00
Michael Telatynski
b5e6f8b8c1 Iterate PR 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-04-07 13:34:10 +01:00
Michael Telatynski
4d002bd24d delint 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-04-07 10:51:51 +01:00
Michael Telatynski
faab35738f Add new default home page fallback 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-04-07 10:48:56 +01:00
Zoe
5ef06357f6 Merge branch 'develop' into foldleft/better-errors 2020-04-06 11:36:46 +01:00
Bruno Windels
adead76882 Merge branch 'develop' into bwindels/selfverifux 2020-04-03 17:53:07 +02:00
Bruno Windels
364421b088 adjust self-verification copy in incoming verif req toast 2020-04-03 17:04:58 +02:00
J. Ryan Stinnett
cabaf36794
Merge pull request #4340 from matrix-org/jryans/read-marker-groupers 
Fix read marker visibility for grouped events
 2020-04-03 11:07:46 +01:00
J. Ryan Stinnett
86f39ee0ee Fix read marker visibility for grouped events 
The recent "groupers" which extracted out timeline grouping logic forgot to
pass through the last event state for read marker computation. This causes the
read marker to become visible when e.g. returning to room if it was last placed
inside a grouped set of events (currently room creation and membership events).

Regressed by https://github.com/matrix-org/matrix-react-sdk/pull/4059
Related to https://github.com/vector-im/riot-web/issues/12338
 2020-04-03 01:14:31 +01:00
David Baker
705fd57a4b Fix spurious extra devices on registration 
We send a parameter to prevent being immediately logged in after
registration, but we regressed it from snake case to camelcase
during the course of cross-signing dev.

Fixes https://github.com/vector-im/riot-web/issues/12865
 2020-04-02 15:09:33 +01:00
Travis Ralston
5c2841323e Appease the linter by turning it off 2020-04-01 14:45:54 -06:00
Travis Ralston
47e5cfecf2 Silence usages of componentWillReceiveProps 
For https://github.com/vector-im/riot-web/issues/12877
 2020-04-01 14:35:39 -06:00
Travis Ralston
ab6bd4104f Flag componentWillUpdate as UNSAFE in MatrixChat 
For https://github.com/vector-im/riot-web/issues/12877
 2020-04-01 14:32:35 -06:00
Travis Ralston
e741d0d577 Revert componentDidMount changes on breadcrumbs 
Fixes https://github.com/vector-im/riot-web/issues/12990

Regressed in https://github.com/matrix-org/matrix-react-sdk/pull/4313
 2020-04-01 13:41:24 -06:00
Travis Ralston
07030a9466
Merge branch 'develop' into travis/react-warnings/3-componentCannotDidMount 2020-04-01 11:14:19 -06:00
Travis Ralston
0fcbe40bec
Merge pull request #4314 from matrix-org/travis/react-warnings/2-code-quality 
Fix a number of minor code quality issues
 2020-04-01 11:13:46 -06:00
Travis Ralston
59a99bbad8
Merge pull request #4313 from matrix-org/travis/react-warnings/1-componentDidMount 
Use componentDidMount in place of componentWillMount where possible
 2020-04-01 11:13:04 -06:00