Dima/element-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity
39,695 Commits 1 Branch 646 Tags
8dd0722e04bfb20074fc8083227ba7671cda3078
Commit Graph

5907 Commits

Author SHA1 Message Date
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
Marcel Radzio 003ae18038 Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into fix-register-auth-with-new-spec 2020-04-09 15:03:02 +02: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
Marcel 9820400680 Update src/components/structures/auth/Registration.js 
Co-Authored-By: Travis Ralston <travpc@gmail.com>
 2020-04-08 20:53:05 +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
Marcel e3d1cf8d84 Replace {} with null to be compliant with newer specs. While older also accepted null for the auth part of the registration request object 
Took 18 minutes
 2020-04-05 20:55:26 +02: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